You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/05 00:23:53 UTC

[01/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Repository: incubator-ignite
Updated Branches:
  refs/heads/master 96aa517ab -> 09169c7f9


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
index 370217c..32f0355 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
index 922f33f..27780f7 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
-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/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
index 504746f..0cf5590 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
index 2cf460f..1c89be9 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
-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/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index 6999c40..277e1cf 100644
--- a/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ b/modules/rest-http/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -10,13 +10,13 @@
 package org.gridgain.grid.kernal.processors.rest.protocols.http.jetty;
 
 import net.sf.json.*;
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.eclipse.jetty.server.*;
 import org.eclipse.jetty.server.handler.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.*;
 import org.gridgain.grid.kernal.processors.rest.request.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.security.*;
 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/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
index 23ec09a..ab88b2c 100644
--- a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
+++ b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java
@@ -10,12 +10,12 @@
 package org.gridgain.grid.kernal.processors.schedule;
 
 import it.sauronsoftware.cron4j.*;
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.scheduler.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java
index 9cc46c0..4ae2c24 100644
--- a/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java
+++ b/modules/schedule/src/test/java/org/gridgain/grid/kernal/GridScheduleSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.scheduler.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java b/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java
index e3bde5b..68b1904 100644
--- a/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java
+++ b/modules/slf4j/src/main/java/org/gridgain/grid/logger/slf4j/GridSlf4jLogger.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.logger.slf4j;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.lang.*;
 import org.jetbrains.annotations.*;
 import org.slf4j.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
index 66ecf57..20857d1 100644
--- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
+++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
@@ -16,7 +16,6 @@ import org.apache.ignite.plugin.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.dr.*;
 import org.gridgain.grid.hadoop.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java b/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java
index a919f84..006e50a 100644
--- a/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java
+++ b/modules/spring/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessorImpl.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.spring;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-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/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java
index 512b876..f7df53f 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridAbstractUserExternalResource.java
@@ -11,7 +11,6 @@ package org.gridgain.grid.external.resource;
 
 import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.springframework.context.*;
 import javax.management.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java
index 7d83263..2475be8 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask1.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.external.resource;
 
+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/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java
index 1b7ac89..8b17ed6 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/external/resource/GridUserExternalResourceTask2.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.external.resource;
 
+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/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
index 8856cca..cdd68d4 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
@@ -16,7 +16,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.collision.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java
index 868a406..b1bafd3 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridAbstractUserResource.java
@@ -11,7 +11,6 @@ package org.gridgain.grid.kernal.processors.resource;
 
 import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.springframework.context.*;
 
 import javax.management.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java
index bec6c89..a1f0ef6 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridLoggerInjectionSelfTest.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.kernal.*;
-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/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java
index e528d4a..dcd69e1 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceEventFilterSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.junits.common.*;
 import org.springframework.context.support.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
index 0bdb3d0..48d781e 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.java
index 6d22409..fc2c161 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldOverrideInjectionSelfTest.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.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import org.springframework.beans.factory.support.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java
index 0ebcf51..1e712df 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedClassLoaderSelfTest.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.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import org.springframework.context.support.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java
index 7072185..60e51d4 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceIsolatedTaskSelfTest.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.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import org.springframework.context.support.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
index 1e1ba9d..3ba8d23 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.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.marshaller.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.java
index 78fd5a8..7e6f719 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodOverrideInjectionSelfTest.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.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import org.springframework.context.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java
index e0d20c6..e9d992b 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessorSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java
index a9ce1a3..60c6618 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceSharedUndeploySelfTest.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.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import org.springframework.context.support.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java
index 896d9cc..5ccf03d 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/TestClosure.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal.processors.resource;
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.junit.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java
index fe0d7dd..197be2c 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PAbstractUserResource.java
@@ -11,7 +11,6 @@ package org.gridgain.grid.p2p;
 
 import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.springframework.context.*;
 import javax.management.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java
index b2c55e9..71482b6 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/p2p/GridP2PContinuousLocalDeploySelfTest.java
@@ -16,7 +16,6 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;
 import org.springframework.context.support.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
index 16dca1d..77257b1 100644
--- a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
+++ b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.util.nodestart;
 
 import com.jcraft.jsch.*;
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.lang.*;
 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/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java
index a956c55..cf972bb 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentClassLoaderFactory.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.spi.deployment.uri;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.spi.*;
 import java.io.*;
 import java.net.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java
index 8ad84cf..e6865d1 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentFileProcessor.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.spi.deployment.uri;
 
 import org.apache.commons.codec.binary.*;
 import org.apache.commons.codec.digest.*;
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 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/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java
index e083a70..9c6701b 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentJarVerifier.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.spi.deployment.uri;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import java.io.*;
 import java.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java
index 688ac0a..ed66dd8 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpi.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.spi.deployment.uri;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.deployment.*;
 import org.gridgain.grid.spi.deployment.uri.scanners.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java
index 539622d..108a85a 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/GridUriDeploymentSpringParser.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.spi.deployment.uri;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.springframework.beans.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java
index c900ab5..a382dc9 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/GridUriDeploymentScanner.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.spi.deployment.uri.scanners;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java
index 365db28..2f21efe 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/file/GridUriDeploymentFileScanner.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.spi.deployment.uri.scanners.file;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.deployment.uri.scanners.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java
index 968dab6..4f84bf9 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpClient.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.spi.deployment.uri.scanners.ftp;
 
 import com.enterprisedt.net.ftp.*;
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import java.io.*;
 import java.text.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java
index ab6cb58..87543dd 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/ftp/GridUriDeploymentFtpScanner.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.deployment.uri.scanners.ftp;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.deployment.uri.scanners.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java
index 4d25f2f..af593ed 100644
--- a/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java
+++ b/modules/urideploy/src/main/java/org/gridgain/grid/spi/deployment/uri/scanners/http/GridUriDeploymentHttpScanner.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.spi.deployment.uri.scanners.http;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.deployment.uri.scanners.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java b/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java
index efed878..763a45d 100644
--- a/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java
+++ b/modules/visor-plugins/src/main/java/org/gridgain/visor/plugin/VisorPluginModel.java
@@ -11,8 +11,8 @@
 
 package org.gridgain.visor.plugin;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
-import org.gridgain.grid.logger.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
index bfe8655..e3f7034 100644
--- a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
+++ b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionFilter.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.startup.servlet.*;
 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/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java
----------------------------------------------------------------------
diff --git a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java
index 544939f..ffcf5ef 100644
--- a/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java
+++ b/modules/web/src/main/java/org/gridgain/grid/cache/websession/GridWebSessionListener.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.cache.websession;
 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.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;


[19/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3edf39ef/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/package.html b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/package.html
deleted file mode 100644
index 6d7a3b5..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains <b>default</b> Optimized marshaller.
-</body>
-</html>


[39/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 78892777f34de9e05ce3f20ac78a0021cf92d0ba
Parents: a7c947c
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:36:49 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:36:56 2014 +0300

----------------------------------------------------------------------
 .../spi/checkpoint/s3/GridS3CheckpointSpi.java  |   2 +-
 .../processors/rest/GridTestMemcacheClient.java |   2 +-
 .../configuration/IgniteConfiguration.java      |   6 +-
 .../marshaller/GridAbstractMarshaller.java      |  57 --------
 .../ignite/marshaller/GridMarshaller.java       | 128 ----------------
 .../marshaller/GridMarshallerExclusions.java    | 145 -------------------
 .../marshaller/IgniteAbstractMarshaller.java    |  57 ++++++++
 .../ignite/marshaller/IgniteMarshaller.java     | 128 ++++++++++++++++
 .../marshaller/IgniteMarshallerExclusions.java  | 145 +++++++++++++++++++
 .../marshaller/jdk/IgniteJdkMarshaller.java     |   4 +-
 .../IgniteJdkMarshallerObjectOutputStream.java  |   2 +-
 .../IgniteOptimizedClassDescriptor.java         |   2 +-
 .../optimized/IgniteOptimizedMarshaller.java    |   4 +-
 .../resources/IgniteMarshallerResource.java     |   2 +-
 .../GridCacheRendezvousAffinityFunction.java    |   2 +-
 .../store/jdbc/GridCacheJdbcBlobStore.java      |   2 +-
 .../grid/kernal/GridEventConsumeHandler.java    |   4 +-
 .../org/gridgain/grid/kernal/GridGainEx.java    |   2 +-
 .../grid/kernal/GridJobSiblingsResponse.java    |   2 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |   2 +-
 .../checkpoint/GridCheckpointManager.java       |   2 +-
 .../managers/communication/GridIoManager.java   |   2 +-
 .../deployment/GridDeploymentCommunication.java |   2 +-
 .../eventstorage/GridEventStorageManager.java   |   2 +-
 .../managers/indexing/GridIndexingManager.java  |   2 +-
 .../swapspace/GridSwapSpaceManager.java         |   2 +-
 .../processors/cache/GridCacheContext.java      |   2 +-
 .../processors/cache/GridCacheEntryInfo.java    |   2 +-
 .../processors/cache/GridCacheMessage.java      |   8 +-
 .../cache/GridCacheSharedContext.java           |   2 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |   2 +-
 .../cache/query/GridCacheQueryRequest.java      |   4 +-
 .../GridCacheContinuousQueryEntry.java          |   6 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   2 +-
 .../closure/GridClosureProcessor.java           |   2 +-
 .../continuous/GridContinuousProcessor.java     |   6 +-
 .../dataload/GridDataLoaderProcessor.java       |   2 +-
 .../processors/dr/GridRawVersionedEntry.java    |   6 +-
 .../processors/dr/GridVersionedEntry.java       |   4 +-
 .../processors/ggfs/GridGgfsAckMessage.java     |   4 +-
 .../ggfs/GridGgfsCommunicationMessage.java      |   4 +-
 .../processors/ggfs/GridGgfsDeleteMessage.java  |   4 +-
 .../kernal/processors/job/GridJobProcessor.java |   2 +-
 .../kernal/processors/job/GridJobWorker.java    |   2 +-
 .../offheap/GridOffHeapProcessor.java           |   2 +-
 .../resource/GridResourceCustomInjector.java    |   4 +-
 .../resource/GridResourceProcessor.java         |   2 +-
 .../tcp/GridMemcachedMessageWrapper.java        |   6 +-
 .../tcp/GridTcpMemcachedNioListener.java        |   2 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   2 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   4 +-
 .../service/GridServiceProcessor.java           |   2 +-
 .../processors/task/GridTaskProcessor.java      |   2 +-
 .../kernal/processors/task/GridTaskWorker.java  |   2 +-
 .../sharedfs/GridSharedFsCheckpointSpi.java     |   2 +-
 .../sharedfs/GridSharedFsTimeoutTask.java       |   4 +-
 .../checkpoint/sharedfs/GridSharedFsUtils.java  |   4 +-
 .../tcp/GridTcpCommunicationSpi.java            |   2 +-
 .../spi/discovery/tcp/GridTcpDiscoverySpi.java  |   2 +-
 .../tcp/GridTcpDiscoverySpiAdapter.java         |   2 +-
 .../GridTcpDiscoveryMulticastIpFinder.java      |   2 +-
 .../spi/indexing/GridIndexingEntityAdapter.java |   2 +-
 .../swapspace/file/GridFileSwapSpaceSpi.java    |   2 +-
 .../org/gridgain/jdbc/util/GridJdbcUtils.java   |   2 +-
 .../GridOptimizedMarshallerSelfTest.java        |   2 +-
 .../optimized/GridOptimizedMarshallerTest.java  |  14 +-
 .../GridOptimizedObjectStreamSelfTest.java      |   2 +-
 .../grid/GridExternalizableAbstractTest.java    |   4 +-
 .../java/org/gridgain/grid/GridTestIoUtils.java |   2 +-
 .../grid/ggfs/GridGgfsPathSelfTest.java         |   2 +-
 .../kernal/GridJobMasterLeaveAwareSelfTest.java |   2 +-
 .../kernal/GridTopicExternalizableSelfTest.java |  16 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |   2 +-
 .../processors/cache/GridCacheMvccSelfTest.java |   2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |   4 +-
 .../ggfs/GridGgfsFileInfoSelfTest.java          |   2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |   4 +-
 .../marshaller/GridMarshallerResourceBean.java  |   2 +-
 .../jdk/GridJdkMarshallerSelfTest.java          |   2 +-
 .../GridSessionCheckpointAbstractSelfTest.java  |   6 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |   4 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |   2 +-
 .../GridAbstractDiscoverySelfTest.java          |   2 +-
 .../util/future/GridFinishedFutureSelfTest.java |   2 +-
 .../testframework/junits/GridAbstractTest.java  |   4 +-
 .../testframework/junits/GridTestResources.java |   6 +-
 .../GridHadoopExternalCommunication.java        |   4 +-
 .../GridHadoopMarshallerFilter.java             |   4 +-
 ...GridHadoopExternalCommunicationSelfTest.java |   2 +-
 .../hibernate/GridCacheHibernateBlobStore.java  |   2 +-
 .../grid/spi/indexing/h2/GridH2IndexingSpi.java |   2 +-
 .../GridIndexingSpiAbstractSelfTest.java        |   4 +-
 .../grid/kernal/GridFactorySelfTest.java        |   2 +-
 .../GridSpringBeanSerializationSelfTest.java    |   2 +-
 .../GridResourceFieldInjectionSelfTest.java     |   2 +-
 .../GridResourceMethodInjectionSelfTest.java    |   4 +-
 97 files changed, 472 insertions(+), 472 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
index 2a7cf00..a43b92a 100644
--- a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
@@ -101,7 +101,7 @@ public class GridS3CheckpointSpi extends GridSpiAdapter implements GridCheckpoin
 
     /** Marshaller. */
     @IgniteMarshallerResource
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** Task that takes care about outdated files. */
     private GridS3TimeoutWorker timeoutWrk;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
index bf02c2b..9292b88 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
@@ -61,7 +61,7 @@ final class GridTestMemcacheClient {
     private final IgniteLogger log = new IgniteJavaLogger();
 
     /** JDK marshaller. */
-    private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller();
+    private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller();
 
     /** Socket. */
     private final Socket sock;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index a6f0d33..85516d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -282,7 +282,7 @@ public class IgniteConfiguration {
     private UUID nodeId;
 
     /** Marshaller. */
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** Marshal local jobs. */
     private boolean marshLocJobs = DFLT_MARSHAL_LOCAL_JOBS;
@@ -1459,7 +1459,7 @@ public class IgniteConfiguration {
      *
      * @return Marshaller to use in grid.
      */
-    public GridMarshaller getMarshaller() {
+    public IgniteMarshaller getMarshaller() {
         return marsh;
     }
 
@@ -1469,7 +1469,7 @@ public class IgniteConfiguration {
      * @param marsh Marshaller to use within grid.
      * @see IgniteConfiguration#getMarshaller()
      */
-    public void setMarshaller(GridMarshaller marsh) {
+    public void setMarshaller(IgniteMarshaller marsh) {
         this.marsh = marsh;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java
deleted file mode 100644
index 40fd1ad..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.io.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Base class for marshallers. Provides default implementations of methods
- * that work with byte array or {@link GridByteArrayList}. These implementations
- * use {@link GridByteArrayInputStream} or {@link GridByteArrayOutputStream}
- * to marshal and unmarshal objects.
- */
-public abstract class GridAbstractMarshaller implements GridMarshaller {
-    /** Default initial buffer size for the {@link GridByteArrayOutputStream}. */
-    public static final int DFLT_BUFFER_SIZE = 512;
-
-    /** {@inheritDoc} */
-    @Override public byte[] marshal(@Nullable Object obj) throws GridException {
-        GridByteArrayOutputStream out = null;
-
-        try {
-            out = new GridByteArrayOutputStream(DFLT_BUFFER_SIZE);
-
-            marshal(obj, out);
-
-            return out.toByteArray();
-        }
-        finally {
-            U.close(out, null);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
-        GridByteArrayInputStream in = null;
-
-        try {
-            in = new GridByteArrayInputStream(arr, 0, arr.length);
-
-            return unmarshal(in, clsLdr);
-        }
-        finally {
-            U.close(in, null);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
deleted file mode 100644
index 1656571..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller;
-
-import org.gridgain.grid.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-/**
- * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides
- * serialization/deserialization mechanism for all instances that are sent across networks
- * or are otherwise serialized.
- * <p>
- * Gridgain provides the following {@code GridMarshaller} implementations:
- * <ul>
- * <li>{@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} - default</li>
- * <li>{@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}</li>
- * </ul>
- * <p>
- * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,
- * and SPI's.
- * <h2 class="header">Java Example</h2>
- * {@code GridMarshaller} can be explicitely configured in code.
- * <pre name="code" class="java">
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * // Override marshaller.
- * cfg.setMarshaller(marshaller);
- *
- * // Starts grid.
- * G.start(cfg);
- * </pre>
- * <h2 class="header">Spring Example</h2>
- * GridMarshaller can be configured from Spring XML configuration file:
- * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
- *     ...
- *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/&gt;
- *     &lt;/property&gt;
- *     ...
- * &lt;/bean&gt;
- * </pre>
- * <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
- * <h2 class="header">Injection Example</h2>
- * GridMarshaller can be injected in users task, job or SPI as following:
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     &#64;GridMarshallerResource
- *     private GridMarshaller marshaller;
- *
- *     public Serializable execute() {
- *         // Use marshaller to serialize/deserialize any object.
- *         ...
- *     }
- * }
- * </pre>
- * or
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     private GridMarshaller marshaller;
- *     ...
- *     &#64;GridMarshallerResource
- *     public void setMarshaller(GridMarshaller marshaller) {
- *         this.marshaller = marshaller;
- *     }
- *     ...
- * }
- * </pre>
- */
-public interface GridMarshaller {
-    /**
-     * Marshals object to the output stream. This method should not close
-     * given output stream.
-     *
-     * @param obj Object to marshal.
-     * @param out Output stream to marshal into.
-     * @throws GridException If marshalling failed.
-     */
-    public void marshal(@Nullable Object obj, OutputStream out) throws GridException;
-
-    /**
-     * Marshals object to byte array.
-     *
-     * @param obj Object to marshal.
-     * @return Byte array.
-     * @throws GridException If marshalling failed.
-     */
-    public byte[] marshal(@Nullable Object obj) throws GridException;
-
-    /**
-     * Unmarshals object from the output stream using given class loader.
-     * This method should not close given input stream.
-     *
-     * @param <T> Type of unmarshalled object.
-     * @param in Input stream.
-     * @param clsLdr Class loader to use.
-     * @return Unmarshalled object.
-     * @throws GridException If unmarshalling failed.
-     */
-    public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException;
-
-    /**
-     * Unmarshals object from byte array using given class loader.
-     *
-     * @param <T> Type of unmarshalled object.
-     * @param arr Byte array.
-     * @param clsLdr Class loader to use.
-     * @return Unmarshalled object.
-     * @throws GridException If unmarshalling failed.
-     */
-    public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java
deleted file mode 100644
index d9d7792..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller;
-
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.kernal.executor.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import javax.management.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-/**
- * Controls what classes should be excluded from marshalling by default.
- */
-public final class GridMarshallerExclusions {
-    /**
-     * Classes that must be included in serialization. All marshallers must
-     * included these classes.
-     * <p>
-     * Note that this list supercedes {@link #EXCL_CLASSES}.
-     */
-    private static final Class<?>[] INCL_CLASSES = new Class[] {
-        // GridGain classes.
-        GridLoggerProxy.class,
-        GridExecutorService.class
-    };
-
-    /** */
-    private static final Map<Class<?>, Boolean> cache = new GridBoundedConcurrentLinkedHashMap<>(
-        512, 512, 0.75f, 16);
-
-    /**
-     * Excluded grid classes from serialization. All marshallers must omit
-     * these classes. Fields of these types should be serialized as {@code null}.
-     * <p>
-     * Note that {@link #INCL_CLASSES} supercedes this list.
-     */
-    private static final Class<?>[] EXCL_CLASSES;
-
-    /**
-     *
-     */
-    static {
-        Class springCtxCls = null;
-
-        try {
-            springCtxCls = Class.forName("org.springframework.context.ApplicationContext");
-        }
-        catch (Exception ignored) {
-            // No-op.
-        }
-
-        List<Class<?>> excl = new ArrayList<>();
-
-        // Non-GridGain classes.
-        excl.add(MBeanServer.class);
-        excl.add(ExecutorService.class);
-        excl.add(ClassLoader.class);
-        excl.add(Thread.class);
-
-        if (springCtxCls != null)
-            excl.add(springCtxCls);
-
-        // GridGain classes.
-        excl.add(IgniteLogger.class);
-        excl.add(ComputeTaskSession.class);
-        excl.add(ComputeLoadBalancer.class);
-        excl.add(ComputeJobContext.class);
-        excl.add(GridMarshaller.class);
-        excl.add(GridComponent.class);
-        excl.add(ComputeTaskContinuousMapper.class);
-
-        EXCL_CLASSES = U.toArray(excl, new Class[excl.size()]);
-    }
-
-    /**
-     * Ensures singleton.
-     */
-    private GridMarshallerExclusions() {
-        // No-op.
-    }
-
-    /**
-     * Checks given class against predefined set of excluded types.
-     *
-     * @param cls Class to check.
-     * @return {@code true} if class should be excluded, {@code false} otherwise.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    private static boolean isExcluded0(Class<?> cls) {
-        assert cls != null;
-
-        final Class<?>[] inc = INCL_CLASSES;
-
-        // NOTE: don't use foreach for performance reasons.
-        for (int i = 0; i < inc.length; i++)
-            if (inc[i].isAssignableFrom(cls))
-                return false;
-
-        final Class<?>[] exc = EXCL_CLASSES;
-
-        // NOTE: don't use foreach for performance reasons.
-        for (int i = 0; i < exc.length; i++)
-            if (exc[i].isAssignableFrom(cls))
-                return true;
-
-        return false;
-    }
-
-    /**
-     * Checks whether or not given class should be excluded from marshalling.
-     *
-     * @param cls Class to check.
-     * @return {@code true} if class should be excluded, {@code false} otherwise.
-     */
-    public static boolean isExcluded(Class<?> cls) {
-        Boolean res = cache.get(cls);
-
-        if (res == null) {
-            res = isExcluded0(cls);
-
-            cache.put(cls, res);
-        }
-
-        return res;
-    }
-
-    /**
-     * Intended for test purposes only.
-     */
-    public static void clearCache() {
-        cache.clear();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteAbstractMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteAbstractMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteAbstractMarshaller.java
new file mode 100644
index 0000000..5002e63
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteAbstractMarshaller.java
@@ -0,0 +1,57 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.gridgain.grid.util.io.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Base class for marshallers. Provides default implementations of methods
+ * that work with byte array or {@link GridByteArrayList}. These implementations
+ * use {@link GridByteArrayInputStream} or {@link GridByteArrayOutputStream}
+ * to marshal and unmarshal objects.
+ */
+public abstract class IgniteAbstractMarshaller implements IgniteMarshaller {
+    /** Default initial buffer size for the {@link GridByteArrayOutputStream}. */
+    public static final int DFLT_BUFFER_SIZE = 512;
+
+    /** {@inheritDoc} */
+    @Override public byte[] marshal(@Nullable Object obj) throws GridException {
+        GridByteArrayOutputStream out = null;
+
+        try {
+            out = new GridByteArrayOutputStream(DFLT_BUFFER_SIZE);
+
+            marshal(obj, out);
+
+            return out.toByteArray();
+        }
+        finally {
+            U.close(out, null);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
+        GridByteArrayInputStream in = null;
+
+        try {
+            in = new GridByteArrayInputStream(arr, 0, arr.length);
+
+            return unmarshal(in, clsLdr);
+        }
+        finally {
+            U.close(in, null);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
new file mode 100644
index 0000000..ace4c9c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshaller.java
@@ -0,0 +1,128 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller;
+
+import org.gridgain.grid.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides
+ * serialization/deserialization mechanism for all instances that are sent across networks
+ * or are otherwise serialized.
+ * <p>
+ * Gridgain provides the following {@code GridMarshaller} implementations:
+ * <ul>
+ * <li>{@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} - default</li>
+ * <li>{@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}</li>
+ * </ul>
+ * <p>
+ * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,
+ * and SPI's.
+ * <h2 class="header">Java Example</h2>
+ * {@code GridMarshaller} can be explicitely configured in code.
+ * <pre name="code" class="java">
+ * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Override marshaller.
+ * cfg.setMarshaller(marshaller);
+ *
+ * // Starts grid.
+ * G.start(cfg);
+ * </pre>
+ * <h2 class="header">Spring Example</h2>
+ * GridMarshaller can be configured from Spring XML configuration file:
+ * <pre name="code" class="xml">
+ * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ *     ...
+ *     &lt;property name="marshaller"&gt;
+ *         &lt;bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/&gt;
+ *     &lt;/property&gt;
+ *     ...
+ * &lt;/bean&gt;
+ * </pre>
+ * <p>
+ * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <br>
+ * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
+ * <h2 class="header">Injection Example</h2>
+ * GridMarshaller can be injected in users task, job or SPI as following:
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     private GridMarshaller marshaller;
+ *
+ *     public Serializable execute() {
+ *         // Use marshaller to serialize/deserialize any object.
+ *         ...
+ *     }
+ * }
+ * </pre>
+ * or
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     private GridMarshaller marshaller;
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     public void setMarshaller(GridMarshaller marshaller) {
+ *         this.marshaller = marshaller;
+ *     }
+ *     ...
+ * }
+ * </pre>
+ */
+public interface IgniteMarshaller {
+    /**
+     * Marshals object to the output stream. This method should not close
+     * given output stream.
+     *
+     * @param obj Object to marshal.
+     * @param out Output stream to marshal into.
+     * @throws GridException If marshalling failed.
+     */
+    public void marshal(@Nullable Object obj, OutputStream out) throws GridException;
+
+    /**
+     * Marshals object to byte array.
+     *
+     * @param obj Object to marshal.
+     * @return Byte array.
+     * @throws GridException If marshalling failed.
+     */
+    public byte[] marshal(@Nullable Object obj) throws GridException;
+
+    /**
+     * Unmarshals object from the output stream using given class loader.
+     * This method should not close given input stream.
+     *
+     * @param <T> Type of unmarshalled object.
+     * @param in Input stream.
+     * @param clsLdr Class loader to use.
+     * @return Unmarshalled object.
+     * @throws GridException If unmarshalling failed.
+     */
+    public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException;
+
+    /**
+     * Unmarshals object from byte array using given class loader.
+     *
+     * @param <T> Type of unmarshalled object.
+     * @param arr Byte array.
+     * @param clsLdr Class loader to use.
+     * @return Unmarshalled object.
+     * @throws GridException If unmarshalling failed.
+     */
+    public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java
new file mode 100644
index 0000000..2c0bfbf
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/IgniteMarshallerExclusions.java
@@ -0,0 +1,145 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller;
+
+import org.apache.ignite.*;
+import org.apache.ignite.compute.*;
+import org.gridgain.grid.kernal.*;
+import org.gridgain.grid.kernal.executor.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import javax.management.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Controls what classes should be excluded from marshalling by default.
+ */
+public final class IgniteMarshallerExclusions {
+    /**
+     * Classes that must be included in serialization. All marshallers must
+     * included these classes.
+     * <p>
+     * Note that this list supercedes {@link #EXCL_CLASSES}.
+     */
+    private static final Class<?>[] INCL_CLASSES = new Class[] {
+        // GridGain classes.
+        GridLoggerProxy.class,
+        GridExecutorService.class
+    };
+
+    /** */
+    private static final Map<Class<?>, Boolean> cache = new GridBoundedConcurrentLinkedHashMap<>(
+        512, 512, 0.75f, 16);
+
+    /**
+     * Excluded grid classes from serialization. All marshallers must omit
+     * these classes. Fields of these types should be serialized as {@code null}.
+     * <p>
+     * Note that {@link #INCL_CLASSES} supercedes this list.
+     */
+    private static final Class<?>[] EXCL_CLASSES;
+
+    /**
+     *
+     */
+    static {
+        Class springCtxCls = null;
+
+        try {
+            springCtxCls = Class.forName("org.springframework.context.ApplicationContext");
+        }
+        catch (Exception ignored) {
+            // No-op.
+        }
+
+        List<Class<?>> excl = new ArrayList<>();
+
+        // Non-GridGain classes.
+        excl.add(MBeanServer.class);
+        excl.add(ExecutorService.class);
+        excl.add(ClassLoader.class);
+        excl.add(Thread.class);
+
+        if (springCtxCls != null)
+            excl.add(springCtxCls);
+
+        // GridGain classes.
+        excl.add(IgniteLogger.class);
+        excl.add(ComputeTaskSession.class);
+        excl.add(ComputeLoadBalancer.class);
+        excl.add(ComputeJobContext.class);
+        excl.add(IgniteMarshaller.class);
+        excl.add(GridComponent.class);
+        excl.add(ComputeTaskContinuousMapper.class);
+
+        EXCL_CLASSES = U.toArray(excl, new Class[excl.size()]);
+    }
+
+    /**
+     * Ensures singleton.
+     */
+    private IgniteMarshallerExclusions() {
+        // No-op.
+    }
+
+    /**
+     * Checks given class against predefined set of excluded types.
+     *
+     * @param cls Class to check.
+     * @return {@code true} if class should be excluded, {@code false} otherwise.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    private static boolean isExcluded0(Class<?> cls) {
+        assert cls != null;
+
+        final Class<?>[] inc = INCL_CLASSES;
+
+        // NOTE: don't use foreach for performance reasons.
+        for (int i = 0; i < inc.length; i++)
+            if (inc[i].isAssignableFrom(cls))
+                return false;
+
+        final Class<?>[] exc = EXCL_CLASSES;
+
+        // NOTE: don't use foreach for performance reasons.
+        for (int i = 0; i < exc.length; i++)
+            if (exc[i].isAssignableFrom(cls))
+                return true;
+
+        return false;
+    }
+
+    /**
+     * Checks whether or not given class should be excluded from marshalling.
+     *
+     * @param cls Class to check.
+     * @return {@code true} if class should be excluded, {@code false} otherwise.
+     */
+    public static boolean isExcluded(Class<?> cls) {
+        Boolean res = cache.get(cls);
+
+        if (res == null) {
+            res = isExcluded0(cls);
+
+            cache.put(cls, res);
+        }
+
+        return res;
+    }
+
+    /**
+     * Intended for test purposes only.
+     */
+    public static void clearCache() {
+        cache.clear();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
index 4c02c3c..02dbd9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
@@ -17,7 +17,7 @@ import org.jetbrains.annotations.*;
 import java.io.*;
 
 /**
- * Implementation of {@link GridMarshaller} based on JDK serialization mechanism.
+ * Implementation of {@link org.apache.ignite.marshaller.IgniteMarshaller} based on JDK serialization mechanism.
  * <p>
  * <h1 class="header">Configuration</h1>
  * <h2 class="header">Mandatory</h2>
@@ -76,7 +76,7 @@ import java.io.*;
  * <br>
  *
  */
-public class IgniteJdkMarshaller extends GridAbstractMarshaller {
+public class IgniteJdkMarshaller extends IgniteAbstractMarshaller {
     /** {@inheritDoc} */
     @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
         assert out != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java
index 7243893..6f0fe1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java
@@ -30,7 +30,7 @@ class IgniteJdkMarshallerObjectOutputStream extends ObjectOutputStream {
 
     /** {@inheritDoc} */
     @Nullable @Override protected Object replaceObject(Object o) throws IOException {
-        return o == null || GridMarshallerExclusions.isExcluded(o.getClass()) ? null :
+        return o == null || IgniteMarshallerExclusions.isExcluded(o.getClass()) ? null :
             o.getClass().equals(Object.class) ? new IgniteJdkMarshallerDummySerializable() : super.replaceObject(o);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
index e68d8cf..02dcd4b 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
@@ -200,7 +200,7 @@ class IgniteOptimizedClassDescriptor {
     IgniteOptimizedClassDescriptor(Class<?> cls) throws IOException {
         this.cls = cls;
 
-        excluded = GridMarshallerExclusions.isExcluded(cls);
+        excluded = IgniteMarshallerExclusions.isExcluded(cls);
 
         T2<Integer, Integer> t = IgniteOptimizedClassResolver.writeClassData(cls);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
index bfd186a..8595bf0 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
@@ -22,7 +22,7 @@ import java.net.*;
 import java.util.*;
 
 /**
- * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller},
+ * Optimized implementation of {@link org.apache.ignite.marshaller.IgniteMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller},
  * which is based on standard {@link ObjectOutputStream}, this marshaller does not
  * enforce that all serialized objects implement {@link Serializable} interface. It is also
  * about 20 times faster as it removes lots of serialization overhead that exists in
@@ -91,7 +91,7 @@ import java.util.*;
  * }
  * </pre>
  */
-public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
+public class IgniteOptimizedMarshaller extends IgniteAbstractMarshaller {
     /** Whether or not to require an object to be serializable in order to be marshalled. */
     private boolean requireSer = true;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
index 0ad0732..8acaf4d 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
@@ -14,7 +14,7 @@ import org.gridgain.grid.spi.*;
 import java.lang.annotation.*;
 
 /**
- * Annotates a field or a setter method for injection of {@link org.apache.ignite.marshaller.GridMarshaller} resource. Grid marshaller
+ * Annotates a field or a setter method for injection of {@link org.apache.ignite.marshaller.IgniteMarshaller} resource. Grid marshaller
  * is provided to grid via {@link org.apache.ignite.configuration.IgniteConfiguration}.
  * <p>
  * Marshaller can be injected into instances of following classes:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
index 2d004ae..a4ea024 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
@@ -85,7 +85,7 @@ public class GridCacheRendezvousAffinityFunction implements GridCacheAffinityFun
     private GridCacheAffinityNodeHashResolver hashIdRslvr = new GridCacheAffinityNodeAddressHashResolver();
 
     /** Marshaller. */
-    private GridMarshaller marshaller = new IgniteOptimizedMarshaller(false);
+    private IgniteMarshaller marshaller = new IgniteOptimizedMarshaller(false);
 
     /**
      * Empty constructor with all defaults.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
index d9df3e7..b8248c2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
@@ -138,7 +138,7 @@ public class GridCacheJdbcBlobStore<K, V> extends GridCacheStoreAdapter<K, V> {
 
     /** Marshaller. */
     @IgniteMarshallerResource
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** Init guard. */
     @GridToStringExclude

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java
index c1f27de..9f65ead 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java
@@ -344,7 +344,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
          * @param marsh Marshaller.
          * @throws GridException In case of error.
          */
-        void p2pMarshal(GridMarshaller marsh) throws GridException {
+        void p2pMarshal(IgniteMarshaller marsh) throws GridException {
             assert marsh != null;
 
             bytes = marsh.marshal(evt);
@@ -355,7 +355,7 @@ class GridEventConsumeHandler implements GridContinuousHandler {
          * @param ldr Class loader.
          * @throws GridException In case of error.
          */
-        void p2pUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
+        void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
             assert marsh != null;
 
             assert evt == null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index 23cfdb7..7193c1c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -1458,7 +1458,7 @@ public class GridGainEx {
 
             MBeanServer mbSrv = cfg.getMBeanServer();
 
-            GridMarshaller marsh = cfg.getMarshaller();
+            IgniteMarshaller marsh = cfg.getMarshaller();
 
             String[] p2pExclude = cfg.getPeerClassLoadingLocalClassPathExclude();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
index e91f3f4..5e90cdb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
@@ -61,7 +61,7 @@ public class GridJobSiblingsResponse extends GridTcpCommunicationMessageAdapter
      * @param marsh Marshaller.
      * @throws GridException In case of error.
      */
-    public void unmarshalSiblings(GridMarshaller marsh) throws GridException {
+    public void unmarshalSiblings(IgniteMarshaller marsh) throws GridException {
         assert marsh != null;
 
         if (siblingsBytes != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 9353504..6a8474a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -1980,7 +1980,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
 
             // Clean internal class/classloader caches to avoid stopped contexts held in memory.
             IgniteOptimizedMarshaller.clearCache();
-            GridMarshallerExclusions.clearCache();
+            IgniteMarshallerExclusions.clearCache();
             GridEnumCache.clear();
 
             gw.writeLock();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java
index 406273e..3ff9450 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java
@@ -54,7 +54,7 @@ public class GridCheckpointManager extends GridManagerAdapter<GridCheckpointSpi>
         MAX_CLOSED_SESS, MAX_CLOSED_SESS, 0.75f, 256, PER_SEGMENT_Q);
 
     /** Grid marshaller. */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /**
      * @param ctx Grid kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java
index 7cb14ec..39cb15b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java
@@ -108,7 +108,7 @@ public class GridIoManager extends GridManagerAdapter<GridCommunicationSpi<Seria
     private GridCommunicationListener<Serializable> commLsnr;
 
     /** Grid marshaller. */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /** Busy lock. */
     private final GridSpinReadWriteLock busyLock = new GridSpinReadWriteLock();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
index c7f6a14..cefc7f9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
@@ -53,7 +53,7 @@ class GridDeploymentCommunication {
     private final GridBusyLock busyLock = new GridBusyLock();
 
     /** */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /**
      * Creates new instance of deployment communication.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
index 585fbd7..5a4e389 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
@@ -57,7 +57,7 @@ public class GridEventStorageManager extends GridManagerAdapter<GridEventStorage
     private final int len;
 
     /** Marshaller. */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /** Request listener. */
     private RequestListener msgLsnr;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
index 99cd118..d461138 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
@@ -43,7 +43,7 @@ import static org.gridgain.grid.spi.indexing.GridIndexType.*;
  */
 public class GridIndexingManager extends GridManagerAdapter<GridIndexingSpi> {
     /** */
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** Type descriptors. */
     private final ConcurrentMap<TypeId, TypeDescriptor> types = new ConcurrentHashMap8<>();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
index 2e7085c..d5deb3a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
@@ -31,7 +31,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
  */
 public class GridSwapSpaceManager extends GridManagerAdapter<GridSwapSpaceSpi> {
     /** */
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /**
      * @param ctx Grid kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
index 85d1107..5c1492c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
@@ -642,7 +642,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     /**
      * @return Marshaller.
      */
-    public GridMarshaller marshaller() {
+    public IgniteMarshaller marshaller() {
         return ctx.config().getMarshaller();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java
index 66aaf5b..3fea7ce 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java
@@ -234,7 +234,7 @@ public class GridCacheEntryInfo<K, V> implements Externalizable {
      * @throws GridException If unmarshalling failed.
      */
     public void unmarshal(GridCacheContext<K, V> ctx, ClassLoader clsLdr) throws GridException {
-        GridMarshaller mrsh = ctx.marshaller();
+        IgniteMarshaller mrsh = ctx.marshaller();
 
         if (key == null)
             key = mrsh.unmarshal(keyBytes, clsLdr);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
index c7bef12..94d9881 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
@@ -404,7 +404,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         IgnitePredicate<GridCacheEntry<K, V>>[] filter = new IgnitePredicate[byteCol.length];
 
-        GridMarshaller marsh = ctx.marshaller();
+        IgniteMarshaller marsh = ctx.marshaller();
 
         for (int i = 0; i < byteCol.length; i++)
             filter[i] = byteCol[i] == null ? null :
@@ -457,7 +457,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         List<T> col = new ArrayList<>(byteCol.size());
 
-        GridMarshaller marsh = ctx.marshaller();
+        IgniteMarshaller marsh = ctx.marshaller();
 
         for (GridCacheValueBytes item : byteCol) {
             assert item == null || item.get() != null;
@@ -510,7 +510,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         List<T> col = new ArrayList<>(byteCol.size());
 
-        GridMarshaller marsh = ctx.marshaller();
+        IgniteMarshaller marsh = ctx.marshaller();
 
         for (byte[] bytes : byteCol)
             col.add(bytes == null ? null : marsh.<T>unmarshal(bytes, ldr));
@@ -561,7 +561,7 @@ public abstract class GridCacheMessage<K, V> extends GridTcpCommunicationMessage
 
         LinkedHashMap<K1, Boolean> map = U.newLinkedHashMap(byteMap.size());
 
-        GridMarshaller marsh = ctx.marshaller();
+        IgniteMarshaller marsh = ctx.marshaller();
 
         for (Map.Entry<byte[], Boolean> e : byteMap.entrySet())
             map.put(marsh.<K1>unmarshal(e.getKey(), ldr), e.getValue());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
index fd03aaa..8a2653d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
@@ -256,7 +256,7 @@ public class GridCacheSharedContext<K, V> {
     /**
      * @return Marshaller.
      */
-    public GridMarshaller marshaller() {
+    public IgniteMarshaller marshaller() {
         return kernalCtx.config().getMarshaller();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java
index c584996..b53654b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java
@@ -106,7 +106,7 @@ public class GridCacheLocalQueryFuture<K, V, R> extends GridCacheQueryFutureAdap
             IgnitePredicate<GridCacheEntry<Object, Object>> prjPred = qry.query().projectionFilter() == null ?
                 F.<GridCacheEntry<Object, Object>>alwaysTrue() : qry.query().projectionFilter();
 
-            GridMarshaller marsh = cctx.marshaller();
+            IgniteMarshaller marsh = cctx.marshaller();
 
             IgniteReducer<Object, Object> rdc = qry.reducer() != null ?
                 marsh.<IgniteReducer<Object, Object>>unmarshal(marsh.marshal(qry.reducer()), null) : null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
index 1c5d7ba..d76b4f7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
@@ -275,7 +275,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
     @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader ldr) throws GridException {
         super.finishUnmarshal(ctx, ldr);
 
-        GridMarshaller mrsh = ctx.marshaller();
+        IgniteMarshaller mrsh = ctx.marshaller();
 
         if (keyValFilterBytes != null)
             keyValFilter = mrsh.unmarshal(keyValFilterBytes, ldr);
@@ -298,7 +298,7 @@ public class GridCacheQueryRequest<K, V> extends GridCacheMessage<K, V> implemen
      * @throws GridException In case of error.
      */
     void beforeLocalExecution(GridCacheContext<K, V> ctx) throws GridException {
-        GridMarshaller marsh = ctx.marshaller();
+        IgniteMarshaller marsh = ctx.marshaller();
 
         rdc = rdc != null ? marsh.<IgniteReducer<Object, Object>>unmarshal(marsh.marshal(rdc), null) : null;
         trans = trans != null ? marsh.<IgniteClosure<Object, Object>>unmarshal(marsh.marshal(trans), null) : null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
index 33d8e82..6f83ea5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
@@ -115,7 +115,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V>
      * @param ldr Class loader.
      * @throws GridException In case of error.
      */
-    void initValue(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
+    void initValue(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
         assert marsh != null;
 
         if (newVal == null && newValBytes != null && !newValBytes.isNull())
@@ -140,7 +140,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V>
      * @param marsh Marshaller.
      * @throws GridException In case of error.
      */
-    void p2pMarshal(GridMarshaller marsh) throws GridException {
+    void p2pMarshal(IgniteMarshaller marsh) throws GridException {
         assert marsh != null;
 
         assert key != null;
@@ -161,7 +161,7 @@ public class GridCacheContinuousQueryEntry<K, V> implements GridCacheEntry<K, V>
      * @param ldr Class loader.
      * @throws GridException In case of error.
      */
-    void p2pUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
+    void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
         assert marsh != null;
 
         assert key == null : "Key should be null: " + key;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index e8c0013..b518f23 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -35,7 +35,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
     private static final long serialVersionUID = 0L;
 
     /** Marshaller. */
-    private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller();
+    private static final IgniteMarshaller MARSHALLER = new IgniteJdkMarshaller();
 
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 5f65f1d..499ac6a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -44,7 +44,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
     private static final long serialVersionUID = 0L;
 
     /** Marshaller. */
-    private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller();
+    private static final IgniteMarshaller MARSHALLER = new IgniteJdkMarshaller();
 
     /** How long to store future (10 minutes). */
     private static final int RMV_DELAY = 10 * 60;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
index cd83114..72fb0f1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
@@ -1196,7 +1196,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
 
             if (ctx.localNodeId().equals(node.id())) {
                 if (hadLocNode) {
-                    GridMarshaller marsh = ctx.config().getMarshaller();
+                    IgniteMarshaller marsh = ctx.config().getMarshaller();
 
                     job = marsh.unmarshal(marsh.marshal(job), null);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
index d6ab870..2e5b1c9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
@@ -87,7 +87,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
     private long ackTimeout;
 
     /** Marshaller. */
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /**
      * @param ctx Kernal context.
@@ -1303,7 +1303,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
          * @param marsh Marshaller.
          * @throws GridException In case of error.
          */
-        void p2pMarshal(GridMarshaller marsh) throws GridException {
+        void p2pMarshal(IgniteMarshaller marsh) throws GridException {
             assert marsh != null;
 
             prjPredBytes = marsh.marshal(prjPred);
@@ -1314,7 +1314,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter {
          * @param ldr Class loader.
          * @throws GridException In case of error.
          */
-        void p2pUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
+        void p2pUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
             assert marsh != null;
 
             assert prjPred == null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java
index 0a8d9c2..2227f72 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java
@@ -48,7 +48,7 @@ public class GridDataLoaderProcessor<K, V> extends GridProcessorAdapter {
     private final DelayQueue<IgniteDataLoaderImpl<K, V>> flushQ = new DelayQueue<>();
 
     /** Marshaller. */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /**
      * @param ctx Kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java
index 83a1824..3f0d7ba 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java
@@ -121,7 +121,7 @@ public class GridRawVersionedEntry<K, V> implements GridVersionedEntry<K, V>, Ex
     }
 
     /** {@inheritDoc} */
-    @Override public void unmarshal(GridMarshaller marsh) throws GridException {
+    @Override public void unmarshal(IgniteMarshaller marsh) throws GridException {
         unmarshalKey(marsh);
 
         if (valBytes != null && val == null)
@@ -135,13 +135,13 @@ public class GridRawVersionedEntry<K, V> implements GridVersionedEntry<K, V>, Ex
      * @param marsh Marshaller.
      * @throws GridException If failed.
      */
-    private void unmarshalKey(GridMarshaller marsh) throws GridException {
+    private void unmarshalKey(IgniteMarshaller marsh) throws GridException {
         if (key == null)
             key = marsh.unmarshal(keyBytes, null);
     }
 
     /** {@inheritDoc} */
-    @Override public void marshal(GridMarshaller marsh) throws GridException {
+    @Override public void marshal(IgniteMarshaller marsh) throws GridException {
         if (keyBytes == null)
             keyBytes = marsh.marshal(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java
index 8a04583..90a7fe5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java
@@ -59,7 +59,7 @@ public interface GridVersionedEntry<K, V> extends Map.Entry<K, V> {
      * @param marsh Marshaller.
      * @throws GridException If failed.
      */
-    public void marshal(GridMarshaller marsh) throws GridException;
+    public void marshal(IgniteMarshaller marsh) throws GridException;
 
     /**
      * Perform internal unmarshal of this entry. It must be performed after entry is deserialized and before
@@ -68,5 +68,5 @@ public interface GridVersionedEntry<K, V> extends Map.Entry<K, V> {
      * @param marsh Marshaller.
      * @throws GridException If failed.
      */
-    public void unmarshal(GridMarshaller marsh) throws GridException;
+    public void unmarshal(IgniteMarshaller marsh) throws GridException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
index ff92b80..29b6e3d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
@@ -79,7 +79,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage {
     }
 
     /** {@inheritDoc} */
-    @Override public void prepareMarshal(GridMarshaller marsh) throws GridException {
+    @Override public void prepareMarshal(IgniteMarshaller marsh) throws GridException {
         super.prepareMarshal(marsh);
 
         if (err != null)
@@ -87,7 +87,7 @@ public class GridGgfsAckMessage extends GridGgfsCommunicationMessage {
     }
 
     /** {@inheritDoc} */
-    @Override public void finishUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
+    @Override public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
         super.finishUnmarshal(marsh, ldr);
 
         if (errBytes != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java
index 0c9ad31..ce88052 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java
@@ -31,7 +31,7 @@ public abstract class GridGgfsCommunicationMessage extends GridTcpCommunicationM
      * @param marsh Marshaller.
      * @throws GridException In case of error.
      */
-    public void prepareMarshal(GridMarshaller marsh) throws GridException {
+    public void prepareMarshal(IgniteMarshaller marsh) throws GridException {
         // No-op.
     }
 
@@ -40,7 +40,7 @@ public abstract class GridGgfsCommunicationMessage extends GridTcpCommunicationM
      * @param ldr Class loader.
      * @throws GridException In case of error.
      */
-    public void finishUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
+    public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
         // No-op.
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
index 7813fe5..82150f3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
@@ -83,7 +83,7 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage {
     }
 
     /** {@inheritDoc} */
-    @Override public void prepareMarshal(GridMarshaller marsh) throws GridException {
+    @Override public void prepareMarshal(IgniteMarshaller marsh) throws GridException {
         super.prepareMarshal(marsh);
 
         if (err != null)
@@ -91,7 +91,7 @@ public class GridGgfsDeleteMessage extends GridGgfsCommunicationMessage {
     }
 
     /** {@inheritDoc} */
-    @Override public void finishUnmarshal(GridMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
+    @Override public void finishUnmarshal(IgniteMarshaller marsh, @Nullable ClassLoader ldr) throws GridException {
         super.finishUnmarshal(marsh, ldr);
 
         if (errBytes != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
index b5589e1..a6914d7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
@@ -54,7 +54,7 @@ public class GridJobProcessor extends GridProcessorAdapter {
     public static final GridProductVersion SUBJECT_ID_ADDED_SINCE_VER = GridProductVersion.fromString("6.2.1");
 
     /** */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /** */
     private final boolean jobAlwaysActivate;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
index b18294e..c90e959 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
@@ -79,7 +79,7 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject {
     private final IgniteLogger log;
 
     /** */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /** */
     private final GridJobSessionImpl ses;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java
index cd5a31c..11d0ca8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java
@@ -31,7 +31,7 @@ public class GridOffHeapProcessor extends GridProcessorAdapter {
         new ConcurrentHashMap8<>();
 
     /** */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /**
      * @param ctx Kernal context.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
index 9ac4f99..5805a48 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
@@ -62,7 +62,7 @@ class GridResourceCustomInjector implements GridResourceInjector {
     private GridResourceBasicInjector<UUID> nodeIdInjector;
 
     /** Marshaller injector. */
-    private GridResourceBasicInjector<GridMarshaller> marshallerInjector;
+    private GridResourceBasicInjector<IgniteMarshaller> marshallerInjector;
 
     /** Spring application context injector. */
     private GridResourceInjector springCtxInjector;
@@ -158,7 +158,7 @@ class GridResourceCustomInjector implements GridResourceInjector {
      *
      * @param marshallerInjector Grid marshaller.
      */
-    public void setMarshallerInjector(GridResourceBasicInjector<GridMarshaller> marshallerInjector) {
+    public void setMarshallerInjector(GridResourceBasicInjector<IgniteMarshaller> marshallerInjector) {
         this.marshallerInjector = marshallerInjector;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
index 8463fe7..f2dbbde 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
@@ -90,7 +90,7 @@ public class GridResourceProcessor extends GridProcessorAdapter {
     private GridResourceBasicInjector<Executor> execInjector;
 
     /** Grid marshaller injector. */
-    private GridResourceBasicInjector<GridMarshaller> marshInjector;
+    private GridResourceBasicInjector<IgniteMarshaller> marshInjector;
 
     /** Local node ID injector. */
     private GridResourceBasicInjector<UUID> nodeIdInjector;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
index 1bcf300..32d00a3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
@@ -49,7 +49,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap
      * @param jdkMarshaller JDK marshaller.
      * @throws GridException If failed to marshal.
      */
-    public GridMemcachedMessageWrapper(GridMemcachedMessage msg, GridMarshaller jdkMarshaller) throws GridException {
+    public GridMemcachedMessageWrapper(GridMemcachedMessage msg, IgniteMarshaller jdkMarshaller) throws GridException {
         bytes = encodeMemcache(msg, jdkMarshaller);
     }
 
@@ -111,7 +111,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap
      * @return Serialized message.
      * @throws org.gridgain.grid.GridException If serialization failed.
      */
-    private byte[] encodeMemcache(GridMemcachedMessage msg, GridMarshaller jdkMarshaller) throws GridException {
+    private byte[] encodeMemcache(GridMemcachedMessage msg, IgniteMarshaller jdkMarshaller) throws GridException {
         GridByteArrayList res = new GridByteArrayList(HDR_LEN - 1);
 
         int keyLen = 0;
@@ -195,7 +195,7 @@ public class GridMemcachedMessageWrapper extends GridTcpCommunicationMessageAdap
      * @return Serialization flags.
      * @throws GridException If JDK serialization failed.
      */
-    private int encodeObj(Object obj, ByteArrayOutputStream out, GridMarshaller jdkMarshaller) throws GridException {
+    private int encodeObj(Object obj, ByteArrayOutputStream out, IgniteMarshaller jdkMarshaller) throws GridException {
         int flags = 0;
 
         byte[] data = null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index abcc72e..3c2c8a0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -42,7 +42,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
     private final GridRestProtocolHandler hnd;
 
     /** JDK marshaller. */
-    private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller();
+    private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller();
 
     /** Context. */
     private final GridKernalContext ctx;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
index 26d62c2..3f3719c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -34,7 +34,7 @@ public class GridTcpRestParser implements GridNioParser {
     private static final Charset UTF_8 = Charset.forName("UTF-8");
 
     /** JDK marshaller. */
-    private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller();
+    private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller();
 
     /** {@inheritDoc} */
     @Nullable @Override public GridClientMessage decode(GridNioSession ses, ByteBuffer buf) throws IOException,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 42c1de9..640c4ec 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -44,7 +44,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
     private GridNioServer<GridClientMessage> srv;
 
     /** JDK marshaller. */
-    private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller();
+    private final IgniteMarshaller jdkMarshaller = new IgniteJdkMarshaller();
 
     /** NIO server listener. */
     private GridTcpRestNioListener lsnr;
@@ -110,7 +110,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
     /**
      * @return JDK marshaller.
      */
-    GridMarshaller jdkMarshaller() {
+    IgniteMarshaller jdkMarshaller() {
         return jdkMarshaller;
     }
 


[40/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 4e32727f303f0d0ff22603e0b54fe1592c63f2a9
Parents: 7889277
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:37:41 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:37:41 2014 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |   2 +-
 .../grid/cache/store/GridCacheStore.java        |   2 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |   4 +-
 .../gridgain/grid/kernal/GridPortablesImpl.java |   4 +-
 .../VisorPortableMetadataCollectorTask.java     |   2 +-
 .../grid/portables/GridPortableBuilder.java     |   6 +-
 .../grid/portables/GridPortableMetadata.java    |   2 +-
 .../grid/portables/GridPortableObject.java      |   2 +-
 .../gridgain/grid/portables/GridPortables.java  | 357 -------------------
 .../grid/portables/IgnitePortables.java         | 357 +++++++++++++++++++
 .../java/org/gridgain/grid/GridSpringBean.java  |   2 +-
 11 files changed, 370 insertions(+), 370 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index 64352a5..d98c532 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -197,7 +197,7 @@ public interface Ignite extends AutoCloseable {
      *
      * @return Instance of {@code GridPortables} interface.
      */
-    public GridPortables portables();
+    public IgnitePortables portables();
 
     /**
      * Gets an instance of Data Center Replication.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
index 48b1acb..c257015 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
@@ -88,7 +88,7 @@ import java.util.Date;
  *     </li>
  * </ul>
  *
- * @see GridPortables
+ * @see org.gridgain.grid.portables.IgnitePortables
  */
 public interface GridCacheStore<K, V> {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 6a8474a..7846a4e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -207,7 +207,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
 
     /** Portables instance. */
     @GridToStringExclude
-    private GridPortables portables;
+    private IgnitePortables portables;
 
     /** Kernal gateway. */
     @GridToStringExclude
@@ -3181,7 +3181,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
     }
 
     /** {@inheritDoc} */
-    @Override public GridPortables portables() {
+    @Override public IgnitePortables portables() {
         if (!ctx.isEnterprise())
             throw new UnsupportedOperationException("Portables interface available in Enterprise edition only.");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
index 2bbe8cf..29f36dd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
@@ -16,9 +16,9 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 /**
- * {@link GridPortables} implementation.
+ * {@link org.gridgain.grid.portables.IgnitePortables} implementation.
  */
-public class GridPortablesImpl implements GridPortables {
+public class GridPortablesImpl implements IgnitePortables {
     /** */
     private GridKernalContext ctx;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
index 88e19c3..76744b0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
@@ -43,7 +43,7 @@ public class VisorPortableMetadataCollectorTask extends VisorOneNodeTask<Long, I
 
         /** {@inheritDoc} */
         @Override protected IgniteBiTuple<Long, Collection<VisorPortableMetadata>> run(Long lastUpdate) throws GridException {
-            final GridPortables p = g.portables();
+            final IgnitePortables p = g.portables();
 
             final Collection<VisorPortableMetadata> data = new ArrayList<>(p.metadata().size());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
index 41736ea..4201fd3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
@@ -53,9 +53,9 @@ import org.jetbrains.annotations.*;
  * String city = personPortableObj.getField("address").getField("city");
  * </pre>
  *
- * @see GridPortables#builder(int)
- * @see GridPortables#builder(String)
- * @see GridPortables#builder(GridPortableObject)
+ * @see IgnitePortables#builder(int)
+ * @see IgnitePortables#builder(String)
+ * @see IgnitePortables#builder(GridPortableObject)
  */
 public interface GridPortableBuilder {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
index 53cfec8..f7103c9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
+++ b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
@@ -15,7 +15,7 @@ import java.util.*;
 
 /**
  * Portable type meta data. Metadata for portable types can be accessed from any of the
- * {@link GridPortables#metadata(String) GridPortables.metadata(...)} methods.
+ * {@link IgnitePortables#metadata(String) GridPortables.metadata(...)} methods.
  * Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
  * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
index 9127b16..c201e7b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
+++ b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
@@ -105,7 +105,7 @@ import java.util.*;
  * <h1 class="header">Portable Metadata</h1>
  * Even though GridGain portable protocol only works with hash codes for type and field names
  * to achieve better performance, GridGain provides metadata for all portable types which
- * can be queried ar runtime via any of the {@link GridPortables#metadata(Class) GridPortables.metadata(...)}
+ * can be queried ar runtime via any of the {@link IgnitePortables#metadata(Class) GridPortables.metadata(...)}
  * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
  * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/portables/GridPortables.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortables.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortables.java
deleted file mode 100644
index 490b460..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortables.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-
-/**
- * Defines portable objects functionality. With portable objects you are able to:
- * <ul>
- * <li>Seamlessly interoperate between Java, .NET, and C++.</li>
- * <li>Make any object portable with zero code change to your existing code.</li>
- * <li>Nest portable objects within each other.</li>
- * <li>Automatically handle {@code circular} or {@code null} references.</li>
- * <li>Automatically convert collections and maps between Java, .NET, and C++.</li>
- * <li>
- *      Optionally avoid deserialization of objects on the server side
- *      (objects are stored in {@link GridPortableObject} format).
- * </li>
- * <li>Avoid need to have concrete class definitions on the server side.</li>
- * <li>Dynamically change structure of the classes without having to restart the cluster.</li>
- * <li>Index into portable objects for querying purposes.</li>
- * </ul>
- * <h1 class="header">Working With Portables Directly</h1>
- * Once an object is defined as portable,
- * GridGain will always store it in memory in the portable (i.e. binary) format.
- * User can choose to work either with the portable format or with the deserialized form
- * (assuming that class definitions are present in the classpath).
- * <p>
- * To work with the portable format directly, user should create a special cache projection
- * using {@link GridCacheProjection#keepPortable()} method and then retrieve individual fields as needed:
- * <pre name=code class=java>
- * GridCacheProjection&lt;GridPortableObject.class, GridPortableObject.class&gt; prj = cache.keepPortable();
- *
- * // Convert instance of MyKey to portable format.
- * // We could also use GridPortableBuilder to create
- * // the key in portable format directly.
- * GridPortableObject key = grid.portables().toPortable(new MyKey());
- *
- * GridPortableObject val = prj.get(key);
- *
- * String field = val.field("myFieldName");
- * </pre>
- * Alternatively, if we have class definitions in the classpath, we may choose to work with deserialized
- * typed objects at all times. In this case we do incur the deserialization cost, however,
- * GridGain will only deserialize on the first access and will cache the deserialized object,
- * so it does not have to be deserialized again:
- * <pre name=code class=java>
- * GridCacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
- *     cache.projection(MyKey.class, MyValue.class);
- *
- * MyValue val = prj.get(new MyKey());
- *
- * // Normal java getter.
- * String fieldVal = val.getMyFieldName();
- * </pre>
- * If we used, for example, one of the automatically handled portable types for a key, like integer,
- * and still wanted to work with binary portable format for values, then we would declare cache projection
- * as follows:
- * <pre name=code class=java>
- * GridCacheProjection&lt;Integer.class, GridPortableObject.class&gt; prj = cache.keepPortable();
- * </pre>
- * <h1 class="header">Automatic Portable Types</h1>
- * Note that only portable classes are converted to {@link GridPortableObject} format. Following
- * classes are never converted (e.g., {@link #toPortable(Object)} method will return original
- * object, and instances of these classes will be stored in cache without changes):
- * <ul>
- *     <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li>
- *     <li>Arrays of primitives (byte[], int[], ...)</li>
- *     <li>{@link String} and array of {@link String}s</li>
- *     <li>{@link UUID} and array of {@link UUID}s</li>
- *     <li>{@link Date} and array of {@link Date}s</li>
- *     <li>{@link Timestamp} and array of {@link Timestamp}s</li>
- *     <li>Enums and array of enums</li>
- *     <li>
- *         Maps, collections and array of objects (but objects inside
- *         them will still be converted if they are portable)
- *     </li>
- * </ul>
- * <h1 class="header">Working With Maps and Collections</h1>
- * All maps and collections in the portable objects are serialized automatically. When working
- * with different platforms, e.g. C++ or .NET, GridGain will automatically pick the most
- * adequate collection or map in either language. For example, {@link ArrayList} in Java will become
- * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap}
- * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
- * in C#, etc.
- * <h1 class="header">Building Portable Objects</h1>
- * GridGain comes with {@link GridPortableBuilder} which allows to build portable objects dynamically:
- * <pre name=code class=java>
- * GridPortableBuilder builder = GridGain.grid().portables().builder();
- *
- * builder.typeId("MyObject");
- *
- * builder.stringField("fieldA", "A");
- * build.intField("fieldB", "B");
- *
- * GridPortableObject portableObj = builder.build();
- * </pre>
- * For the cases when class definition is present
- * in the class path, it is also possible to populate a standard POJO and then
- * convert it to portable format, like so:
- * <pre name=code class=java>
- * MyObject obj = new MyObject();
- *
- * obj.setFieldA("A");
- * obj.setFieldB(123);
- *
- * GridPortableObject portableObj = GridGain.grid().portables().toPortable(obj);
- * </pre>
- * NOTE: you don't need to convert typed objects to portable format before storing
- * them in cache, GridGain will do that automatically.
- * <h1 class="header">Portable Metadata</h1>
- * Even though GridGain portable protocol only works with hash codes for type and field names
- * to achieve better performance, GridGain provides metadata for all portable types which
- * can be queried ar runtime via any of the {@link GridPortables#metadata(Class) GridPortables.metadata(...)}
- * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
- * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
- * <h1 class="header">Dynamic Structure Changes</h1>
- * Since objects are always cached in the portable binary format, server does not need to
- * be aware of the class definitions. Moreover, if class definitions are not present or not
- * used on the server, then clients can continuously change the structure of the portable
- * objects without having to restart the cluster. For example, if one client stores a
- * certain class with fields A and B, and another client stores the same class with
- * fields B and C, then the server-side portable object will have the fields A, B, and C.
- * As the structure of a portable object changes, the new fields become available for SQL queries
- * automatically.
- * <h1 class="header">Configuration</h1>
- * To make any object portable, you have to specify it in {@link GridPortableConfiguration}
- * at startup. The only requirement GridGain imposes is that your object has an empty
- * constructor. Note, that since server side does not have to know the class definition,
- * you only need to list portable objects in configuration on the client side. However, if you
- * list them on the server side as well, then you get the ability to deserialize portable objects
- * into concrete types on the server as well as on the client.
- * <p>
- * Here is an example of portable configuration (note that star (*) notation is supported):
- * <pre name=code class=xml>
- * ...
- * &lt;!-- Portable objects configuration. --&gt;
- * &lt;property name="portableConfiguration"&gt;
- *     &lt;bean class="org.gridgain.grid.portables.GridPortableConfiguration"&gt;
- *         &lt;property name="classNames"&gt;
- *             &lt;list&gt;
- *                 &lt;value&gt;my.package.for.portable.objects.*&lt;/value&gt;
- *                 &lt;value&gt;org.gridgain.examples.client.portable.Employee&lt;/value&gt;
- *             &lt;/list&gt;
- *         &lt;/property&gt;
- *     &lt;/bean&gt;
- * &lt;/property&gt;
- * ...
- * </pre>
- * or from code:
- * <pre name=code class=java>
- * GridConfiguration gridCfg = new GridConfiguration();
- *
- * GridPortableConfiguration portCfg = new GridPortableConfiguration();
- *
- * portCfg.setClassNames(Arrays.asList(
- *     Employee.class.getName(),
- *     Address.class.getName())
- * );
- *
- * gridCfg.setPortableConfiguration(portCfg);
- * </pre>
- * You can also specify class name for a portable object via {@link GridPortableTypeConfiguration}.
- * Do it in case if you need to override other configuration properties on per-type level, like
- * ID-mapper, or serializer.
- * <h1 class="header">Custom Affinity Keys</h1>
- * Often you need to specify an alternate key (not the cache key) for affinity routing whenever
- * storing objects in cache. For example, if you are caching {@code Employee} object with
- * {@code Organization}, and want to colocate employees with organization they work for,
- * so you can process them together, you need to specify an alternate affinity key.
- * With portable objects you would have to do it as following:
- * <pre name=code class=xml>
- * &lt;property name="portableConfiguration"&gt;
- *     &lt;bean class="org.gridgain.grid.portables.GridPortableConfiguration"&gt;
- *         ...
- *         &lt;property name="typeConfigurations"&gt;
- *             &lt;list&gt;
- *                 &lt;bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration"&gt;
- *                     &lt;property name="className" value="org.gridgain.examples.client.portable.EmployeeKey"/&gt;
- *                     &lt;property name="affinityKeyFieldName" value="organizationId"/&gt;
- *                 &lt;/bean&gt;
- *             &lt;/list&gt;
- *         &lt;/property&gt;
- *         ...
- *     &lt;/bean&gt;
- * &lt;/property&gt;
- * </pre>
- * <h1 class="header">Serialization</h1>
- * Once portable object is specified in {@link GridPortableConfiguration}, GridGain will
- * be able to serialize and deserialize it. However, you can provide your own custom
- * serialization logic by optionally implementing {@link GridPortableMarshalAware} interface, like so:
- * <pre name=code class=java>
- * public class Address implements GridPortableMarshalAware {
- *     private String street;
- *     private int zip;
- *
- *     // Empty constructor required for portable deserialization.
- *     public Address() {}
- *
- *     &#64;Override public void writePortable(GridPortableWriter writer) throws GridPortableException {
- *         writer.writeString("street", street);
- *         writer.writeInt("zip", zip);
- *     }
- *
- *     &#64;Override public void readPortable(GridPortableReader reader) throws GridPortableException {
- *         street = reader.readString("street");
- *         zip = reader.readInt("zip");
- *     }
- * }
- * </pre>
- * Alternatively, if you cannot change class definitions, you can provide custom serialization
- * logic in {@link GridPortableSerializer} either globally in {@link GridPortableConfiguration} or
- * for a specific type via {@link GridPortableTypeConfiguration} instance.
- * <p>
- * Similar to java serialization you can use {@code writeReplace()} and {@code readResolve()} methods.
- * <ul>
- *     <li>
- *         {@code readResolve} is defined as follows: {@code ANY-ACCESS-MODIFIER Object readResolve()}.
- *         It may be used to replace the de-serialized object by another one of your choice.
- *     </li>
- *     <li>
- *          {@code writeReplace} is defined as follows: {@code ANY-ACCESS-MODIFIER Object writeReplace()}. This method allows the
- *          developer to provide a replacement object that will be serialized instead of the original one.
- *     </li>
- * </ul>
- *
- * <h1 class="header">Custom ID Mappers</h1>
- * GridGain implementation uses name hash codes to generate IDs for class names or field names
- * internally. However, in cases when you want to provide your own ID mapping schema,
- * you can provide your own {@link GridPortableIdMapper} implementation.
- * <p>
- * ID-mapper may be provided either globally in {@link GridPortableConfiguration},
- * or for a specific type via {@link GridPortableTypeConfiguration} instance.
- * <h1 class="header">Query Indexing</h1>
- * Portable objects can be indexed for querying by specifying index fields in
- * {@link GridCacheQueryTypeMetadata} inside of specific {@link GridCacheConfiguration} instance,
- * like so:
- * <pre name=code class=xml>
- * ...
- * &lt;bean class="org.gridgain.grid.cache.GridCacheConfiguration"&gt;
- *     ...
- *     &lt;property name="queryConfiguration"&gt;
- *         &lt;bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration"&gt;
- *             &lt;property name="typeMetadata"&gt;
- *                 &lt;list&gt;
- *                     &lt;bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"&gt;
- *                         &lt;property name="type" value="Employee"/&gt;
- *
- *                         &lt;!-- Fields to index in ascending order. --&gt;
- *                         &lt;property name="ascendingFields"&gt;
- *                             &lt;map&gt;
- *                             	&lt;entry key="name" value="java.lang.String"/&gt;
- *
- *                                 &lt;!-- Nested portable objects can also be indexed. --&gt;
- *                                 &lt;entry key="address.zip" value="java.lang.Integer"/&gt;
- *                             &lt;/map&gt;
- *                         &lt;/property&gt;
- *                     &lt;/bean&gt;
- *                 &lt;/list&gt;
- *             &lt;/property&gt;
- *         &lt;/bean&gt;
- *     &lt;/property&gt;
- * &lt;/bean&gt;
- * </pre>
- */
-public interface GridPortables {
-    /**
-     * Gets type ID for given type name.
-     *
-     * @param typeName Type name.
-     * @return Type ID.
-     */
-    public int typeId(String typeName);
-
-    /**
-     * Converts provided object to instance of {@link GridPortableObject}.
-     * <p>
-     * Note that object's type needs to be configured in {@link GridPortableConfiguration}.
-     *
-     * @param obj Object to convert.
-     * @return Converted object.
-     * @throws GridPortableException In case of error.
-     */
-    public <T> T toPortable(@Nullable Object obj) throws GridPortableException;
-
-    /**
-     * Creates new portable builder.
-     *
-     * @param typeId ID of the type.
-     * @return Newly portable builder.
-     */
-    public GridPortableBuilder builder(int typeId);
-
-    /**
-     * Creates new portable builder.
-     *
-     * @param typeName Type name.
-     * @return Newly portable builder.
-     */
-    public GridPortableBuilder builder(String typeName);
-
-    /**
-     * Creates portable builder initialized by existing portable object.
-     *
-     * @param portableObj Portable object to initialize builder.
-     * @return Portable builder.
-     */
-    public GridPortableBuilder builder(GridPortableObject portableObj);
-
-    /**
-     * Gets metadata for provided class.
-     *
-     * @param cls Class.
-     * @return Metadata.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public GridPortableMetadata metadata(Class<?> cls) throws GridPortableException;
-
-    /**
-     * Gets metadata for provided class name.
-     *
-     * @param typeName Type name.
-     * @return Metadata.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public GridPortableMetadata metadata(String typeName) throws GridPortableException;
-
-    /**
-     * Gets metadata for provided type ID.
-     *
-     * @param typeId Type ID.
-     * @return Metadata.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public GridPortableMetadata metadata(int typeId) throws GridPortableException;
-
-    /**
-     * Gets metadata for all known types.
-     *
-     * @return Metadata.
-     * @throws GridPortableException In case of error.
-     */
-    public Collection<GridPortableMetadata> metadata() throws GridPortableException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/core/src/main/java/org/gridgain/grid/portables/IgnitePortables.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/IgnitePortables.java b/modules/core/src/main/java/org/gridgain/grid/portables/IgnitePortables.java
new file mode 100644
index 0000000..6471551
--- /dev/null
+++ b/modules/core/src/main/java/org/gridgain/grid/portables/IgnitePortables.java
@@ -0,0 +1,357 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.gridgain.grid.portables;
+
+import org.gridgain.grid.cache.*;
+import org.gridgain.grid.cache.query.*;
+import org.jetbrains.annotations.*;
+
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
+
+/**
+ * Defines portable objects functionality. With portable objects you are able to:
+ * <ul>
+ * <li>Seamlessly interoperate between Java, .NET, and C++.</li>
+ * <li>Make any object portable with zero code change to your existing code.</li>
+ * <li>Nest portable objects within each other.</li>
+ * <li>Automatically handle {@code circular} or {@code null} references.</li>
+ * <li>Automatically convert collections and maps between Java, .NET, and C++.</li>
+ * <li>
+ *      Optionally avoid deserialization of objects on the server side
+ *      (objects are stored in {@link GridPortableObject} format).
+ * </li>
+ * <li>Avoid need to have concrete class definitions on the server side.</li>
+ * <li>Dynamically change structure of the classes without having to restart the cluster.</li>
+ * <li>Index into portable objects for querying purposes.</li>
+ * </ul>
+ * <h1 class="header">Working With Portables Directly</h1>
+ * Once an object is defined as portable,
+ * GridGain will always store it in memory in the portable (i.e. binary) format.
+ * User can choose to work either with the portable format or with the deserialized form
+ * (assuming that class definitions are present in the classpath).
+ * <p>
+ * To work with the portable format directly, user should create a special cache projection
+ * using {@link GridCacheProjection#keepPortable()} method and then retrieve individual fields as needed:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;GridPortableObject.class, GridPortableObject.class&gt; prj = cache.keepPortable();
+ *
+ * // Convert instance of MyKey to portable format.
+ * // We could also use GridPortableBuilder to create
+ * // the key in portable format directly.
+ * GridPortableObject key = grid.portables().toPortable(new MyKey());
+ *
+ * GridPortableObject val = prj.get(key);
+ *
+ * String field = val.field("myFieldName");
+ * </pre>
+ * Alternatively, if we have class definitions in the classpath, we may choose to work with deserialized
+ * typed objects at all times. In this case we do incur the deserialization cost, however,
+ * GridGain will only deserialize on the first access and will cache the deserialized object,
+ * so it does not have to be deserialized again:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
+ *     cache.projection(MyKey.class, MyValue.class);
+ *
+ * MyValue val = prj.get(new MyKey());
+ *
+ * // Normal java getter.
+ * String fieldVal = val.getMyFieldName();
+ * </pre>
+ * If we used, for example, one of the automatically handled portable types for a key, like integer,
+ * and still wanted to work with binary portable format for values, then we would declare cache projection
+ * as follows:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;Integer.class, GridPortableObject.class&gt; prj = cache.keepPortable();
+ * </pre>
+ * <h1 class="header">Automatic Portable Types</h1>
+ * Note that only portable classes are converted to {@link GridPortableObject} format. Following
+ * classes are never converted (e.g., {@link #toPortable(Object)} method will return original
+ * object, and instances of these classes will be stored in cache without changes):
+ * <ul>
+ *     <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li>
+ *     <li>Arrays of primitives (byte[], int[], ...)</li>
+ *     <li>{@link String} and array of {@link String}s</li>
+ *     <li>{@link UUID} and array of {@link UUID}s</li>
+ *     <li>{@link Date} and array of {@link Date}s</li>
+ *     <li>{@link Timestamp} and array of {@link Timestamp}s</li>
+ *     <li>Enums and array of enums</li>
+ *     <li>
+ *         Maps, collections and array of objects (but objects inside
+ *         them will still be converted if they are portable)
+ *     </li>
+ * </ul>
+ * <h1 class="header">Working With Maps and Collections</h1>
+ * All maps and collections in the portable objects are serialized automatically. When working
+ * with different platforms, e.g. C++ or .NET, GridGain will automatically pick the most
+ * adequate collection or map in either language. For example, {@link ArrayList} in Java will become
+ * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap}
+ * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
+ * in C#, etc.
+ * <h1 class="header">Building Portable Objects</h1>
+ * GridGain comes with {@link GridPortableBuilder} which allows to build portable objects dynamically:
+ * <pre name=code class=java>
+ * GridPortableBuilder builder = GridGain.grid().portables().builder();
+ *
+ * builder.typeId("MyObject");
+ *
+ * builder.stringField("fieldA", "A");
+ * build.intField("fieldB", "B");
+ *
+ * GridPortableObject portableObj = builder.build();
+ * </pre>
+ * For the cases when class definition is present
+ * in the class path, it is also possible to populate a standard POJO and then
+ * convert it to portable format, like so:
+ * <pre name=code class=java>
+ * MyObject obj = new MyObject();
+ *
+ * obj.setFieldA("A");
+ * obj.setFieldB(123);
+ *
+ * GridPortableObject portableObj = GridGain.grid().portables().toPortable(obj);
+ * </pre>
+ * NOTE: you don't need to convert typed objects to portable format before storing
+ * them in cache, GridGain will do that automatically.
+ * <h1 class="header">Portable Metadata</h1>
+ * Even though GridGain portable protocol only works with hash codes for type and field names
+ * to achieve better performance, GridGain provides metadata for all portable types which
+ * can be queried ar runtime via any of the {@link IgnitePortables#metadata(Class) GridPortables.metadata(...)}
+ * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
+ * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
+ * <h1 class="header">Dynamic Structure Changes</h1>
+ * Since objects are always cached in the portable binary format, server does not need to
+ * be aware of the class definitions. Moreover, if class definitions are not present or not
+ * used on the server, then clients can continuously change the structure of the portable
+ * objects without having to restart the cluster. For example, if one client stores a
+ * certain class with fields A and B, and another client stores the same class with
+ * fields B and C, then the server-side portable object will have the fields A, B, and C.
+ * As the structure of a portable object changes, the new fields become available for SQL queries
+ * automatically.
+ * <h1 class="header">Configuration</h1>
+ * To make any object portable, you have to specify it in {@link GridPortableConfiguration}
+ * at startup. The only requirement GridGain imposes is that your object has an empty
+ * constructor. Note, that since server side does not have to know the class definition,
+ * you only need to list portable objects in configuration on the client side. However, if you
+ * list them on the server side as well, then you get the ability to deserialize portable objects
+ * into concrete types on the server as well as on the client.
+ * <p>
+ * Here is an example of portable configuration (note that star (*) notation is supported):
+ * <pre name=code class=xml>
+ * ...
+ * &lt;!-- Portable objects configuration. --&gt;
+ * &lt;property name="portableConfiguration"&gt;
+ *     &lt;bean class="org.gridgain.grid.portables.GridPortableConfiguration"&gt;
+ *         &lt;property name="classNames"&gt;
+ *             &lt;list&gt;
+ *                 &lt;value&gt;my.package.for.portable.objects.*&lt;/value&gt;
+ *                 &lt;value&gt;org.gridgain.examples.client.portable.Employee&lt;/value&gt;
+ *             &lt;/list&gt;
+ *         &lt;/property&gt;
+ *     &lt;/bean&gt;
+ * &lt;/property&gt;
+ * ...
+ * </pre>
+ * or from code:
+ * <pre name=code class=java>
+ * GridConfiguration gridCfg = new GridConfiguration();
+ *
+ * GridPortableConfiguration portCfg = new GridPortableConfiguration();
+ *
+ * portCfg.setClassNames(Arrays.asList(
+ *     Employee.class.getName(),
+ *     Address.class.getName())
+ * );
+ *
+ * gridCfg.setPortableConfiguration(portCfg);
+ * </pre>
+ * You can also specify class name for a portable object via {@link GridPortableTypeConfiguration}.
+ * Do it in case if you need to override other configuration properties on per-type level, like
+ * ID-mapper, or serializer.
+ * <h1 class="header">Custom Affinity Keys</h1>
+ * Often you need to specify an alternate key (not the cache key) for affinity routing whenever
+ * storing objects in cache. For example, if you are caching {@code Employee} object with
+ * {@code Organization}, and want to colocate employees with organization they work for,
+ * so you can process them together, you need to specify an alternate affinity key.
+ * With portable objects you would have to do it as following:
+ * <pre name=code class=xml>
+ * &lt;property name="portableConfiguration"&gt;
+ *     &lt;bean class="org.gridgain.grid.portables.GridPortableConfiguration"&gt;
+ *         ...
+ *         &lt;property name="typeConfigurations"&gt;
+ *             &lt;list&gt;
+ *                 &lt;bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration"&gt;
+ *                     &lt;property name="className" value="org.gridgain.examples.client.portable.EmployeeKey"/&gt;
+ *                     &lt;property name="affinityKeyFieldName" value="organizationId"/&gt;
+ *                 &lt;/bean&gt;
+ *             &lt;/list&gt;
+ *         &lt;/property&gt;
+ *         ...
+ *     &lt;/bean&gt;
+ * &lt;/property&gt;
+ * </pre>
+ * <h1 class="header">Serialization</h1>
+ * Once portable object is specified in {@link GridPortableConfiguration}, GridGain will
+ * be able to serialize and deserialize it. However, you can provide your own custom
+ * serialization logic by optionally implementing {@link GridPortableMarshalAware} interface, like so:
+ * <pre name=code class=java>
+ * public class Address implements GridPortableMarshalAware {
+ *     private String street;
+ *     private int zip;
+ *
+ *     // Empty constructor required for portable deserialization.
+ *     public Address() {}
+ *
+ *     &#64;Override public void writePortable(GridPortableWriter writer) throws GridPortableException {
+ *         writer.writeString("street", street);
+ *         writer.writeInt("zip", zip);
+ *     }
+ *
+ *     &#64;Override public void readPortable(GridPortableReader reader) throws GridPortableException {
+ *         street = reader.readString("street");
+ *         zip = reader.readInt("zip");
+ *     }
+ * }
+ * </pre>
+ * Alternatively, if you cannot change class definitions, you can provide custom serialization
+ * logic in {@link GridPortableSerializer} either globally in {@link GridPortableConfiguration} or
+ * for a specific type via {@link GridPortableTypeConfiguration} instance.
+ * <p>
+ * Similar to java serialization you can use {@code writeReplace()} and {@code readResolve()} methods.
+ * <ul>
+ *     <li>
+ *         {@code readResolve} is defined as follows: {@code ANY-ACCESS-MODIFIER Object readResolve()}.
+ *         It may be used to replace the de-serialized object by another one of your choice.
+ *     </li>
+ *     <li>
+ *          {@code writeReplace} is defined as follows: {@code ANY-ACCESS-MODIFIER Object writeReplace()}. This method allows the
+ *          developer to provide a replacement object that will be serialized instead of the original one.
+ *     </li>
+ * </ul>
+ *
+ * <h1 class="header">Custom ID Mappers</h1>
+ * GridGain implementation uses name hash codes to generate IDs for class names or field names
+ * internally. However, in cases when you want to provide your own ID mapping schema,
+ * you can provide your own {@link GridPortableIdMapper} implementation.
+ * <p>
+ * ID-mapper may be provided either globally in {@link GridPortableConfiguration},
+ * or for a specific type via {@link GridPortableTypeConfiguration} instance.
+ * <h1 class="header">Query Indexing</h1>
+ * Portable objects can be indexed for querying by specifying index fields in
+ * {@link GridCacheQueryTypeMetadata} inside of specific {@link GridCacheConfiguration} instance,
+ * like so:
+ * <pre name=code class=xml>
+ * ...
+ * &lt;bean class="org.gridgain.grid.cache.GridCacheConfiguration"&gt;
+ *     ...
+ *     &lt;property name="queryConfiguration"&gt;
+ *         &lt;bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration"&gt;
+ *             &lt;property name="typeMetadata"&gt;
+ *                 &lt;list&gt;
+ *                     &lt;bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"&gt;
+ *                         &lt;property name="type" value="Employee"/&gt;
+ *
+ *                         &lt;!-- Fields to index in ascending order. --&gt;
+ *                         &lt;property name="ascendingFields"&gt;
+ *                             &lt;map&gt;
+ *                             	&lt;entry key="name" value="java.lang.String"/&gt;
+ *
+ *                                 &lt;!-- Nested portable objects can also be indexed. --&gt;
+ *                                 &lt;entry key="address.zip" value="java.lang.Integer"/&gt;
+ *                             &lt;/map&gt;
+ *                         &lt;/property&gt;
+ *                     &lt;/bean&gt;
+ *                 &lt;/list&gt;
+ *             &lt;/property&gt;
+ *         &lt;/bean&gt;
+ *     &lt;/property&gt;
+ * &lt;/bean&gt;
+ * </pre>
+ */
+public interface IgnitePortables {
+    /**
+     * Gets type ID for given type name.
+     *
+     * @param typeName Type name.
+     * @return Type ID.
+     */
+    public int typeId(String typeName);
+
+    /**
+     * Converts provided object to instance of {@link GridPortableObject}.
+     * <p>
+     * Note that object's type needs to be configured in {@link GridPortableConfiguration}.
+     *
+     * @param obj Object to convert.
+     * @return Converted object.
+     * @throws GridPortableException In case of error.
+     */
+    public <T> T toPortable(@Nullable Object obj) throws GridPortableException;
+
+    /**
+     * Creates new portable builder.
+     *
+     * @param typeId ID of the type.
+     * @return Newly portable builder.
+     */
+    public GridPortableBuilder builder(int typeId);
+
+    /**
+     * Creates new portable builder.
+     *
+     * @param typeName Type name.
+     * @return Newly portable builder.
+     */
+    public GridPortableBuilder builder(String typeName);
+
+    /**
+     * Creates portable builder initialized by existing portable object.
+     *
+     * @param portableObj Portable object to initialize builder.
+     * @return Portable builder.
+     */
+    public GridPortableBuilder builder(GridPortableObject portableObj);
+
+    /**
+     * Gets metadata for provided class.
+     *
+     * @param cls Class.
+     * @return Metadata.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public GridPortableMetadata metadata(Class<?> cls) throws GridPortableException;
+
+    /**
+     * Gets metadata for provided class name.
+     *
+     * @param typeName Type name.
+     * @return Metadata.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public GridPortableMetadata metadata(String typeName) throws GridPortableException;
+
+    /**
+     * Gets metadata for provided type ID.
+     *
+     * @param typeId Type ID.
+     * @return Metadata.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public GridPortableMetadata metadata(int typeId) throws GridPortableException;
+
+    /**
+     * Gets metadata for all known types.
+     *
+     * @return Metadata.
+     * @throws GridPortableException In case of error.
+     */
+    public Collection<GridPortableMetadata> metadata() throws GridPortableException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e32727f/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
index 20857d1..bf5e245 100644
--- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
+++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
@@ -245,7 +245,7 @@ public class GridSpringBean extends GridMetadataAwareAdapter implements Ignite,
     }
 
     /** {@inheritDoc} */
-    @Override public GridPortables portables() {
+    @Override public IgnitePortables portables() {
         assert g != null;
 
         return g.portables();


[42/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableRawReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableRawReader.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableRawReader.java
deleted file mode 100644
index 407efa9..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableRawReader.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-
-/**
- * Raw reader for portable objects. Raw reader does not use field name hash codes, therefore,
- * making the format even more compact. However, if the raw reader is used,
- * dynamic structure changes to the portable objects are not supported.
- */
-public interface GridPortableRawReader {
-    /**
-     * @return Byte value.
-     * @throws GridPortableException In case of error.
-     */
-    public byte readByte() throws GridPortableException;
-
-    /**
-     * @return Short value.
-     * @throws GridPortableException In case of error.
-     */
-    public short readShort() throws GridPortableException;
-
-    /**
-     * @return Integer value.
-     * @throws GridPortableException In case of error.
-     */
-    public int readInt() throws GridPortableException;
-
-    /**
-     * @return Long value.
-     * @throws GridPortableException In case of error.
-     */
-    public long readLong() throws GridPortableException;
-
-    /**
-     * @return Float value.
-     * @throws GridPortableException In case of error.
-     */
-    public float readFloat() throws GridPortableException;
-
-    /**
-     * @return Double value.
-     * @throws GridPortableException In case of error.
-     */
-    public double readDouble() throws GridPortableException;
-
-    /**
-     * @return Char value.
-     * @throws GridPortableException In case of error.
-     */
-    public char readChar() throws GridPortableException;
-
-    /**
-     * @return Boolean value.
-     * @throws GridPortableException In case of error.
-     */
-    public boolean readBoolean() throws GridPortableException;
-
-    /**
-     * @return String value.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public String readString() throws GridPortableException;
-
-    /**
-     * @return UUID.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public UUID readUuid() throws GridPortableException;
-
-    /**
-     * @return Date.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Date readDate() throws GridPortableException;
-
-    /**
-     * @return Timestamp.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Timestamp readTimestamp() throws GridPortableException;
-
-    /**
-     * @return Object.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Object readObject() throws GridPortableException;
-
-    /**
-     * @return Byte array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public byte[] readByteArray() throws GridPortableException;
-
-    /**
-     * @return Short array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public short[] readShortArray() throws GridPortableException;
-
-    /**
-     * @return Integer array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public int[] readIntArray() throws GridPortableException;
-
-    /**
-     * @return Long array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public long[] readLongArray() throws GridPortableException;
-
-    /**
-     * @return Float array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public float[] readFloatArray() throws GridPortableException;
-
-    /**
-     * @return Byte array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public double[] readDoubleArray() throws GridPortableException;
-
-    /**
-     * @return Char array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public char[] readCharArray() throws GridPortableException;
-
-    /**
-     * @return Boolean array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public boolean[] readBooleanArray() throws GridPortableException;
-
-    /**
-     * @return String array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public String[] readStringArray() throws GridPortableException;
-
-    /**
-     * @return UUID array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public UUID[] readUuidArray() throws GridPortableException;
-
-    /**
-     * @return Date array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Date[] readDateArray() throws GridPortableException;
-
-    /**
-     * @return Object array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Object[] readObjectArray() throws GridPortableException;
-
-    /**
-     * @return Collection.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T> Collection<T> readCollection() throws GridPortableException;
-
-    /**
-     * @param colCls Collection class.
-     * @return Collection.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T> Collection<T> readCollection(Class<? extends Collection<T>> colCls)
-        throws GridPortableException;
-
-    /**
-     * @return Map.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <K, V> Map<K, V> readMap() throws GridPortableException;
-
-    /**
-     * @param mapCls Map class.
-     * @return Map.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <K, V> Map<K, V> readMap(Class<? extends Map<K, V>> mapCls) throws GridPortableException;
-
-    /**
-     * @param enumCls Enum class.
-     * @return Value.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T extends Enum<?>> T readEnum(Class<T> enumCls) throws GridPortableException;
-
-    /**
-     * @param enumCls Enum class.
-     * @return Value.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T extends Enum<?>> T[] readEnumArray(Class<T> enumCls) throws GridPortableException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableRawWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableRawWriter.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableRawWriter.java
deleted file mode 100644
index c3840a9..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableRawWriter.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-
-/**
- * Raw writer for portable object. Raw writer does not write field name hash codes, therefore,
- * making the format even more compact. However, if the raw writer is used,
- * dynamic structure changes to the portable objects are not supported.
- */
-public interface GridPortableRawWriter {
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeByte(byte val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeShort(short val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeInt(int val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeLong(long val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeFloat(float val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeDouble(double val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeChar(char val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeBoolean(boolean val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeString(@Nullable String val) throws GridPortableException;
-
-    /**
-     * @param val UUID to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeUuid(@Nullable UUID val) throws GridPortableException;
-
-    /**
-     * @param val Date to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeDate(@Nullable Date val) throws GridPortableException;
-
-    /**
-     * @param val Timestamp to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeTimestamp(@Nullable Timestamp val) throws GridPortableException;
-
-    /**
-     * @param obj Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeObject(@Nullable Object obj) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeByteArray(@Nullable byte[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeShortArray(@Nullable short[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeIntArray(@Nullable int[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeLongArray(@Nullable long[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeFloatArray(@Nullable float[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeDoubleArray(@Nullable double[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeCharArray(@Nullable char[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeBooleanArray(@Nullable boolean[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeStringArray(@Nullable String[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeUuidArray(@Nullable UUID[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeDateArray(@Nullable Date[] val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeObjectArray(@Nullable Object[] val) throws GridPortableException;
-
-    /**
-     * @param col Collection to write.
-     * @throws GridPortableException In case of error.
-     */
-    public <T> void writeCollection(@Nullable Collection<T> col) throws GridPortableException;
-
-    /**
-     * @param map Map to write.
-     * @throws GridPortableException In case of error.
-     */
-    public <K, V> void writeMap(@Nullable Map<K, V> map) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public <T extends Enum<?>> void writeEnum(T val) throws GridPortableException;
-
-    /**
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public <T extends Enum<?>> void writeEnumArray(T[] val) throws GridPortableException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableReader.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableReader.java
deleted file mode 100644
index c2f18be..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableReader.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-
-/**
- * Reader for portable objects used in {@link GridPortableMarshalAware} implementations.
- * Useful for the cases when user wants a fine-grained control over serialization.
- * <p>
- * Note that GridGain never writes full strings for field or type names. Instead,
- * for performance reasons, GridGain writes integer hash codes for type and field names.
- * It has been tested that hash code conflicts for the type names or the field names
- * within the same type are virtually non-existent and, to gain performance, it is safe
- * to work with hash codes. For the cases when hash codes for different types or fields
- * actually do collide, GridGain provides {@link GridPortableIdMapper} which
- * allows to override the automatically generated hash code IDs for the type and field names.
- */
-public interface GridPortableReader {
-    /**
-     * @param fieldName Field name.
-     * @return Byte value.
-     * @throws GridPortableException In case of error.
-     */
-    public byte readByte(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Short value.
-     * @throws GridPortableException In case of error.
-     */
-    public short readShort(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Integer value.
-     * @throws GridPortableException In case of error.
-     */
-    public int readInt(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Long value.
-     * @throws GridPortableException In case of error.
-     */
-    public long readLong(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @throws GridPortableException In case of error.
-     * @return Float value.
-     */
-    public float readFloat(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Double value.
-     * @throws GridPortableException In case of error.
-     */
-    public double readDouble(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Char value.
-     * @throws GridPortableException In case of error.
-     */
-    public char readChar(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Boolean value.
-     * @throws GridPortableException In case of error.
-     */
-    public boolean readBoolean(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return String value.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public String readString(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return UUID.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public UUID readUuid(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Date.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Date readDate(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Timestamp.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Timestamp readTimestamp(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Object.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T> T readObject(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Byte array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public byte[] readByteArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Short array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public short[] readShortArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Integer array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public int[] readIntArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Long array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public long[] readLongArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Float array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public float[] readFloatArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Byte array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public double[] readDoubleArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Char array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public char[] readCharArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Boolean array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public boolean[] readBooleanArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return String array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public String[] readStringArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return UUID array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public UUID[] readUuidArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Date array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Date[] readDateArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Object array.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public Object[] readObjectArray(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Collection.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T> Collection<T> readCollection(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param colCls Collection class.
-     * @return Collection.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T> Collection<T> readCollection(String fieldName, Class<? extends Collection<T>> colCls)
-        throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @return Map.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <K, V> Map<K, V> readMap(String fieldName) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param mapCls Map class.
-     * @return Map.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <K, V> Map<K, V> readMap(String fieldName, Class<? extends Map<K, V>> mapCls)
-        throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param enumCls Enum class.
-     * @return Value.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T extends Enum<?>> T readEnum(String fieldName, Class<T> enumCls) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param enumCls Enum class.
-     * @return Value.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public <T extends Enum<?>> T[] readEnumArray(String fieldName, Class<T> enumCls)
-        throws GridPortableException;
-
-    /**
-     * Gets raw reader. Raw reader does not use field name hash codes, therefore,
-     * making the format even more compact. However, if the raw reader is used,
-     * dynamic structure changes to the portable objects are not supported.
-     *
-     * @return Raw reader.
-     */
-    public GridPortableRawReader rawReader();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableSerializer.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableSerializer.java
deleted file mode 100644
index 77274c4..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableSerializer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-/**
- * Interface that allows to implement custom serialization logic for portable objects.
- * Can be used instead of {@link GridPortableMarshalAware} in case if the class
- * cannot be changed directly.
- * <p>
- * Portable serializer can be configured for all portable objects via
- * {@link GridPortableConfiguration#getSerializer()} method, or for a specific
- * portable type via {@link GridPortableTypeConfiguration#getSerializer()} method.
- */
-public interface GridPortableSerializer {
-    /**
-     * Writes fields to provided writer.
-     *
-     * @param obj Empty object.
-     * @param writer Portable object writer.
-     * @throws GridPortableException In case of error.
-     */
-    public void writePortable(Object obj, GridPortableWriter writer) throws GridPortableException;
-
-    /**
-     * Reads fields from provided reader.
-     *
-     * @param obj Empty object
-     * @param reader Portable object reader.
-     * @throws GridPortableException In case of error.
-     */
-    public void readPortable(Object obj, GridPortableReader reader) throws GridPortableException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableTypeConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableTypeConfiguration.java
deleted file mode 100644
index 87a3106..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableTypeConfiguration.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.sql.*;
-
-/**
- * Defines configuration properties for a specific portable type. Providing per-type
- * configuration is optional, as it is generally enough to provide global
- * portable configuration in {@link GridPortableConfiguration} instance. However,
- * this class allows you to change configuration properties for a specific
- * portable type without affecting configuration for other portable types.
- * <p>
- * Per-type portable configuration can be specified in
- * {@link GridPortableConfiguration#getTypeConfigurations()} method.
- */
-public class GridPortableTypeConfiguration {
-    /** Class name. */
-    private String clsName;
-
-    /** ID mapper. */
-    private GridPortableIdMapper idMapper;
-
-    /** Serializer. */
-    private GridPortableSerializer serializer;
-
-    /** Use timestamp flag. */
-    private Boolean useTs;
-
-    /** Meta data enabled flag. */
-    private Boolean metaDataEnabled;
-
-    /** Keep deserialized flag. */
-    private Boolean keepDeserialized;
-
-    /** Affinity key field name. */
-    private String affKeyFieldName;
-
-    /**
-     */
-    public GridPortableTypeConfiguration() {
-        // No-op.
-    }
-
-    /**
-     * @param clsName Class name.
-     */
-    public GridPortableTypeConfiguration(String clsName) {
-        this.clsName = clsName;
-    }
-
-    /**
-     * Gets type name.
-     *
-     * @return Type name.
-     */
-    public String getClassName() {
-        return clsName;
-    }
-
-    /**
-     * Sets type name.
-     *
-     * @param clsName Type name.
-     */
-    public void setClassName(String clsName) {
-        this.clsName = clsName;
-    }
-
-    /**
-     * Gets ID mapper.
-     *
-     * @return ID mapper.
-     */
-    public GridPortableIdMapper getIdMapper() {
-        return idMapper;
-    }
-
-    /**
-     * Sets ID mapper.
-     *
-     * @param idMapper ID mapper.
-     */
-    public void setIdMapper(GridPortableIdMapper idMapper) {
-        this.idMapper = idMapper;
-    }
-
-    /**
-     * Gets serializer.
-     *
-     * @return Serializer.
-     */
-    public GridPortableSerializer getSerializer() {
-        return serializer;
-    }
-
-    /**
-     * Sets serializer.
-     *
-     * @param serializer Serializer.
-     */
-    public void setSerializer(GridPortableSerializer serializer) {
-        this.serializer = serializer;
-    }
-
-    /**
-     * If {@code true} then date values converted to {@link Timestamp} during unmarshalling.
-     *
-     * @return Flag indicating whether date values converted to {@link Timestamp} during unmarshalling.
-     */
-    public Boolean isUseTimestamp() {
-        return useTs;
-    }
-
-    /**
-     * @param useTs Flag indicating whether date values converted to {@link Timestamp} during unmarshalling.
-     */
-    public void setUseTimestamp(Boolean useTs) {
-        this.useTs = useTs;
-    }
-
-    /**
-     * Defines whether meta data is collected for this type. If provided, this value will override
-     * {@link GridPortableConfiguration#isMetaDataEnabled()} property.
-     *
-     * @return Whether meta data is collected.
-     */
-    public Boolean isMetaDataEnabled() {
-        return metaDataEnabled;
-    }
-
-    /**
-     * @param metaDataEnabled Whether meta data is collected.
-     */
-    public void setMetaDataEnabled(Boolean metaDataEnabled) {
-        this.metaDataEnabled = metaDataEnabled;
-    }
-
-    /**
-     * Defines whether {@link GridPortableObject} should cache deserialized instance. If provided,
-     * this value will override {@link GridPortableConfiguration#isKeepDeserialized()} property.
-     *
-     * @return Whether deserialized value is kept.
-     */
-    public Boolean isKeepDeserialized() {
-        return keepDeserialized;
-    }
-
-    /**
-     * @param keepDeserialized Whether deserialized value is kept.
-     */
-    public void setKeepDeserialized(Boolean keepDeserialized) {
-        this.keepDeserialized = keepDeserialized;
-    }
-
-    /**
-     * Gets affinity key field name.
-     *
-     * @return Affinity key field name.
-     */
-    public String getAffinityKeyFieldName() {
-        return affKeyFieldName;
-    }
-
-    /**
-     * Sets affinity key field name.
-     *
-     * @param affKeyFieldName Affinity key field name.
-     */
-    public void setAffinityKeyFieldName(String affKeyFieldName) {
-        this.affKeyFieldName = affKeyFieldName;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridPortableTypeConfiguration.class, this, super.toString());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableWriter.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableWriter.java
deleted file mode 100644
index 7853b64..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableWriter.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-
-/**
- * Writer for portable object used in {@link GridPortableMarshalAware} implementations.
- * Useful for the cases when user wants a fine-grained control over serialization.
- * <p>
- * Note that GridGain never writes full strings for field or type names. Instead,
- * for performance reasons, GridGain writes integer hash codes for type and field names.
- * It has been tested that hash code conflicts for the type names or the field names
- * within the same type are virtually non-existent and, to gain performance, it is safe
- * to work with hash codes. For the cases when hash codes for different types or fields
- * actually do collide, GridGain provides {@link GridPortableIdMapper} which
- * allows to override the automatically generated hash code IDs for the type and field names.
- */
-public interface GridPortableWriter {
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeByte(String fieldName, byte val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeShort(String fieldName, short val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeInt(String fieldName, int val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeLong(String fieldName, long val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeFloat(String fieldName, float val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeDouble(String fieldName, double val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeChar(String fieldName, char val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeBoolean(String fieldName, boolean val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeString(String fieldName, @Nullable String val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val UUID to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeUuid(String fieldName, @Nullable UUID val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Date to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeDate(String fieldName, @Nullable Date val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Timestamp to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeTimestamp(String fieldName, @Nullable Timestamp val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param obj Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeObject(String fieldName, @Nullable Object obj) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeByteArray(String fieldName, @Nullable byte[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeShortArray(String fieldName, @Nullable short[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeIntArray(String fieldName, @Nullable int[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeLongArray(String fieldName, @Nullable long[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeFloatArray(String fieldName, @Nullable float[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeDoubleArray(String fieldName, @Nullable double[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeCharArray(String fieldName, @Nullable char[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeBooleanArray(String fieldName, @Nullable boolean[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeStringArray(String fieldName, @Nullable String[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeUuidArray(String fieldName, @Nullable UUID[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeDateArray(String fieldName, @Nullable Date[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public void writeObjectArray(String fieldName, @Nullable Object[] val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param col Collection to write.
-     * @throws GridPortableException In case of error.
-     */
-    public <T> void writeCollection(String fieldName, @Nullable Collection<T> col) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param map Map to write.
-     * @throws GridPortableException In case of error.
-     */
-    public <K, V> void writeMap(String fieldName, @Nullable Map<K, V> map) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public <T extends Enum<?>> void writeEnum(String fieldName, T val) throws GridPortableException;
-
-    /**
-     * @param fieldName Field name.
-     * @param val Value to write.
-     * @throws GridPortableException In case of error.
-     */
-    public <T extends Enum<?>> void writeEnumArray(String fieldName, T[] val) throws GridPortableException;
-
-    /**
-     * Gets raw writer. Raw writer does not write field name hash codes, therefore,
-     * making the format even more compact. However, if the raw writer is used,
-     * dynamic structure changes to the portable objects are not supported.
-     *
-     * @return Raw writer.
-     */
-    public GridPortableRawWriter rawWriter();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/package.html b/modules/core/src/main/java/org/gridgain/grid/portables/package.html
deleted file mode 100644
index cacbc3e..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains <b>Portable Objects</b> related functionality.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java b/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java
index d23afc3..57c3b43 100644
--- a/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java
+++ b/modules/core/src/main/java/org/gridgain/grid/security/GridSecurityCredentials.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.security;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index 82c59e3..47d115d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -17,13 +17,13 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.mbean.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java b/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java
index 2df4bdd..a7ea04f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawReaderEx.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.util.portable;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.jetbrains.annotations.*;
 
 /**
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.*;
 public interface GridPortableRawReaderEx extends GridPortableRawReader {
     /**
      * @return Object.
-     * @throws GridPortableException In case of error.
+     * @throws org.apache.ignite.portables.GridPortableException In case of error.
      */
     @Nullable public Object readObjectDetached() throws GridPortableException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java b/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java
index afe0026..18e761b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/portable/GridPortableRawWriterEx.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.portable;
 
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.kernal.processors.portable.*;
-import org.gridgain.grid.portables.*;
 import org.jetbrains.annotations.*;
 
 /**
@@ -19,7 +19,7 @@ import org.jetbrains.annotations.*;
 public interface GridPortableRawWriterEx extends GridPortableRawWriter, AutoCloseable {
     /**
      * @param obj Object to write.
-     * @throws GridPortableException In case of error.
+     * @throws org.apache.ignite.portables.GridPortableException In case of error.
      */
     public void writeObjectDetached(@Nullable Object obj) throws GridPortableException;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
index 4c98453..0520d9a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;
 import org.junit.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
index 0448b56..9dbfbb5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.portables.*;
 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/e04165bb/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index 0bf7d44..8bccf2e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -12,9 +12,9 @@ package org.gridgain.grid.kernal.processors.cache.query;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.portables.*;
 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/e04165bb/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
index f3fa2db..03ae4d0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
@@ -13,8 +13,8 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;


[16/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java
deleted file mode 100644
index af15ab8..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java
+++ /dev/null
@@ -1,1035 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static java.lang.reflect.Modifier.*;
-import static org.gridgain.grid.marshaller.optimized.GridOptimizedClassResolver.*;
-import static org.gridgain.grid.marshaller.optimized.GridOptimizedFieldType.*;
-import static org.gridgain.grid.marshaller.optimized.GridOptimizedMarshallerUtils.*;
-
-/**
- * Class descriptor.
- */
-class GridOptimizedClassDescriptor {
-    /** Unsafe. */
-    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-    /** */
-    private static final int TYPE_BYTE = 1;
-
-    /** */
-    private static final int TYPE_SHORT = 2;
-
-    /** */
-    private static final int TYPE_INT = 3;
-
-    /** */
-    private static final int TYPE_LONG = 4;
-
-    /** */
-    private static final int TYPE_FLOAT = 5;
-
-    /** */
-    private static final int TYPE_DOUBLE = 6;
-
-    /** */
-    private static final int TYPE_CHAR = 7;
-
-    /** */
-    private static final int TYPE_BOOLEAN = 8;
-
-    /** */
-    private static final int TYPE_BYTE_ARR = 9;
-
-    /** */
-    private static final int TYPE_SHORT_ARR = 10;
-
-    /** */
-    private static final int TYPE_INT_ARR = 11;
-
-    /** */
-    private static final int TYPE_LONG_ARR = 12;
-
-    /** */
-    private static final int TYPE_FLOAT_ARR = 13;
-
-    /** */
-    private static final int TYPE_DOUBLE_ARR = 14;
-
-    /** */
-    private static final int TYPE_CHAR_ARR = 15;
-
-    /** */
-    private static final int TYPE_BOOLEAN_ARR = 16;
-
-    /** */
-    private static final int TYPE_OBJ_ARR = 17;
-
-    /** */
-    private static final int TYPE_STR = 18;
-
-    /** */
-    private static final int TYPE_ENUM = 19;
-
-    /** */
-    private static final int TYPE_UUID = 20;
-
-    /** */
-    private static final int TYPE_PROPS = 21;
-
-    /** */
-    private static final int TYPE_ARRAY_LIST = 22;
-
-    /** */
-    private static final int TYPE_HASH_MAP = 23;
-
-    /** */
-    private static final int TYPE_HASH_SET = 24;
-
-    /** */
-    private static final int TYPE_LINKED_LIST = 25;
-
-    /** */
-    private static final int TYPE_LINKED_HASH_MAP = 26;
-
-    /** */
-    private static final int TYPE_LINKED_HASH_SET = 27;
-
-    /** */
-    private static final int TYPE_DATE = 28;
-
-    /** */
-    private static final int TYPE_CLS = 29;
-
-    /** */
-    private static final int TYPE_EXTERNALIZABLE = 50;
-
-    /** */
-    private static final int TYPE_SERIALIZABLE = 51;
-
-    /** Class. */
-    private Class<?> cls;
-
-    /** Header. */
-    private Integer hdr;
-
-    /** ID. */
-    private Integer id;
-
-    /** Short ID. */
-    private Short shortId;
-
-    /** Class name. */
-    private String name;
-
-    /** Class type. */
-    private int type;
-
-    /** Primitive flag. */
-    private boolean isPrimitive;
-
-    /** Enum flag. */
-    private boolean isEnum;
-
-    /** Serializable flag. */
-    private boolean isSerial;
-
-    /** Excluded flag. */
-    private final boolean excluded;
-
-    /** {@code True} if descriptor is for {@link Class}. */
-    private boolean isCls;
-
-    /** Array component type. */
-    private Class<?> arrCompType;
-
-    /** Enumeration values. */
-    private Object[] enumVals;
-
-    /** Constructor. */
-    private Constructor<?> constructor;
-
-    /** Fields. */
-    private Fields fields;
-
-    /** {@code writeObject} methods. */
-    private List<Method> writeObjMtds;
-
-    /** {@code writeReplace} method. */
-    private Method writeReplaceMtd;
-
-    /** {@code readObject} methods. */
-    private List<Method> readObjMtds;
-
-    /** {@code readResolve} method. */
-    private Method readResolveMtd;
-
-    /** Defaults field offset. */
-    private long dfltsFieldOff;
-
-    /** Load factor field offset. */
-    private long loadFactorFieldOff;
-
-    /** Map field offset. */
-    private long mapFieldOff;
-
-    /** Access order field offset. */
-    private long accessOrderFieldOff;
-
-    /**
-     * Creates descriptor for class.
-     *
-     * @param cls Class.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings({"ForLoopReplaceableByForEach", "MapReplaceableByEnumMap"})
-    GridOptimizedClassDescriptor(Class<?> cls) throws IOException {
-        this.cls = cls;
-
-        excluded = GridMarshallerExclusions.isExcluded(cls);
-
-        T2<Integer, Integer> t = GridOptimizedClassResolver.writeClassData(cls);
-
-        hdr = t.get1();
-        id = t.get2();
-        name = cls.getName();
-
-        if (!excluded) {
-            Class<?> parent;
-
-            if (cls == byte.class || cls == Byte.class) {
-                type = TYPE_BYTE;
-
-                isPrimitive = true;
-            }
-            else if (cls == short.class || cls == Short.class) {
-                type = TYPE_SHORT;
-
-                isPrimitive = true;
-            }
-            else if (cls == int.class || cls == Integer.class) {
-                type = TYPE_INT;
-
-                isPrimitive = true;
-            }
-            else if (cls == long.class || cls == Long.class) {
-                type = TYPE_LONG;
-
-                isPrimitive = true;
-            }
-            else if (cls == float.class || cls == Float.class) {
-                type = TYPE_FLOAT;
-
-                isPrimitive = true;
-            }
-            else if (cls == double.class || cls == Double.class) {
-                type = TYPE_DOUBLE;
-
-                isPrimitive = true;
-            }
-            else if (cls == char.class || cls == Character.class) {
-                type = TYPE_CHAR;
-
-                isPrimitive = true;
-            }
-            else if (cls == boolean.class || cls == Boolean.class) {
-                type = TYPE_BOOLEAN;
-
-                isPrimitive = true;
-            }
-            else if (cls == byte[].class)
-                type = TYPE_BYTE_ARR;
-            else if (cls == short[].class)
-                type = TYPE_SHORT_ARR;
-            else if (cls == int[].class)
-                type = TYPE_INT_ARR;
-            else if (cls == long[].class)
-                type = TYPE_LONG_ARR;
-            else if (cls == float[].class)
-                type = TYPE_FLOAT_ARR;
-            else if (cls == double[].class)
-                type = TYPE_DOUBLE_ARR;
-            else if (cls == char[].class)
-                type = TYPE_CHAR_ARR;
-            else if (cls == boolean[].class)
-                type = TYPE_BOOLEAN_ARR;
-            else if (cls.isArray()) {
-                type = TYPE_OBJ_ARR;
-
-                arrCompType = cls.getComponentType();
-            }
-            else if (cls == String.class)
-                type = TYPE_STR;
-            else if (cls.isEnum()) {
-                type = TYPE_ENUM;
-
-                isEnum = true;
-                enumVals = cls.getEnumConstants();
-            }
-            // Support for enum constants, based on anonymous children classes.
-            else if ((parent = cls.getSuperclass()) != null && parent.isEnum()) {
-                type = TYPE_ENUM;
-
-                isEnum = true;
-                enumVals = parent.getEnumConstants();
-            }
-            else if (cls == UUID.class)
-                type = TYPE_UUID;
-            else if (cls == Properties.class) {
-                type = TYPE_PROPS;
-
-                try {
-                    dfltsFieldOff = UNSAFE.objectFieldOffset(Properties.class.getDeclaredField("defaults"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == ArrayList.class)
-                type = TYPE_ARRAY_LIST;
-            else if (cls == HashMap.class) {
-                type = TYPE_HASH_MAP;
-
-                try {
-                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == HashSet.class) {
-                type = TYPE_HASH_SET;
-
-                try {
-                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
-                    mapFieldOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == LinkedList.class)
-                type = TYPE_LINKED_LIST;
-            else if (cls == LinkedHashMap.class) {
-                type = TYPE_LINKED_HASH_MAP;
-
-                try {
-                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
-                    accessOrderFieldOff = UNSAFE.objectFieldOffset(LinkedHashMap.class.getDeclaredField("accessOrder"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == LinkedHashSet.class) {
-                type = TYPE_LINKED_HASH_SET;
-
-                try {
-                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
-                    mapFieldOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == Date.class)
-                type = TYPE_DATE;
-            else if (cls == Class.class) {
-                type = TYPE_CLS;
-
-                isCls = true;
-            }
-            else {
-                Class<?> c = cls;
-
-                while ((writeReplaceMtd == null || readResolveMtd == null) && c != null && !c.equals(Object.class)) {
-                    if (writeReplaceMtd == null) {
-                        try {
-                            writeReplaceMtd = c.getDeclaredMethod("writeReplace");
-
-                            if (!isStatic(writeReplaceMtd.getModifiers()) &&
-                                !(isPrivate(writeReplaceMtd.getModifiers()) && c != cls) &&
-                                writeReplaceMtd.getReturnType().equals(Object.class))
-                                writeReplaceMtd.setAccessible(true);
-                            else
-                                // Set method back to null if it has incorrect signature.
-                                writeReplaceMtd = null;
-                        }
-                        catch (NoSuchMethodException ignored) {
-                            // No-op.
-                        }
-                    }
-
-                    if (readResolveMtd == null) {
-                        try {
-                            readResolveMtd = c.getDeclaredMethod("readResolve");
-
-                            if (!isStatic(readResolveMtd.getModifiers()) &&
-                                !(isPrivate(readResolveMtd.getModifiers()) && c != cls) &&
-                                readResolveMtd.getReturnType().equals(Object.class))
-                                readResolveMtd.setAccessible(true);
-                            else
-                                // Set method back to null if it has incorrect signature.
-                                readResolveMtd = null;
-                        }
-                        catch (NoSuchMethodException ignored) {
-                            // No-op.
-                        }
-                    }
-
-                    c = c.getSuperclass();
-                }
-
-                if (Externalizable.class.isAssignableFrom(cls)) {
-                    type = TYPE_EXTERNALIZABLE;
-
-                    try {
-                        constructor = cls.getDeclaredConstructor();
-
-                        constructor.setAccessible(true);
-                    }
-                    catch (NoSuchMethodException e) {
-                        throw new IOException("Externalizable class doesn't have default constructor: " + cls, e);
-                    }
-                }
-                else {
-                    type = TYPE_SERIALIZABLE;
-
-                    isSerial = Serializable.class.isAssignableFrom(cls);
-
-                    writeObjMtds = new ArrayList<>();
-                    readObjMtds = new ArrayList<>();
-                    List<List<Field>> fields = new ArrayList<>();
-                    List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs = new ArrayList<>();
-                    List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps = new ArrayList<>();
-                    List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists = new ArrayList<>();
-
-                    for (c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
-                        Method mtd;
-
-                        try {
-                            mtd = c.getDeclaredMethod("writeObject", ObjectOutputStream.class);
-
-                            int mod = mtd.getModifiers();
-
-                            if (!isStatic(mod) && isPrivate(mod) && mtd.getReturnType() == Void.TYPE)
-                                mtd.setAccessible(true);
-                            else
-                                // Set method back to null if it has incorrect signature.
-                                mtd = null;
-                        }
-                        catch (NoSuchMethodException ignored) {
-                            mtd = null;
-                        }
-
-                        writeObjMtds.add(mtd);
-
-                        try {
-                            mtd = c.getDeclaredMethod("readObject", ObjectInputStream.class);
-
-                            int mod = mtd.getModifiers();
-
-                            if (!isStatic(mod) && isPrivate(mod) && mtd.getReturnType() == Void.TYPE)
-                                mtd.setAccessible(true);
-                            else
-                                // Set method back to null if it has incorrect signature.
-                                mtd = null;
-                        }
-                        catch (NoSuchMethodException ignored) {
-                            mtd = null;
-                        }
-
-                        readObjMtds.add(mtd);
-
-                        Field[] clsFields0 = c.getDeclaredFields();
-
-                        Arrays.sort(clsFields0, new Comparator<Field>() {
-                            @Override public int compare(Field f1, Field f2) {
-                                return f1.getName().compareTo(f2.getName());
-                            }
-                        });
-
-                        List<Field> clsFields = new ArrayList<>(clsFields0.length);
-                        List<T2<GridOptimizedFieldType, Long>> clsFieldOffs =
-                            new ArrayList<>(clsFields0.length);
-
-                        for (int i = 0; i < clsFields0.length; i++) {
-                            Field f = clsFields0[i];
-
-                            int mod = f.getModifiers();
-
-                            if (!isStatic(mod) && !isTransient(mod)) {
-                                GridOptimizedFieldType type = fieldType(f.getType());
-
-                                clsFields.add(f);
-                                clsFieldOffs.add(new T2<>(type, UNSAFE.objectFieldOffset(f)));
-                            }
-                        }
-
-                        fields.add(clsFields);
-                        fieldOffs.add(clsFieldOffs);
-
-                        Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap = null;
-
-                        try {
-                            Field serFieldsDesc = c.getDeclaredField("serialPersistentFields");
-
-                            int mod = serFieldsDesc.getModifiers();
-
-                            if (serFieldsDesc.getType() == ObjectStreamField[].class &&
-                                isPrivate(mod) && isStatic(mod) && isFinal(mod)) {
-                                serFieldsDesc.setAccessible(true);
-
-                                ObjectStreamField[] serFields = (ObjectStreamField[])serFieldsDesc.get(null);
-
-                                fieldInfoMap = new HashMap<>();
-
-                                for (int i = 0; i < serFields.length; i++) {
-                                    ObjectStreamField serField = serFields[i];
-
-                                    fieldInfoMap.put(serField.getName(), F.t(i, fieldType(serField.getType())));
-                                }
-                            }
-                        }
-                        catch (NoSuchFieldException ignored) {
-                            // No-op.
-                        }
-                        catch (IllegalAccessException e) {
-                            throw new IOException("Failed to get value of 'serialPersistentFields' field in class: " +
-                                cls.getName(), e);
-                        }
-
-                        if (fieldInfoMap == null) {
-                            fieldInfoMap = new HashMap<>();
-
-                            for (int i = 0; i < clsFields.size(); i++) {
-                                Field f = clsFields.get(i);
-
-                                fieldInfoMap.put(f.getName(), F.t(i, fieldType(f.getType())));
-                            }
-                        }
-
-                        fieldInfoMaps.add(fieldInfoMap);
-
-                        List<IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoList =
-                            new ArrayList<>(fieldInfoMap.values());
-
-                        Collections.sort(fieldInfoList, new Comparator<IgniteBiTuple<Integer, GridOptimizedFieldType>>() {
-                            @Override public int compare(IgniteBiTuple<Integer, GridOptimizedFieldType> t1,
-                                IgniteBiTuple<Integer, GridOptimizedFieldType> t2) {
-                                return t1.get1().compareTo(t2.get1());
-                            }
-                        });
-
-                        fieldInfoLists.add(fieldInfoList);
-                    }
-
-                    Collections.reverse(writeObjMtds);
-                    Collections.reverse(readObjMtds);
-                    Collections.reverse(fields);
-                    Collections.reverse(fieldOffs);
-                    Collections.reverse(fieldInfoMaps);
-                    Collections.reverse(fieldInfoLists);
-
-                    this.fields = new Fields(fields, fieldOffs, fieldInfoLists, fieldInfoMaps);
-                }
-            }
-        }
-
-        shortId = computeSerialVersionUid(cls, fields != null ? fields.ownFields() : null).shortValue();
-    }
-
-    /**
-     * @return Excluded flag.
-     */
-    boolean excluded() {
-        return excluded;
-    }
-
-    /**
-     * @return Class.
-     */
-    Class<?> describedClass() {
-        return cls;
-    }
-
-    /**
-     * @return Header.
-     */
-    Integer header() {
-        return hdr;
-    }
-
-    /**
-     * @return ID.
-     */
-    Integer id() {
-        return id;
-    }
-
-    /**
-     * @return Short ID.
-     */
-    Short shortId() {
-        return shortId;
-    }
-
-    /**
-     * @return Class name.
-     */
-    String name() {
-        return name;
-    }
-
-    /**
-     * @return Array component type.
-     */
-    Class<?> componentType() {
-        return arrCompType;
-    }
-
-    /**
-     * @return Primitive flag.
-     */
-    boolean isPrimitive() {
-        return isPrimitive;
-    }
-
-    /**
-     * @return Enum flag.
-     */
-    boolean isEnum() {
-        return isEnum;
-    }
-
-    /**
-     * @return {@code True} if descriptor is for {@link Class}.
-     */
-    boolean isClass() {
-        return isCls;
-    }
-
-    /**
-     * Replaces object.
-     *
-     * @param obj Object.
-     * @return Replaced object or {@code null} if there is no {@code writeReplace} method.
-     * @throws IOException In case of error.
-     */
-    Object replace(Object obj) throws IOException {
-        if (writeReplaceMtd != null) {
-            try {
-                return writeReplaceMtd.invoke(obj);
-            }
-            catch (IllegalAccessException | InvocationTargetException e) {
-                throw new IOException(e);
-            }
-        }
-
-        return obj;
-    }
-
-    /**
-     * Writes object to stream.
-     *
-     * @param out Output stream.
-     * @param obj Object.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    void write(GridOptimizedObjectOutputStream out, Object obj) throws IOException {
-        switch (type) {
-            case TYPE_BYTE:
-                out.writeByte((Byte)obj);
-
-                break;
-
-            case TYPE_SHORT:
-                out.writeShort((Short)obj);
-
-                break;
-
-            case TYPE_INT:
-                out.writeInt((Integer)obj);
-
-                break;
-
-            case TYPE_LONG:
-                out.writeLong((Long)obj);
-
-                break;
-
-            case TYPE_FLOAT:
-                out.writeFloat((Float)obj);
-
-                break;
-
-            case TYPE_DOUBLE:
-                out.writeDouble((Double)obj);
-
-                break;
-
-            case TYPE_CHAR:
-                out.writeChar((Character)obj);
-
-                break;
-
-            case TYPE_BOOLEAN:
-                out.writeBoolean((Boolean)obj);
-
-                break;
-
-            case TYPE_BYTE_ARR:
-                out.writeByteArray((byte[])obj);
-
-                break;
-
-            case TYPE_SHORT_ARR:
-                out.writeShortArray((short[])obj);
-
-                break;
-
-            case TYPE_INT_ARR:
-                out.writeIntArray((int[])obj);
-
-                break;
-
-            case TYPE_LONG_ARR:
-                out.writeLongArray((long[])obj);
-
-                break;
-
-            case TYPE_FLOAT_ARR:
-                out.writeFloatArray((float[])obj);
-
-                break;
-
-            case TYPE_DOUBLE_ARR:
-                out.writeDoubleArray((double[])obj);
-
-                break;
-
-            case TYPE_CHAR_ARR:
-                out.writeCharArray((char[])obj);
-
-                break;
-
-            case TYPE_BOOLEAN_ARR:
-                out.writeBooleanArray((boolean[])obj);
-
-                break;
-
-            case TYPE_OBJ_ARR:
-                out.writeArray((Object[])obj);
-
-                break;
-
-            case TYPE_STR:
-                out.writeString((String)obj);
-
-                break;
-
-            case TYPE_ENUM:
-                out.writeInt(((Enum)obj).ordinal());
-
-                break;
-
-            case TYPE_UUID:
-                out.writeUuid((UUID)obj);
-
-                break;
-
-            case TYPE_PROPS:
-                out.writeProperties((Properties)obj, dfltsFieldOff);
-
-                break;
-
-            case TYPE_ARRAY_LIST:
-                out.writeArrayList((ArrayList<?>)obj);
-
-                break;
-
-            case TYPE_HASH_MAP:
-                out.writeHashMap((HashMap<?, ?>)obj, loadFactorFieldOff, false);
-
-                break;
-
-            case TYPE_HASH_SET:
-                out.writeHashSet((HashSet<?>)obj, mapFieldOff, loadFactorFieldOff);
-
-                break;
-
-            case TYPE_LINKED_LIST:
-                out.writeLinkedList((LinkedList<?>)obj);
-
-                break;
-
-            case TYPE_LINKED_HASH_MAP:
-                out.writeLinkedHashMap((LinkedHashMap<?, ?>)obj, loadFactorFieldOff, accessOrderFieldOff, false);
-
-                break;
-
-            case TYPE_LINKED_HASH_SET:
-                out.writeLinkedHashSet((LinkedHashSet<?>)obj, mapFieldOff, loadFactorFieldOff);
-
-                break;
-
-            case TYPE_DATE:
-                out.writeDate((Date)obj);
-
-                break;
-
-            case TYPE_CLS:
-                writeClass(out, classDescriptor((Class<?>)obj, obj));
-
-                break;
-
-            case TYPE_EXTERNALIZABLE:
-                out.writeExternalizable(obj);
-
-                break;
-
-            case TYPE_SERIALIZABLE:
-                if (out.requireSerializable() && !isSerial)
-                    throw new NotSerializableException("Must implement java.io.Serializable or " +
-                        "set GridOptimizedMarshaller.setRequireSerializable() to false " +
-                        "(note that performance may degrade if object is not Serializable): " + name);
-
-                out.writeSerializable(obj, writeObjMtds, fields);
-
-                break;
-
-            default:
-                throw new IllegalStateException("Invalid class type: " + type);
-        }
-    }
-
-    /**
-     * Reads object from stream.
-     *
-     * @param in Input stream.
-     * @return Object.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    Object read(GridOptimizedObjectInputStream in) throws ClassNotFoundException, IOException {
-        switch (type) {
-            case TYPE_BYTE:
-                return in.readByte();
-
-            case TYPE_SHORT:
-                return in.readShort();
-
-            case TYPE_INT:
-                return in.readInt();
-
-            case TYPE_LONG:
-                return in.readLong();
-
-            case TYPE_FLOAT:
-                return in.readFloat();
-
-            case TYPE_DOUBLE:
-                return in.readDouble();
-
-            case TYPE_CHAR:
-                return in.readChar();
-
-            case TYPE_BOOLEAN:
-                return in.readBoolean();
-
-            case TYPE_BYTE_ARR:
-                return in.readByteArray();
-
-            case TYPE_SHORT_ARR:
-                return in.readShortArray();
-
-            case TYPE_INT_ARR:
-                return in.readIntArray();
-
-            case TYPE_LONG_ARR:
-                return in.readLongArray();
-
-            case TYPE_FLOAT_ARR:
-                return in.readFloatArray();
-
-            case TYPE_DOUBLE_ARR:
-                return in.readDoubleArray();
-
-            case TYPE_CHAR_ARR:
-                return in.readCharArray();
-
-            case TYPE_BOOLEAN_ARR:
-                return in.readBooleanArray();
-
-            case TYPE_OBJ_ARR:
-                return in.readArray(arrCompType);
-
-            case TYPE_STR:
-                return in.readString();
-
-            case TYPE_ENUM:
-                return enumVals[in.readInt()];
-
-            case TYPE_UUID:
-                return in.readUuid();
-
-            case TYPE_PROPS:
-                return in.readProperties();
-
-            case TYPE_ARRAY_LIST:
-                return in.readArrayList();
-
-            case TYPE_HASH_MAP:
-                return in.readHashMap(false);
-
-            case TYPE_HASH_SET:
-                return in.readHashSet(mapFieldOff);
-
-            case TYPE_LINKED_LIST:
-                return in.readLinkedList();
-
-            case TYPE_LINKED_HASH_MAP:
-                return in.readLinkedHashMap(false);
-
-            case TYPE_LINKED_HASH_SET:
-                return in.readLinkedHashSet(mapFieldOff);
-
-            case TYPE_DATE:
-                return in.readDate();
-
-            case TYPE_CLS:
-                return readClass(in, in.classLoader()).describedClass();
-
-            case TYPE_EXTERNALIZABLE:
-                return in.readExternalizable(constructor, readResolveMtd);
-
-            case TYPE_SERIALIZABLE:
-                return in.readSerializable(cls, readObjMtds, readResolveMtd, fields);
-
-            default:
-                throw new IllegalStateException("Invalid class type: " + type);
-        }
-    }
-
-    /**
-     * @param cls Class.
-     * @return Type.
-     */
-    @SuppressWarnings("IfMayBeConditional")
-    private GridOptimizedFieldType fieldType(Class<?> cls) {
-        GridOptimizedFieldType type;
-
-        if (cls == byte.class)
-            type = BYTE;
-        else if (cls == short.class)
-            type = SHORT;
-        else if (cls == int.class)
-            type = INT;
-        else if (cls == long.class)
-            type = LONG;
-        else if (cls == float.class)
-            type = FLOAT;
-        else if (cls == double.class)
-            type = DOUBLE;
-        else if (cls == char.class)
-            type = CHAR;
-        else if (cls == boolean.class)
-            type = BOOLEAN;
-        else
-            type = OTHER;
-
-        return type;
-    }
-
-    /**
-     * Encapsulates data about class fields.
-     */
-    @SuppressWarnings("PackageVisibleInnerClass")
-    static class Fields {
-        /** Fields. */
-        private final List<List<Field>> fields;
-
-        /** Fields offsets. */
-        private final List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs;
-
-        /** Fields details lists. */
-        private final List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists;
-
-        /** Fields details maps. */
-        private final List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps;
-
-        /**
-         * Creates new instance.
-         *
-         * @param fields Fields.
-         * @param fieldOffs Field offsets.
-         * @param fieldInfoLists List of field details sequences for each type in the object's class hierarchy.
-         * @param fieldInfoMaps List of field details maps for each type in the object's class hierarchy.
-         */
-        Fields(List<List<Field>> fields, List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs,
-            List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists,
-            List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps) {
-            this.fields = fields;
-            this.fieldOffs = fieldOffs;
-            this.fieldInfoLists = fieldInfoLists;
-            this.fieldInfoMaps = fieldInfoMaps;
-        }
-
-        /**
-         * Returns class's own fields (excluding inherited).
-         *
-         * @return List of fields or {@code null} if fields list is empty.
-         */
-        List<Field> ownFields() {
-            return fields.isEmpty() ? null : fields.get(fields.size() - 1);
-        }
-
-        /**
-         * Returns field types and their offsets.
-         *
-         * @param i hierarchy level where 0 corresponds to top level.
-         * @return list of pairs where first value is field type and second value is its offset.
-         */
-        List<T2<GridOptimizedFieldType, Long>> fieldOffs(int i) {
-            return fieldOffs.get(i);
-        }
-
-        /**
-         * Returns field sequence numbers and their types as list.
-         *
-         * @param i hierarchy level where 0 corresponds to top level.
-         * @return list of pairs (field number, field type) for the given hierarchy level.
-         */
-        List<IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoList(int i) {
-            return fieldInfoLists.get(i);
-        }
-
-        /**
-         * Returns field sequence numbers and their types as map where key is a field name,
-         *
-         * @param i hierarchy level where 0 corresponds to top level.
-         * @return map of field names and their details.
-         */
-        Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap(int i) {
-            return fieldInfoMaps.get(i);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassResolver.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassResolver.java
deleted file mode 100644
index 17540da..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassResolver.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-import static org.gridgain.grid.marshaller.optimized.GridOptimizedMarshallerUtils.*;
-
-/**
- * Resolves class names by serialVersionUID.
- */
-@SuppressWarnings({"UnnecessaryFullyQualifiedName", "unchecked"})
-class GridOptimizedClassResolver {
-    /** File name to generate. */
-    private static final String FILE_NAME = "optimized-classnames.properties";
-
-    /** */
-    private static final Map<String, Integer> ggxName2id = new HashMap<>();
-
-    /** */
-    private static final T2<Class<?>, GridOptimizedClassDescriptor>[] ggxId2name;
-
-    /** */
-    private static final Map<String, Integer> ggName2id = new HashMap<>();
-
-    /** */
-    private static final T3<String, Class<?>, GridOptimizedClassDescriptor>[] ggId2name;
-
-    /** */
-    private static Map<String, Integer> usrName2Id;
-
-    /** */
-    private static T3<String, Class<?>, GridOptimizedClassDescriptor>[] usrId2Name;
-
-    /** */
-    private static final int HEADER_NAME = 255;
-
-    /** */
-    private static final int HEADER_GG_NAME = 254;
-
-    /** */
-    private static final int HEADER_USER_NAME = 253;
-
-    /** */
-    private static final int HEADER_ARRAY = 252;
-
-    /**
-     * Initialize predefined classes to optimize.
-     */
-    static {
-        Class[] superOptCls = new Class[] {
-            // Array types.
-            byte[].class,
-            short[].class,
-            int[].class,
-            long[].class,
-            float[].class,
-            double[].class,
-            boolean[].class,
-            char[].class,
-
-            // Boxed types.
-            Byte.class,
-            Short.class,
-            Integer.class,
-            Long.class,
-            Float.class,
-            Double.class,
-            Boolean.class,
-            Character.class,
-            String.class,
-
-            // Atomic.
-            AtomicBoolean.class,AtomicInteger.class,
-            AtomicLong.class,AtomicReference.class,
-            AtomicMarkableReference.class,
-            AtomicStampedReference.class,
-            AtomicIntegerArray.class,
-            AtomicReferenceArray.class,
-
-            // Concurrent types.
-            ConcurrentHashMap.class,
-            ConcurrentLinkedQueue.class,
-            ConcurrentSkipListMap.class,
-            ConcurrentSkipListSet.class,
-            LinkedBlockingDeque.class,
-            LinkedBlockingQueue.class,
-            PriorityBlockingQueue.class,
-            CopyOnWriteArrayList.class,
-            CopyOnWriteArraySet.class,
-
-            // Locks.
-            ReentrantLock.class,
-            ReentrantReadWriteLock.class,
-            ReentrantReadWriteLock.ReadLock.class,
-            ReentrantReadWriteLock.WriteLock.class,
-
-            // Util types.
-            Date.class,
-            UUID.class,
-            Calendar.class,
-            Random.class,
-            Calendar.class,
-            Currency.class,
-            ArrayList.class,
-            LinkedList.class,
-            Stack.class,
-            Vector.class,
-            HashMap.class,
-            HashSet.class,
-            Hashtable.class,
-            TreeMap.class,
-            TreeSet.class,
-            IdentityHashMap.class,
-            LinkedHashMap.class,
-            LinkedHashSet.class,
-            ArrayDeque.class,
-            BitSet.class,
-            EnumMap.class,
-            EnumSet.class,
-
-            // SQL types.
-            java.sql.Date.class,
-            Time.class,
-            Timestamp.class,
-
-            // Math types.
-            BigDecimal.class,
-            BigInteger.class,
-
-            // GridGain types.
-            IgniteUuid.class,
-            GridBoundedConcurrentOrderedSet.class,
-            GridBoundedLinkedHashSet.class,
-            GridConcurrentHashSet.class,
-            ConcurrentLinkedDeque8.class,
-            GridConcurrentPhantomHashSet.class,
-            GridConcurrentSkipListSet.class,
-            GridConcurrentWeakHashSet.class,
-            GridIdentityHashSet.class,
-            GridLeanSet.class,
-            GridSetWrapper.class
-        };
-
-        // Have to leave a range for special purposes.
-        assert superOptCls.length < 230;
-
-        ggxId2name = new T2[superOptCls.length];
-
-        for (int i = 0; i < superOptCls.length; i++) {
-            Class cls = superOptCls[i];
-
-            ggxName2id.put(cls.getName(), i);
-            ggxId2name[i] = new T2<Class<?>, GridOptimizedClassDescriptor>(cls, null);
-        }
-
-        BufferedReader reader = new BufferedReader(new InputStreamReader(
-            GridOptimizedClassResolver.class.getResourceAsStream(FILE_NAME),
-            GridOptimizedMarshallerUtils.UTF_8));
-
-        List<T3<String, Class<?>, GridOptimizedClassDescriptor>> ggId2name0 =
-            new LinkedList<>();
-
-        try {
-            for (int i = 0; ; i++) {
-                String clsName = reader.readLine();
-
-                if (clsName == null)
-                    break;
-
-                ggName2id.put(clsName, i);
-                ggId2name0.add(new T3<String, Class<?>, GridOptimizedClassDescriptor>(clsName, null, null));
-            }
-
-            ggId2name = ggId2name0.toArray(new T3[ggId2name0.size()]);
-        }
-        catch (IOException e) {
-            throw new AssertionError(e);
-        }
-        finally {
-            U.close(reader, null);
-        }
-    }
-
-    /**
-     * Ensure singleton.
-     */
-    private GridOptimizedClassResolver() {
-        // No-op.
-    }
-
-    /**
-     * @param usrName2id0 From name to ID.
-     * @param usrId2Name0 From ID to name.
-     */
-    static void userClasses(@Nullable Map<String, Integer> usrName2id0,
-        @Nullable T3<String, Class<?>, GridOptimizedClassDescriptor>[] usrId2Name0) {
-        usrName2Id = usrName2id0;
-        usrId2Name = usrId2Name0;
-    }
-
-    /**
-     * @param in DataInput to read from.
-     * @param clsLdr ClassLoader.
-     * @return Class descriptor.
-     * @throws IOException If serial version UID failed.
-     * @throws ClassNotFoundException If the class cannot be located by the specified class loader.
-     */
-    static GridOptimizedClassDescriptor readClass(DataInput in, ClassLoader clsLdr)
-        throws IOException, ClassNotFoundException {
-        assert in != null;
-        assert clsLdr != null;
-
-        int hdr = in.readByte() & 0xff;
-
-        if (hdr < ggxId2name.length) {
-            T2<Class<?>, GridOptimizedClassDescriptor> ggxT = ggxId2name[hdr];
-
-            GridOptimizedClassDescriptor desc = ggxT.get2();
-
-            if (desc == null) {
-                desc = classDescriptor(ggxT.get1(), null);
-
-                ggxT.set2(desc);
-            }
-
-            return desc;
-        }
-
-        String name;
-        Class<?> cls;
-        GridOptimizedClassDescriptor desc;
-
-        switch (hdr) {
-            case HEADER_GG_NAME:
-                int ggId = in.readInt();
-
-                T3<String, Class<?>, GridOptimizedClassDescriptor> ggT;
-
-                try {
-                    ggT = ggId2name[ggId];
-                }
-                catch (ArrayIndexOutOfBoundsException e) {
-                    throw new ClassNotFoundException("Failed to find optimized class ID " +
-                        "(is same GridGain version running on all nodes?): " + ggId, e);
-                }
-
-                name = ggT.get1();
-                cls = ggT.get2();
-                desc = ggT.get3();
-
-                if (desc == null) {
-                    if (clsLdr == U.gridClassLoader()) {
-                        if (cls == null) {
-                            cls = forName(name, clsLdr);
-
-                            ggT.set2(cls);
-                        }
-
-                        desc = classDescriptor(cls, null);
-
-                        ggT.set3(desc);
-                    }
-                    else {
-                        cls = forName(name, clsLdr);
-
-                        desc = classDescriptor(cls, null);
-                    }
-                }
-
-                break;
-
-            case HEADER_USER_NAME:
-                int usrId = in.readInt();
-
-                T3<String, Class<?>, GridOptimizedClassDescriptor> usrT;
-
-                try {
-                    if (usrId2Name != null)
-                        usrT = usrId2Name[usrId];
-                    else
-                        throw new ClassNotFoundException("Failed to find user defined class ID " +
-                            "(make sure to register identical classes on all nodes for optimization): " + usrId);
-                }
-                catch (ArrayIndexOutOfBoundsException e) {
-                    throw new ClassNotFoundException("Failed to find user defined class ID " +
-                        "(make sure to register identical classes on all nodes for optimization): " + usrId, e);
-                }
-
-                name = usrT.get1();
-                cls = usrT.get2();
-                desc = usrT.get3();
-
-                if (desc == null) {
-                    if (cls == null) {
-                        cls = forName(name, clsLdr);
-
-                        usrT.set2(cls);
-                    }
-
-                    desc = classDescriptor(cls, null);
-
-                    usrT.set3(desc);
-                }
-
-                break;
-
-            case HEADER_ARRAY:
-                name = readClass(in, clsLdr).name();
-
-                name = name.charAt(0) == '[' ? "[" + name : "[L" + name + ';';
-
-                cls = forName(name, clsLdr);
-
-                return classDescriptor(cls, null);
-
-            case HEADER_NAME:
-                name = in.readUTF();
-
-                cls = forName(name, clsLdr);
-
-                desc = classDescriptor(cls, null);
-
-                break;
-
-            default:
-                throw new IOException("Unexpected optimized stream header: " + hdr);
-        }
-
-        short actual = desc.shortId();
-
-        short exp = in.readShort();
-
-        if (actual != exp)
-            throw new ClassNotFoundException("Optimized stream class checksum mismatch " +
-                "(is same version of marshalled class present on all nodes?) " +
-                "[expected=" + exp + ", actual=" + actual + ", cls=" + cls + ']');
-
-        return desc;
-    }
-
-    /**
-     * @param out Output.
-     * @param desc Class descriptor.
-     * @throws IOException In case of error.
-     */
-    static void writeClass(DataOutput out, GridOptimizedClassDescriptor desc) throws IOException {
-        assert out != null;
-        assert desc != null;
-
-        int hdr = desc.header();
-
-        out.writeByte(hdr);
-
-        switch (hdr) {
-            case HEADER_GG_NAME:
-            case HEADER_USER_NAME:
-                out.writeInt(desc.id());
-                out.writeShort(desc.shortId());
-
-                return;
-
-            case HEADER_ARRAY:
-                writeClass(out, classDescriptor(desc.componentType(), null));
-
-                return;
-
-            case HEADER_NAME:
-                out.writeUTF(desc.name());
-                out.writeShort(desc.shortId());
-        }
-    }
-
-    /**
-     * @param cls Class to write.
-     * @return Data for {@code writeClass} method.
-     */
-    static T2<Integer, Integer> writeClassData(Class<?> cls) {
-        assert cls != null;
-
-        String name = cls.getName();
-
-        Integer superHdr = ggxName2id.get(name);
-
-        if (superHdr != null)
-            return new T2<>(superHdr, null);
-
-        Integer id;
-
-        if ((id = ggName2id.get(name)) != null)
-            return new T2<>(HEADER_GG_NAME, id);
-
-        if (usrName2Id != null && (id = usrName2Id.get(name)) != null)
-            return new T2<>(HEADER_USER_NAME, id);
-
-        if (cls.isArray())
-            return new T2<>(HEADER_ARRAY, null);
-
-        return new T2<>(HEADER_NAME, null);
-    }
-
-    /**
-     * @param name Class name.
-     * @param ldr Class loader.
-     * @return Class.
-     * @throws ClassNotFoundException If class not found.
-     */
-    private static Class<?> forName(String name, ClassLoader ldr) throws ClassNotFoundException {
-        Class<?> cls = primitive(name);
-
-        if (cls == null)
-            cls = GridOptimizedMarshallerUtils.forName(name, ldr);
-
-        return cls;
-    }
-
-    /**
-     * @param name Name of primitive class.
-     * @return Primitive type class or null.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    @Nullable private static Class<?> primitive(String name) {
-        if (name.length() > 7)
-            return null;
-
-        switch (name.charAt(0)) {
-            case 'b':
-                if ("boolean".equals(name))
-                    return boolean.class;
-
-                return "byte".equals(name) ? byte.class : null;
-            case 's':
-                return "short".equals(name) ? short.class : null;
-            case 'i':
-                return "int".equals(name) ? int.class : null;
-            case 'l':
-                return "long".equals(name) ? long.class : null;
-            case 'c':
-                return "char".equals(name) ? char.class : null;
-            case 'f':
-                return "float".equals(name) ? float.class : null;
-            case 'd':
-                return "double".equals(name) ? double.class : null;
-            case 'v':
-                return "void".equals(name) ? void.class : null;
-        }
-
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedFieldType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedFieldType.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedFieldType.java
deleted file mode 100644
index 7ba8550..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedFieldType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-/**
- * Field type used to calculate {@code Unsafe} offsets into objects.
- */
-enum GridOptimizedFieldType {
-    /** */
-    BYTE,
-
-    /** */
-    SHORT,
-
-    /** */
-    INT,
-
-    /** */
-    LONG,
-
-    /** */
-    FLOAT,
-
-    /** */
-    DOUBLE,
-
-    /** */
-    CHAR,
-
-    /** */
-    BOOLEAN,
-
-    /** */
-    OTHER
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallable.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallable.java
deleted file mode 100644
index 3137830..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallable.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import java.util.*;
-
-/**
- * Optional interface which helps make serialization even faster by removing internal
- * look-ups for classes.
- * <p>
- * All implementation must have the following:
- * <ul>
- * <li>
- *     Must have static filed (private or public) declared of type {@link Object}
- *     with name {@code GG_CLASS_ID}. GridGain will reflectively initialize this field with
- *     proper class ID during system startup.
- * </li>
- * <li>
- *     Must return the value of {@code GG_CLASS_ID} field from {@link #ggClassId} method.
- * </li>
- * </ul>
- * Here is a sample implementation:
- * <pre name="code" class="java">
- * // For better performance consider implementing java.io.Externalizable interface.
- * class ExampleMarshallable implements GridOptimizedMarshallable, Serializable {
- *     // Class ID field required by 'GridOptimizedMarshallable'.
- *     private static Object GG_CLASS_ID;
- *
- *     ...
- *
- *     &#64; public Object ggClassId() {
- *         return GG_CLASS_ID;
- *     }
- * }
- * </pre>
- * <p>
- * Note that for better performance you should also specify list of classes you
- * plan to serialize via {@link GridOptimizedMarshaller#setClassNames(List)} method.
- */
-public interface GridOptimizedMarshallable {
-    /** */
-    public static final String CLS_ID_FIELD_NAME = "GG_CLASS_ID";
-
-    /**
-     * Implementation of this method should simply return value of {@code GG_CLASS_ID} field.
-     *
-     * @return Class ID for optimized marshalling.
-     */
-    public Object ggClassId();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
deleted file mode 100644
index d3ae173..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.apache.ignite.marshaller.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import static org.gridgain.grid.marshaller.optimized.GridOptimizedMarshallerUtils.*;
-
-/**
- * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller},
- * which is based on standard {@link ObjectOutputStream}, this marshaller does not
- * enforce that all serialized objects implement {@link Serializable} interface. It is also
- * about 20 times faster as it removes lots of serialization overhead that exists in
- * default JDK implementation.
- * <p>
- * {@code GridOptimizedMarshaller} is tested only on Java HotSpot VM on other VMs
- * it could yield unexpected results. It is the default marshaller on Java HotSpot VMs
- * and will be used if no other marshaller was explicitly configured.
- * <p>
- * <h1 class="header">Configuration</h1>
- * <h2 class="header">Mandatory</h2>
- * This marshaller has no mandatory configuration parameters.
- * <h2 class="header">Java Example</h2>
- * <pre name="code" class="java">
- * GridOptimizedMarshaller marshaller = new GridOptimizedMarshaller();
- *
- * // Enforce Serializable interface.
- * marshaller.setRequireSerializable(true);
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * // Override marshaller.
- * cfg.setMarshaller(marshaller);
- *
- * // Starts grid.
- * G.start(cfg);
- * </pre>
- * <h2 class="header">Spring Example</h2>
- * GridOptimizedMarshaller can be configured from Spring XML configuration file:
- * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
- *     ...
- *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller"&gt;
- *             &lt;property name="requireSerializable"&gt;true&lt;/property&gt;
- *         &lt;/bean&gt;
- *     &lt;/property&gt;
- *     ...
- * &lt;/bean&gt;
- * </pre>
- * <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
- * <h2 class="header">Injection Example</h2>
- * GridMarshaller can be injected in users task, job or SPI as following:
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     &#64;GridMarshallerResource
- *     private GridMarshaller marshaller;
- *     ...
- * }
- * </pre>
- * or
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     private GridMarshaller marshaller;
- *     ...
- *     &#64;GridMarshallerResource
- *     public void setMarshaller(GridMarshaller marshaller) {
- *         this.marshaller = marshaller;
- *     }
- *     ...
- * }
- * </pre>
- */
-public class GridOptimizedMarshaller extends GridAbstractMarshaller {
-    /** Whether or not to require an object to be serializable in order to be marshalled. */
-    private boolean requireSer = true;
-
-    /** Default class loader. */
-    private final ClassLoader dfltClsLdr = getClass().getClassLoader();
-
-    /**
-     * Initializes marshaller not to enforce {@link Serializable} interface.
-     *
-     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
-     */
-    public GridOptimizedMarshaller() {
-        if (!available())
-            throw new GridRuntimeException("Using GridOptimizedMarshaller on unsupported JVM version (some of " +
-                "JVM-private APIs required for the marshaller to work are missing).");
-    }
-
-    /**
-     * Initializes marshaller with given serialization flag. If {@code true},
-     * then objects will be required to implement {@link Serializable} in order
-     * to be serialize.
-     *
-     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
-     *      then objects will be required to implement {@link Serializable} in order to be
-     *      marshalled, if {@code false}, then such requirement will be relaxed.
-     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
-     */
-    public GridOptimizedMarshaller(boolean requireSer) {
-        this();
-
-        this.requireSer = requireSer;
-    }
-
-    /**
-     * Initializes marshaller with given serialization flag. If {@code true},
-     * then objects will be required to implement {@link Serializable} in order
-     * to be serialize.
-     *
-     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
-     *      then objects will be required to implement {@link Serializable} in order to be
-     *      marshalled, if {@code false}, then such requirement will be relaxed.
-     * @param clsNames User preregistered class names.
-     * @param clsNamesPath Path to a file with user preregistered class names.
-     * @param poolSize Object streams pool size.
-     * @throws GridException If an I/O error occurs while writing stream header.
-     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
-     */
-    public GridOptimizedMarshaller(boolean requireSer, @Nullable List<String> clsNames,
-        @Nullable String clsNamesPath, int poolSize) throws GridException {
-        this(requireSer);
-
-        setClassNames(clsNames);
-        setClassNamesPath(clsNamesPath);
-        setPoolSize(poolSize);
-    }
-
-    /**
-     * Adds provided class names for marshalling optimization.
-     * <p>
-     * <b>NOTE</b>: these collections of classes must be identical on all nodes and in the same order.
-     *
-     * @param clsNames User preregistered class names to add.
-     */
-    @SuppressWarnings("unchecked")
-    public void setClassNames(@Nullable List<String> clsNames) {
-        if (clsNames != null && !clsNames.isEmpty()) {
-            String[] clsNamesArr = clsNames.toArray(new String[clsNames.size()]);
-
-            Arrays.sort(clsNamesArr);
-
-            Map<String, Integer> name2id = U.newHashMap(clsNamesArr.length);
-            T3<String, Class<?>, GridOptimizedClassDescriptor>[] id2name = new T3[clsNamesArr.length];
-
-            int i = 0;
-
-            for (String name : clsNamesArr) {
-                name2id.put(name, i);
-                id2name[i++] = new T3<>(name, null, null);
-            }
-
-            GridOptimizedClassResolver.userClasses(name2id, id2name);
-        }
-    }
-
-    /**
-     * Specifies a name of the file which lists all class names to be optimized.
-     * The file path can either be absolute path, relative to {@code GRIDGAIN_HOME},
-     * or specify a resource file on the class path.
-     * <p>
-     * The format of the file is class name per line, like this:
-     * <pre>
-     * ...
-     * com.example.Class1
-     * com.example.Class2
-     * ...
-     * </pre>
-     * <p>
-     * <b>NOTE</b>: this class list must be identical on all nodes and in the same order.
-     *
-     * @param path Path to a file with user preregistered class names.
-     * @throws GridException If an error occurs while writing stream header.
-     */
-    public void setClassNamesPath(@Nullable String path) throws GridException {
-        if (path == null)
-            return;
-
-        URL url = GridUtils.resolveGridGainUrl(path, false);
-
-        if (url == null)
-            throw new GridException("Failed to find resource for name: " + path);
-
-        List<String> clsNames;
-
-        try {
-            clsNames = new LinkedList<>();
-
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), UTF_8))) {
-                String clsName;
-
-                while ((clsName = reader.readLine()) != null)
-                    clsNames.add(clsName);
-            }
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to read class names from path: " + path, e);
-        }
-
-        setClassNames(clsNames);
-    }
-
-    /**
-     * Specifies size of cached object streams used by marshaller. Object streams are cached for
-     * performance reason to avoid costly recreation for every serialization routine. If {@code 0} (default),
-     * pool is not used and each thread has its own cached object stream which it keeps reusing.
-     * <p>
-     * Since each stream has an internal buffer, creating a stream for each thread can lead to
-     * high memory consumption if many large messages are marshalled or unmarshalled concurrently.
-     * Consider using pool in this case. This will limit number of streams that can be created and,
-     * therefore, decrease memory consumption.
-     * <p>
-     * NOTE: Using streams pool can decrease performance since streams will be shared between
-     * different threads which will lead to more frequent context switching.
-     *
-     * @param poolSize Streams pool size. If {@code 0}, pool is not used.
-     */
-    public void setPoolSize(int poolSize) {
-        GridOptimizedObjectStreamRegistry.poolSize(poolSize);
-    }
-
-    /**
-     * @return Whether to enforce {@link Serializable} interface.
-     */
-    public boolean isRequireSerializable() {
-        return requireSer;
-    }
-
-    /**
-     * Sets flag to enforce {@link Serializable} interface or not.
-     *
-     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
-     *      then objects will be required to implement {@link Serializable} in order to be
-     *      marshalled, if {@code false}, then such requirement will be relaxed.
-     */
-    public void setRequireSerializable(boolean requireSer) {
-        this.requireSer = requireSer;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
-        assert out != null;
-
-        GridOptimizedObjectOutputStream objOut = null;
-
-        try {
-            objOut = GridOptimizedObjectStreamRegistry.out();
-
-            objOut.requireSerializable(requireSer);
-
-            objOut.out().outputStream(out);
-
-            objOut.writeObject(obj);
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to serialize object: " + obj, e);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeOut(objOut);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public byte[] marshal(@Nullable Object obj) throws GridException {
-        GridOptimizedObjectOutputStream objOut = null;
-
-        try {
-            objOut = GridOptimizedObjectStreamRegistry.out();
-
-            objOut.requireSerializable(requireSer);
-
-            objOut.writeObject(obj);
-
-            return objOut.out().array();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to serialize object: " + obj, e);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeOut(objOut);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
-        assert in != null;
-
-        GridOptimizedObjectInputStream objIn = null;
-
-        try {
-            objIn = GridOptimizedObjectStreamRegistry.in();
-
-            objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
-
-            objIn.in().inputStream(in);
-
-            return (T)objIn.readObject();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
-        }
-        catch (ClassNotFoundException e) {
-            throw new GridException("Failed to find class with given class loader for unmarshalling " +
-                "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " +
-                clsLdr, e);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeIn(objIn);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
-        assert arr != null;
-
-        GridOptimizedObjectInputStream objIn = null;
-
-        try {
-            objIn = GridOptimizedObjectStreamRegistry.in();
-
-            objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
-
-            objIn.in().bytes(arr, arr.length);
-
-            return (T)objIn.readObject();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
-        }
-        catch (ClassNotFoundException e) {
-            throw new GridException("Failed to find class with given class loader for unmarshalling " +
-                "(make sure same version of all classes are available on all nodes or enable peer-class-loading): " +
-                clsLdr, e);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeIn(objIn);
-        }
-    }
-
-    /**
-     * Checks whether {@code GridOptimizedMarshaller} is able to work on the current JVM.
-     * <p>
-     * As long as {@code GridOptimizedMarshaller} uses JVM-private API, which is not guaranteed
-     * to be available on all JVM, this method should be called to ensure marshaller could work properly.
-     * <p>
-     * Result of this method is automatically checked in constructor.
-     *
-     * @return {@code true} if {@code GridOptimizedMarshaller} can work on the current JVM or
-     *  {@code false} if it can't.
-     */
-    @SuppressWarnings({"TypeParameterExtendsFinalClass", "ErrorNotRethrown"})
-    public static boolean available() {
-        try {
-            Unsafe unsafe = GridUnsafe.unsafe();
-
-            Class<? extends Unsafe> unsafeCls = unsafe.getClass();
-
-            unsafeCls.getMethod("allocateInstance", Class.class);
-            unsafeCls.getMethod("copyMemory", Object.class, long.class, Object.class, long.class, long.class);
-
-            return true;
-        }
-        catch (Exception ignored) {
-            return false;
-        }
-        catch (NoClassDefFoundError ignored) {
-            return false;
-        }
-    }
-
-    /**
-     * Undeployment callback invoked when class loader is being undeployed.
-     *
-     * @param ldr Class loader being undeployed.
-     */
-    public static void onUndeploy(ClassLoader ldr) {
-        GridOptimizedMarshallerUtils.onUndeploy(ldr);
-    }
-
-    /**
-     * Clears internal caches and frees memory. Usually called on system stop.
-     */
-    public static void clearCache() {
-        GridOptimizedMarshallerUtils.clearCache();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerUtils.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerUtils.java
deleted file mode 100644
index 885a546..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerUtils.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.nio.charset.*;
-import java.security.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.gridgain.grid.marshaller.optimized.GridOptimizedMarshallable.*;
-
-/**
- * Miscellaneous utility methods to facilitate {@link GridOptimizedMarshaller}.
- */
-class GridOptimizedMarshallerUtils {
-    /** Unsafe. */
-    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-    /** {@code Null} object reference. */
-    static final byte NULL = (byte)0x70;
-
-    /** Handle reference. */
-    static final byte HANDLE = (byte)0x71;
-
-    /** Object reference. */
-    static final byte OBJECT = (byte)0x72;
-
-    /** UTF-8 character name. */
-    static final Charset UTF_8 = Charset.forName("UTF-8");
-
-    /** Class descriptors cache. */
-    private static final ConcurrentMap<Class<?>, GridOptimizedClassDescriptor> CLS_DESC_CACHE =
-        new ConcurrentHashMap8<>(256);
-
-    /** Classes cache by name. */
-    private static final ConcurrentHashMap8<ClassLoader, ConcurrentHashMap8<String, Class<?>>> CLS_BY_NAME_CACHE =
-        new ConcurrentHashMap8<>();
-
-    /**
-     * Suppresses default constructor, ensuring non-instantiability.
-     */
-    private GridOptimizedMarshallerUtils() {
-        // No-op.
-    }
-
-    /**
-     * Gets class for given name and class loader.
-     *
-     * @param name Class name.
-     * @param ldr Class loader.
-     * @return Class.
-     * @throws ClassNotFoundException If class was not found.
-     */
-    static Class<?> forName(String name, ClassLoader ldr) throws ClassNotFoundException {
-        assert ldr != null;
-        assert name != null;
-
-        ConcurrentHashMap8<String, Class<?>> cache = CLS_BY_NAME_CACHE.get(ldr);
-
-        Class<?> cls = null;
-
-        if (cache == null) {
-            cache = new ConcurrentHashMap8<>();
-
-            ConcurrentHashMap8<String, Class<?>> old = CLS_BY_NAME_CACHE.putIfAbsent(ldr, cache);
-
-            if (old != null) {
-                cache = old;
-
-                cls = cache.get(name);
-            }
-        }
-        else
-            cls = cache.get(name);
-
-        if (cls == null) {
-            cls = Class.forName(name, true, ldr);
-
-            cache.put(name, cls);
-        }
-
-        return cls;
-    }
-
-    /**
-     * Gets descriptor for provided class.
-     *
-     * @param cls Class.
-     * @param obj Object.
-     * @return Descriptor.
-     * @throws IOException In case of error.
-     */
-    static GridOptimizedClassDescriptor classDescriptor(Class<?> cls, @Nullable Object obj) throws IOException {
-        if (obj != null) {
-            if (obj instanceof GridOptimizedMarshallable) {
-                GridOptimizedMarshallable m = (GridOptimizedMarshallable)obj;
-
-                Object clsId = m.ggClassId();
-
-                if (clsId != null && !(clsId instanceof GridOptimizedClassDescriptor))
-                    throw new IOException("Method '" + obj.getClass().getName() + ".ggClassId() must return " +
-                        "the value of the field '" + CLS_ID_FIELD_NAME + "'.");
-
-                GridOptimizedClassDescriptor desc = (GridOptimizedClassDescriptor)clsId;
-
-                if (desc == null) {
-                    desc = new GridOptimizedClassDescriptor(cls);
-
-                    try {
-                        Field field = obj.getClass().getDeclaredField(CLS_ID_FIELD_NAME);
-
-                        field.setAccessible(true);
-
-                        Object o = field.get(null);
-
-                        if (o == null) {
-                            if ((field.getModifiers() & Modifier.STATIC) == 0)
-                                throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared static: " +
-                                    obj.getClass().getName());
-
-                            field.set(null, desc);
-
-                            if (m.ggClassId() == null)
-                                throw new IOException( "Method '" + obj.getClass().getName() + ".ggClassId() must " +
-                                    "return the value of the field '" + CLS_ID_FIELD_NAME + "': "
-                                    + obj.getClass().getName());
-                        }
-                        else if (!(o instanceof GridOptimizedClassDescriptor))
-                            throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared with " +
-                                "null value: " + obj.getClass().getName());
-                    }
-                    catch (NoSuchFieldException e) {
-                        throw new IOException("GridOptimizedMarshallable classes must have static field declared " +
-                            "[fieldName=" + CLS_ID_FIELD_NAME + ", cls=" + obj.getClass().getName() + ']', e);
-                    }
-                    catch (IllegalAccessException e) {
-                        throw new IOException("Failed to set field '" + CLS_ID_FIELD_NAME + "' on '" +
-                            obj.getClass().getName() + "' class.", e);
-                    }
-                }
-
-                return desc;
-            }
-        }
-
-        GridOptimizedClassDescriptor desc = CLS_DESC_CACHE.get(cls);
-
-        if (desc == null) {
-            GridOptimizedClassDescriptor existing = CLS_DESC_CACHE.putIfAbsent(cls,
-                desc = new GridOptimizedClassDescriptor(cls));
-
-            if (existing != null)
-                desc = existing;
-        }
-
-        return desc;
-    }
-
-    /**
-     * Undeployment callback.
-     *
-     * @param ldr Undeployed class loader.
-     */
-    public static void onUndeploy(ClassLoader ldr) {
-        CLS_BY_NAME_CACHE.remove(ldr);
-
-        for (Class<?> cls : CLS_DESC_CACHE.keySet()) {
-            if (ldr.equals(cls.getClassLoader()))
-                CLS_DESC_CACHE.remove(cls);
-        }
-    }
-
-    /**
-     * Intended for test purposes only.
-     */
-    public static void clearCache() {
-        CLS_BY_NAME_CACHE.clear();
-        CLS_DESC_CACHE.clear();
-    }
-
-    /**
-     *
-     */
-    public static void printMemoryStats() {
-        X.println(">>>");
-        X.println(">>> GridOptimizedMarshallerUtils memory stats:");
-        X.println(" Cache size: " + CLS_DESC_CACHE.size());
-
-        for (Map.Entry<Class<?>, GridOptimizedClassDescriptor> e : CLS_DESC_CACHE.entrySet())
-            X.println(" " + e.getKey() + " : " + e.getValue());
-    }
-
-    /**
-     * Computes the serial version UID value for the given class.
-     * The code is taken from {@link ObjectStreamClass#computeDefaultSUID(Class)}.
-     *
-     * @param cls A class.
-     * @param fields Fields.
-     * @return A serial version UID.
-     * @throws IOException If failed.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    static Long computeSerialVersionUid(Class cls, List<Field> fields) throws IOException {
-        if (Serializable.class.isAssignableFrom(cls) && !Enum.class.isAssignableFrom(cls))
-            return ObjectStreamClass.lookup(cls).getSerialVersionUID();
-
-        MessageDigest md;
-
-        try {
-            md = MessageDigest.getInstance("SHA");
-        }
-        catch (NoSuchAlgorithmException e) {
-            throw new IOException("Failed to get digest for SHA.", e);
-        }
-
-        md.update(cls.getName().getBytes(UTF_8));
-
-        if (!F.isEmpty(fields)) {
-            for (int i = 0; i < fields.size(); i++) {
-                Field f = fields.get(i);
-
-                md.update(f.getName().getBytes(UTF_8));
-                md.update(f.getType().getName().getBytes(UTF_8));
-            }
-        }
-
-        byte[] hashBytes = md.digest();
-
-        long hash = 0;
-
-        // Composes a single-long hash from the byte[] hash.
-        for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--)
-            hash = (hash << 8) | (hashBytes[i] & 0xFF);
-
-        return hash;
-    }
-
-    /**
-     * Gets byte field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Byte value.
-     */
-    static byte getByte(Object obj, long off) {
-        return UNSAFE.getByte(obj, off);
-    }
-
-    /**
-     * Sets byte field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setByte(Object obj, long off, byte val) {
-        UNSAFE.putByte(obj, off, val);
-    }
-
-    /**
-     * Gets short field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Short value.
-     */
-    static short getShort(Object obj, long off) {
-        return UNSAFE.getShort(obj, off);
-    }
-
-    /**
-     * Sets short field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setShort(Object obj, long off, short val) {
-        UNSAFE.putShort(obj, off, val);
-    }
-
-    /**
-     * Gets integer field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Integer value.
-     */
-    static int getInt(Object obj, long off) {
-        return UNSAFE.getInt(obj, off);
-    }
-
-    /**
-     * Sets integer field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setInt(Object obj, long off, int val) {
-        UNSAFE.putInt(obj, off, val);
-    }
-
-    /**
-     * Gets long field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Long value.
-     */
-    static long getLong(Object obj, long off) {
-        return UNSAFE.getLong(obj, off);
-    }
-
-    /**
-     * Sets long field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setLong(Object obj, long off, long val) {
-        UNSAFE.putLong(obj, off, val);
-    }
-
-    /**
-     * Gets float field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Float value.
-     */
-    static float getFloat(Object obj, long off) {
-        return UNSAFE.getFloat(obj, off);
-    }
-
-    /**
-     * Sets float field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setFloat(Object obj, long off, float val) {
-        UNSAFE.putFloat(obj, off, val);
-    }
-
-    /**
-     * Gets double field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Double value.
-     */
-    static double getDouble(Object obj, long off) {
-        return UNSAFE.getDouble(obj, off);
-    }
-
-    /**
-     * Sets double field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setDouble(Object obj, long off, double val) {
-        UNSAFE.putDouble(obj, off, val);
-    }
-
-    /**
-     * Gets char field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Char value.
-     */
-    static char getChar(Object obj, long off) {
-        return UNSAFE.getChar(obj, off);
-    }
-
-    /**
-     * Sets char field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setChar(Object obj, long off, char val) {
-        UNSAFE.putChar(obj, off, val);
-    }
-
-    /**
-     * Gets boolean field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Boolean value.
-     */
-    static boolean getBoolean(Object obj, long off) {
-        return UNSAFE.getBoolean(obj, off);
-    }
-
-    /**
-     * Sets boolean field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setBoolean(Object obj, long off, boolean val) {
-        UNSAFE.putBoolean(obj, off, val);
-    }
-
-    /**
-     * Gets field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Value.
-     */
-    static Object getObject(Object obj, long off) {
-        return UNSAFE.getObject(obj, off);
-    }
-
-    /**
-     * Sets field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setObject(Object obj, long off, Object val) {
-        UNSAFE.putObject(obj, off, val);
-    }
-}


[20/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3edf39ef/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/optimized-classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/optimized-classnames.properties b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/optimized-classnames.properties
deleted file mode 100644
index 9038b45..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/optimized-classnames.properties
+++ /dev/null
@@ -1,30621 +0,0 @@
-EDU.oswego.cs.dl.util.concurrent.BrokenBarrierException
-EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap
-EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap$Segment
-EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap
-EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap$BarrierLock
-EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList
-EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet
-EDU.oswego.cs.dl.util.concurrent.PropertyChangeMulticaster
-EDU.oswego.cs.dl.util.concurrent.TimeoutException
-EDU.oswego.cs.dl.util.concurrent.VetoableChangeMulticaster
-EDU.oswego.cs.dl.util.concurrent.misc.AClongRNG
-EDU.oswego.cs.dl.util.concurrent.misc.AllSynchRNG
-EDU.oswego.cs.dl.util.concurrent.misc.ChanRNG
-EDU.oswego.cs.dl.util.concurrent.misc.DirectExecutorRNG
-EDU.oswego.cs.dl.util.concurrent.misc.FIFORWlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.FifoRNG
-EDU.oswego.cs.dl.util.concurrent.misc.Fraction
-EDU.oswego.cs.dl.util.concurrent.misc.LockedSemRNG
-EDU.oswego.cs.dl.util.concurrent.misc.MutexRNG
-EDU.oswego.cs.dl.util.concurrent.misc.NoSynchRNG
-EDU.oswego.cs.dl.util.concurrent.misc.PooledExecutorRNG
-EDU.oswego.cs.dl.util.concurrent.misc.PrioritySemRNG
-EDU.oswego.cs.dl.util.concurrent.misc.PublicSynchRNG
-EDU.oswego.cs.dl.util.concurrent.misc.QueuedExecutorRNG
-EDU.oswego.cs.dl.util.concurrent.misc.RWLockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.ReaderPrefRWlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.ReentrantRWlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.RlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.SDelegatedRNG
-EDU.oswego.cs.dl.util.concurrent.misc.SemRNG
-EDU.oswego.cs.dl.util.concurrent.misc.SyncDelegatedRNG
-EDU.oswego.cs.dl.util.concurrent.misc.SynchLongRNG
-EDU.oswego.cs.dl.util.concurrent.misc.ThreadedExecutorRNG
-EDU.oswego.cs.dl.util.concurrent.misc.UpdateCommand
-EDU.oswego.cs.dl.util.concurrent.misc.WpRWlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.WpSemRNG
-antlr.ANTLRError
-antlr.ANTLRException
-antlr.CharStreamException
-antlr.CharStreamIOException
-antlr.CommonAST
-antlr.CommonASTWithHiddenTokens
-antlr.FileCopyException
-antlr.MismatchedCharException
-antlr.MismatchedTokenException
-antlr.NoViableAltException
-antlr.NoViableAltForCharException
-antlr.ParseTreeRule
-antlr.ParseTreeToken
-antlr.RecognitionException
-antlr.SemanticException
-antlr.TokenStreamException
-antlr.TokenStreamIOException
-antlr.TokenStreamRecognitionException
-antlr.TokenStreamRetryException
-antlr.debug.InputBufferEvent
-antlr.debug.MessageEvent
-antlr.debug.NewLineEvent
-antlr.debug.ParserMatchEvent
-antlr.debug.ParserTokenEvent
-antlr.debug.SemanticPredicateEvent
-antlr.debug.SyntacticPredicateEvent
-antlr.debug.TraceEvent
-antlr.debug.misc.ASTFrame
-antlr.debug.misc.JTreeASTPanel
-ch.epfl.lamp.compiler.msil.emit.ILGenerator$$anonfun$Emit$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anon$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$addPrimitive$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseILGenerator$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseOpCode$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseTypeBuilder$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$hasControlChars$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$pad$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printAssemblyBoilerplate$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printAttributes$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printHeader$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printSignature$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printSignature$2
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printTypeParams$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printTypeParams$1$$anonfun$apply$mcVI$sp$1
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseAssemblyBuilder$1
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseAssemblyBuilder$2
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$1
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$1$$anonfun$apply$mcVI$sp$1
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$2
-ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseAssemblyBuilder$1
-ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseAssemblyBuilder$2
-ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseModuleBuilder$1
-ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseModuleBuilder$2
-ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$constructorsEqual$1
-ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$methodsEqual$1
-ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$types2String$1
-ch.epfl.lamp.fjbg.JCode$OffsetTooBigException
-com.amazonaws.AmazonClientException
-com.amazonaws.AmazonServiceException
-com.amazonaws.AmazonServiceException$ErrorType
-com.amazonaws.HttpMethod
-com.amazonaws.Protocol
-com.amazonaws.auth.SignatureVersion
-com.amazonaws.auth.SigningAlgorithm
-com.amazonaws.auth.policy.Statement$Effect
-com.amazonaws.auth.policy.actions.CloudFormationActions
-com.amazonaws.auth.policy.actions.S3Actions
-com.amazonaws.auth.policy.actions.SNSActions
-com.amazonaws.auth.policy.actions.SQSActions
-com.amazonaws.auth.policy.conditions.ArnCondition$ArnComparisonType
-com.amazonaws.auth.policy.conditions.DateCondition$DateComparisonType
-com.amazonaws.auth.policy.conditions.IpAddressCondition$IpAddressComparisonType
-com.amazonaws.auth.policy.conditions.NumericCondition$NumericComparisonType
-com.amazonaws.auth.policy.conditions.StringCondition$StringComparisonType
-com.amazonaws.http.HttpMethodName
-com.amazonaws.services.autoscaling.model.AlreadyExistsException
-com.amazonaws.services.autoscaling.model.InvalidNextTokenException
-com.amazonaws.services.autoscaling.model.LifecycleState
-com.amazonaws.services.autoscaling.model.LimitExceededException
-com.amazonaws.services.autoscaling.model.ResourceInUseException
-com.amazonaws.services.autoscaling.model.ScalingActivityInProgressException
-com.amazonaws.services.autoscaling.model.ScalingActivityStatusCode
-com.amazonaws.services.cloudformation.model.AlreadyExistsException
-com.amazonaws.services.cloudformation.model.Capability
-com.amazonaws.services.cloudformation.model.InsufficientCapabilitiesException
-com.amazonaws.services.cloudformation.model.LimitExceededException
-com.amazonaws.services.cloudformation.model.OnFailure
-com.amazonaws.services.cloudformation.model.ResourceStatus
-com.amazonaws.services.cloudformation.model.StackStatus
-com.amazonaws.services.cloudfront.model.AccessDeniedException
-com.amazonaws.services.cloudfront.model.BatchTooLargeException
-com.amazonaws.services.cloudfront.model.CNAMEAlreadyExistsException
-com.amazonaws.services.cloudfront.model.CloudFrontOriginAccessIdentityAlreadyExistsException
-com.amazonaws.services.cloudfront.model.CloudFrontOriginAccessIdentityInUseException
-com.amazonaws.services.cloudfront.model.DistributionAlreadyExistsException
-com.amazonaws.services.cloudfront.model.DistributionNotDisabledException
-com.amazonaws.services.cloudfront.model.IllegalUpdateException
-com.amazonaws.services.cloudfront.model.InconsistentQuantitiesException
-com.amazonaws.services.cloudfront.model.InvalidArgumentException
-com.amazonaws.services.cloudfront.model.InvalidDefaultRootObjectException
-com.amazonaws.services.cloudfront.model.InvalidIfMatchVersionException
-com.amazonaws.services.cloudfront.model.InvalidOriginAccessIdentityException
-com.amazonaws.services.cloudfront.model.InvalidOriginException
-com.amazonaws.services.cloudfront.model.InvalidRequiredProtocolException
-com.amazonaws.services.cloudfront.model.MissingBodyException
-com.amazonaws.services.cloudfront.model.NoSuchCloudFrontOriginAccessIdentityException
-com.amazonaws.services.cloudfront.model.NoSuchDistributionException
-com.amazonaws.services.cloudfront.model.NoSuchInvalidationException
-com.amazonaws.services.cloudfront.model.NoSuchOriginException
-com.amazonaws.services.cloudfront.model.NoSuchStreamingDistributionException
-com.amazonaws.services.cloudfront.model.OriginProtocolPolicy
-com.amazonaws.services.cloudfront.model.PreconditionFailedException
-com.amazonaws.services.cloudfront.model.StreamingDistributionAlreadyExistsException
-com.amazonaws.services.cloudfront.model.StreamingDistributionNotDisabledException
-com.amazonaws.services.cloudfront.model.TooManyCacheBehaviorsException
-com.amazonaws.services.cloudfront.model.TooManyCloudFrontOriginAccessIdentitiesException
-com.amazonaws.services.cloudfront.model.TooManyDistributionCNAMEsException
-com.amazonaws.services.cloudfront.model.TooManyDistributionsException
-com.amazonaws.services.cloudfront.model.TooManyInvalidationsInProgressException
-com.amazonaws.services.cloudfront.model.TooManyOriginsException
-com.amazonaws.services.cloudfront.model.TooManyStreamingDistributionCNAMEsException
-com.amazonaws.services.cloudfront.model.TooManyStreamingDistributionsException
-com.amazonaws.services.cloudfront.model.TooManyTrustedSignersException
-com.amazonaws.services.cloudfront.model.TrustedSignerDoesNotExistException
-com.amazonaws.services.cloudfront.model.ViewerProtocolPolicy
-com.amazonaws.services.cloudfront_2012_03_15.model.AccessDeniedException
-com.amazonaws.services.cloudfront_2012_03_15.model.BatchTooLargeException
-com.amazonaws.services.cloudfront_2012_03_15.model.CNAMEAlreadyExistsException
-com.amazonaws.services.cloudfront_2012_03_15.model.CloudFrontOriginAccessIdentityAlreadyExistsException
-com.amazonaws.services.cloudfront_2012_03_15.model.CloudFrontOriginAccessIdentityInUseException
-com.amazonaws.services.cloudfront_2012_03_15.model.DistributionAlreadyExistsException
-com.amazonaws.services.cloudfront_2012_03_15.model.DistributionNotDisabledException
-com.amazonaws.services.cloudfront_2012_03_15.model.IllegalUpdateException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidArgumentException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidDefaultRootObjectException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidIfMatchVersionException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidOriginAccessIdentityException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidOriginException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidRequiredProtocolException
-com.amazonaws.services.cloudfront_2012_03_15.model.MissingBodyException
-com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchCloudFrontOriginAccessIdentityException
-com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchDistributionException
-com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchInvalidationException
-com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchStreamingDistributionException
-com.amazonaws.services.cloudfront_2012_03_15.model.OriginProtocolPolicy
-com.amazonaws.services.cloudfront_2012_03_15.model.PreconditionFailedException
-com.amazonaws.services.cloudfront_2012_03_15.model.StreamingDistributionAlreadyExistsException
-com.amazonaws.services.cloudfront_2012_03_15.model.StreamingDistributionNotDisabledException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyCloudFrontOriginAccessIdentitiesException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyDistributionCNAMEsException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyDistributionsException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyInvalidationsInProgressException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyStreamingDistributionCNAMEsException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyStreamingDistributionsException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyTrustedSignersException
-com.amazonaws.services.cloudfront_2012_03_15.model.TrustedSignerDoesNotExistException
-com.amazonaws.services.cloudsearch.model.BaseException
-com.amazonaws.services.cloudsearch.model.IndexFieldType
-com.amazonaws.services.cloudsearch.model.InternalException
-com.amazonaws.services.cloudsearch.model.InvalidTypeException
-com.amazonaws.services.cloudsearch.model.LimitExceededException
-com.amazonaws.services.cloudsearch.model.OptionState
-com.amazonaws.services.cloudsearch.model.ResourceNotFoundException
-com.amazonaws.services.cloudsearch.model.SearchInstanceType
-com.amazonaws.services.cloudsearch.model.SourceDataFunction
-com.amazonaws.services.cloudwatch.model.ComparisonOperator
-com.amazonaws.services.cloudwatch.model.HistoryItemType
-com.amazonaws.services.cloudwatch.model.InternalServiceException
-com.amazonaws.services.cloudwatch.model.InvalidFormatException
-com.amazonaws.services.cloudwatch.model.InvalidNextTokenException
-com.amazonaws.services.cloudwatch.model.InvalidParameterCombinationException
-com.amazonaws.services.cloudwatch.model.InvalidParameterValueException
-com.amazonaws.services.cloudwatch.model.LimitExceededException
-com.amazonaws.services.cloudwatch.model.MissingRequiredParameterException
-com.amazonaws.services.cloudwatch.model.ResourceNotFoundException
-com.amazonaws.services.cloudwatch.model.StandardUnit
-com.amazonaws.services.cloudwatch.model.StateValue
-com.amazonaws.services.cloudwatch.model.Statistic
-com.amazonaws.services.dynamodb.datamodeling.DynamoDBMapperConfig$ConsistentReads
-com.amazonaws.services.dynamodb.datamodeling.DynamoDBMapperConfig$SaveBehavior
-com.amazonaws.services.dynamodb.datamodeling.DynamoDBMappingException
-com.amazonaws.services.dynamodb.model.AttributeAction
-com.amazonaws.services.dynamodb.model.ComparisonOperator
-com.amazonaws.services.dynamodb.model.ConditionalCheckFailedException
-com.amazonaws.services.dynamodb.model.InternalServerErrorException
-com.amazonaws.services.dynamodb.model.LimitExceededException
-com.amazonaws.services.dynamodb.model.ProvisionedThroughputExceededException
-com.amazonaws.services.dynamodb.model.ResourceInUseException
-com.amazonaws.services.dynamodb.model.ResourceNotFoundException
-com.amazonaws.services.dynamodb.model.ReturnValue
-com.amazonaws.services.dynamodb.model.ScalarAttributeType
-com.amazonaws.services.dynamodb.model.TableStatus
-com.amazonaws.services.ec2.model.ContainerFormat
-com.amazonaws.services.ec2.model.DiskImageFormat
-com.amazonaws.services.ec2.model.DomainType
-com.amazonaws.services.ec2.model.ExportEnvironment
-com.amazonaws.services.ec2.model.HypervisorType
-com.amazonaws.services.ec2.model.ImageState
-com.amazonaws.services.ec2.model.InstanceAttributeName
-com.amazonaws.services.ec2.model.InstanceStateName
-com.amazonaws.services.ec2.model.InstanceType
-com.amazonaws.services.ec2.model.PlacementGroupState
-com.amazonaws.services.ec2.model.PlacementStrategy
-com.amazonaws.services.ec2.model.ResourceType
-com.amazonaws.services.ec2.model.RuleAction
-com.amazonaws.services.ec2.model.SnapshotAttributeName
-com.amazonaws.services.ec2.model.SnapshotState
-com.amazonaws.services.ec2.model.SpotInstanceType
-com.amazonaws.services.ec2.model.VirtualizationType
-com.amazonaws.services.ec2.model.VolumeAttachmentState
-com.amazonaws.services.ec2.model.VolumeAttributeName
-com.amazonaws.services.ec2.model.VolumeState
-com.amazonaws.services.ec2.model.VolumeType
-com.amazonaws.services.elasticache.model.AuthorizationAlreadyExistsException
-com.amazonaws.services.elasticache.model.AuthorizationNotFoundException
-com.amazonaws.services.elasticache.model.CacheClusterAlreadyExistsException
-com.amazonaws.services.elasticache.model.CacheClusterNotFoundException
-com.amazonaws.services.elasticache.model.CacheParameterGroupAlreadyExistsException
-com.amazonaws.services.elasticache.model.CacheParameterGroupNotFoundException
-com.amazonaws.services.elasticache.model.CacheParameterGroupQuotaExceededException
-com.amazonaws.services.elasticache.model.CacheSecurityGroupAlreadyExistsException
-com.amazonaws.services.elasticache.model.CacheSecurityGroupNotFoundException
-com.amazonaws.services.elasticache.model.CacheSecurityGroupQuotaExceededException
-com.amazonaws.services.elasticache.model.ClusterQuotaForCustomerExceededException
-com.amazonaws.services.elasticache.model.InsufficientCacheClusterCapacityException
-com.amazonaws.services.elasticache.model.InvalidCacheClusterStateException
-com.amazonaws.services.elasticache.model.InvalidCacheParameterGroupStateException
-com.amazonaws.services.elasticache.model.InvalidCacheSecurityGroupStateException
-com.amazonaws.services.elasticache.model.InvalidParameterCombinationException
-com.amazonaws.services.elasticache.model.InvalidParameterValueException
-com.amazonaws.services.elasticache.model.NodeQuotaForClusterExceededException
-com.amazonaws.services.elasticache.model.NodeQuotaForCustomerExceededException
-com.amazonaws.services.elasticache.model.ReservedCacheNodeAlreadyExistsException
-com.amazonaws.services.elasticache.model.ReservedCacheNodeNotFoundException
-com.amazonaws.services.elasticache.model.ReservedCacheNodeQuotaExceededException
-com.amazonaws.services.elasticache.model.ReservedCacheNodesOfferingNotFoundException
-com.amazonaws.services.elasticache.model.SourceType
-com.amazonaws.services.elasticbeanstalk.model.ConfigurationDeploymentStatus
-com.amazonaws.services.elasticbeanstalk.model.ConfigurationOptionValueType
-com.amazonaws.services.elasticbeanstalk.model.EnvironmentHealth
-com.amazonaws.services.elasticbeanstalk.model.EnvironmentInfoType
-com.amazonaws.services.elasticbeanstalk.model.EnvironmentStatus
-com.amazonaws.services.elasticbeanstalk.model.EventSeverity
-com.amazonaws.services.elasticbeanstalk.model.S3SubscriptionRequiredException
-com.amazonaws.services.elasticbeanstalk.model.SourceBundleDeletionException
-com.amazonaws.services.elasticbeanstalk.model.TooManyApplicationVersionsException
-com.amazonaws.services.elasticbeanstalk.model.TooManyApplicationsException
-com.amazonaws.services.elasticbeanstalk.model.TooManyBucketsException
-com.amazonaws.services.elasticbeanstalk.model.TooManyConfigurationTemplatesException
-com.amazonaws.services.elasticbeanstalk.model.TooManyEnvironmentsException
-com.amazonaws.services.elasticbeanstalk.model.ValidationSeverity
-com.amazonaws.services.elasticloadbalancing.model.CertificateNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.DuplicateListenerException
-com.amazonaws.services.elasticloadbalancing.model.DuplicateLoadBalancerNameException
-com.amazonaws.services.elasticloadbalancing.model.DuplicatePolicyNameException
-com.amazonaws.services.elasticloadbalancing.model.InvalidConfigurationRequestException
-com.amazonaws.services.elasticloadbalancing.model.InvalidInstanceException
-com.amazonaws.services.elasticloadbalancing.model.InvalidSchemeException
-com.amazonaws.services.elasticloadbalancing.model.InvalidSecurityGroupException
-com.amazonaws.services.elasticloadbalancing.model.InvalidSubnetException
-com.amazonaws.services.elasticloadbalancing.model.ListenerNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.LoadBalancerNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.PolicyNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.PolicyTypeNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.SubnetNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.TooManyLoadBalancersException
-com.amazonaws.services.elasticloadbalancing.model.TooManyPoliciesException
-com.amazonaws.services.elasticmapreduce.model.ActionOnFailure
-com.amazonaws.services.elasticmapreduce.model.InstanceGroupState
-com.amazonaws.services.elasticmapreduce.model.InstanceRoleType
-com.amazonaws.services.elasticmapreduce.model.InternalServerErrorException
-com.amazonaws.services.elasticmapreduce.model.JobFlowExecutionState
-com.amazonaws.services.elasticmapreduce.model.MarketType
-com.amazonaws.services.elasticmapreduce.model.StepExecutionState
-com.amazonaws.services.elasticmapreduce.util.BootstrapActions$ConfigFile
-com.amazonaws.services.elasticmapreduce.util.BootstrapActions$Daemon
-com.amazonaws.services.elasticmapreduce.util.ResizeJobFlowStep$OnArrested
-com.amazonaws.services.elasticmapreduce.util.ResizeJobFlowStep$OnFailure
-com.amazonaws.services.elasticmapreduce.util.StepFactory$HiveVersion
-com.amazonaws.services.glacier.model.ActionCode
-com.amazonaws.services.glacier.model.InvalidParameterValueException
-com.amazonaws.services.glacier.model.LimitExceededException
-com.amazonaws.services.glacier.model.MissingParameterValueException
-com.amazonaws.services.glacier.model.RequestTimeoutException
-com.amazonaws.services.glacier.model.ResourceNotFoundException
-com.amazonaws.services.glacier.model.ServiceUnavailableException
-com.amazonaws.services.glacier.model.StatusCode
-com.amazonaws.services.identitymanagement.model.AssignmentStatusType
-com.amazonaws.services.identitymanagement.model.DeleteConflictException
-com.amazonaws.services.identitymanagement.model.DuplicateCertificateException
-com.amazonaws.services.identitymanagement.model.EntityAlreadyExistsException
-com.amazonaws.services.identitymanagement.model.EntityTemporarilyUnmodifiableException
-com.amazonaws.services.identitymanagement.model.InvalidAuthenticationCodeException
-com.amazonaws.services.identitymanagement.model.InvalidCertificateException
-com.amazonaws.services.identitymanagement.model.InvalidUserTypeException
-com.amazonaws.services.identitymanagement.model.KeyPairMismatchException
-com.amazonaws.services.identitymanagement.model.LimitExceededException
-com.amazonaws.services.identitymanagement.model.MalformedCertificateException
-com.amazonaws.services.identitymanagement.model.MalformedPolicyDocumentException
-com.amazonaws.services.identitymanagement.model.NoSuchEntityException
-com.amazonaws.services.identitymanagement.model.PasswordPolicyViolationException
-com.amazonaws.services.identitymanagement.model.StatusType
-com.amazonaws.services.identitymanagement.model.SummaryKeyType
-com.amazonaws.services.importexport.model.BucketPermissionException
-com.amazonaws.services.importexport.model.CanceledJobIdException
-com.amazonaws.services.importexport.model.ExpiredJobIdException
-com.amazonaws.services.importexport.model.InvalidAccessKeyIdException
-com.amazonaws.services.importexport.model.InvalidAddressException
-com.amazonaws.services.importexport.model.InvalidCustomsException
-com.amazonaws.services.importexport.model.InvalidFileSystemException
-com.amazonaws.services.importexport.model.InvalidJobIdException
-com.amazonaws.services.importexport.model.InvalidManifestFieldException
-com.amazonaws.services.importexport.model.InvalidParameterException
-com.amazonaws.services.importexport.model.JobType
-com.amazonaws.services.importexport.model.MalformedManifestException
-com.amazonaws.services.importexport.model.MissingCustomsException
-com.amazonaws.services.importexport.model.MissingManifestFieldException
-com.amazonaws.services.importexport.model.MissingParameterException
-com.amazonaws.services.importexport.model.MultipleRegionsException
-com.amazonaws.services.importexport.model.NoSuchBucketException
-com.amazonaws.services.importexport.model.UnableToCancelJobIdException
-com.amazonaws.services.rds.model.ApplyMethod
-com.amazonaws.services.rds.model.AuthorizationAlreadyExistsException
-com.amazonaws.services.rds.model.AuthorizationNotFoundException
-com.amazonaws.services.rds.model.AuthorizationQuotaExceededException
-com.amazonaws.services.rds.model.DBInstanceAlreadyExistsException
-com.amazonaws.services.rds.model.DBInstanceNotFoundException
-com.amazonaws.services.rds.model.DBParameterGroupAlreadyExistsException
-com.amazonaws.services.rds.model.DBParameterGroupNotFoundException
-com.amazonaws.services.rds.model.DBParameterGroupQuotaExceededException
-com.amazonaws.services.rds.model.DBSecurityGroupAlreadyExistsException
-com.amazonaws.services.rds.model.DBSecurityGroupNotFoundException
-com.amazonaws.services.rds.model.DBSecurityGroupQuotaExceededException
-com.amazonaws.services.rds.model.DBSnapshotAlreadyExistsException
-com.amazonaws.services.rds.model.DBSnapshotNotFoundException
-com.amazonaws.services.rds.model.DBSubnetGroupAlreadyExistsException
-com.amazonaws.services.rds.model.DBSubnetGroupListDoesNotCoverAllAzException
-com.amazonaws.services.rds.model.DBSubnetGroupNotFoundException
-com.amazonaws.services.rds.model.DBSubnetGroupQuotaExceededException
-com.amazonaws.services.rds.model.DBSubnetQuotaExceededException
-com.amazonaws.services.rds.model.InstanceQuotaExceededException
-com.amazonaws.services.rds.model.InsufficientDBInstanceCapacityException
-com.amazonaws.services.rds.model.InvalidDBInstanceStateException
-com.amazonaws.services.rds.model.InvalidDBParameterGroupStateException
-com.amazonaws.services.rds.model.InvalidDBSecurityGroupStateException
-com.amazonaws.services.rds.model.InvalidDBSnapshotStateException
-com.amazonaws.services.rds.model.InvalidDBSubnetGroupStateException
-com.amazonaws.services.rds.model.InvalidDBSubnetStateException
-com.amazonaws.services.rds.model.InvalidOptionGroupStateException
-com.amazonaws.services.rds.model.InvalidRestoreException
-com.amazonaws.services.rds.model.InvalidSubnetException
-com.amazonaws.services.rds.model.InvalidVPCNetworkStateException
-com.amazonaws.services.rds.model.OptionGroupAlreadyExistsException
-com.amazonaws.services.rds.model.OptionGroupNotFoundException
-com.amazonaws.services.rds.model.OptionGroupQuotaExceededException
-com.amazonaws.services.rds.model.PointInTimeRestoreNotEnabledException
-com.amazonaws.services.rds.model.ReservedDBInstanceAlreadyExistsException
-com.amazonaws.services.rds.model.ReservedDBInstanceNotFoundException
-com.amazonaws.services.rds.model.ReservedDBInstanceQuotaExceededException
-com.amazonaws.services.rds.model.ReservedDBInstancesOfferingNotFoundException
-com.amazonaws.services.rds.model.SnapshotQuotaExceededException
-com.amazonaws.services.rds.model.SourceType
-com.amazonaws.services.rds.model.StorageQuotaExceededException
-com.amazonaws.services.rds.model.SubnetAlreadyInUseException
-com.amazonaws.services.route53.model.ChangeAction
-com.amazonaws.services.route53.model.ChangeStatus
-com.amazonaws.services.route53.model.DelegationSetNotAvailableException
-com.amazonaws.services.route53.model.HostedZoneAlreadyExistsException
-com.amazonaws.services.route53.model.HostedZoneNotEmptyException
-com.amazonaws.services.route53.model.InvalidChangeBatchException
-com.amazonaws.services.route53.model.InvalidDomainNameException
-com.amazonaws.services.route53.model.InvalidInputException
-com.amazonaws.services.route53.model.NoSuchChangeException
-com.amazonaws.services.route53.model.NoSuchHostedZoneException
-com.amazonaws.services.route53.model.RRType
-com.amazonaws.services.route53.model.ResourceRecordSetRegion
-com.amazonaws.services.route53.model.TooManyHostedZonesException
-com.amazonaws.services.s3.model.AccessControlList
-com.amazonaws.services.s3.model.AmazonS3Exception
-com.amazonaws.services.s3.model.CORSRule$AllowedMethods
-com.amazonaws.services.s3.model.CannedAccessControlList
-com.amazonaws.services.s3.model.CryptoStorageMode
-com.amazonaws.services.s3.model.GroupGrantee
-com.amazonaws.services.s3.model.MultiObjectDeleteException
-com.amazonaws.services.s3.model.Owner
-com.amazonaws.services.s3.model.Permission
-com.amazonaws.services.s3.model.Region
-com.amazonaws.services.s3.model.StorageClass
-com.amazonaws.services.s3.transfer.Transfer$TransferState
-com.amazonaws.services.securitytoken.model.MalformedPolicyDocumentException
-com.amazonaws.services.securitytoken.model.PackedPolicyTooLargeException
-com.amazonaws.services.simpledb.model.AttributeDoesNotExistException
-com.amazonaws.services.simpledb.model.DuplicateItemNameException
-com.amazonaws.services.simpledb.model.InvalidNextTokenException
-com.amazonaws.services.simpledb.model.InvalidNumberPredicatesException
-com.amazonaws.services.simpledb.model.InvalidNumberValueTestsException
-com.amazonaws.services.simpledb.model.InvalidParameterValueException
-com.amazonaws.services.simpledb.model.InvalidQueryExpressionException
-com.amazonaws.services.simpledb.model.MissingParameterException
-com.amazonaws.services.simpledb.model.NoSuchDomainException
-com.amazonaws.services.simpledb.model.NumberDomainAttributesExceededException
-com.amazonaws.services.simpledb.model.NumberDomainBytesExceededException
-com.amazonaws.services.simpledb.model.NumberDomainsExceededException
-com.amazonaws.services.simpledb.model.NumberItemAttributesExceededException
-com.amazonaws.services.simpledb.model.NumberSubmittedAttributesExceededException
-com.amazonaws.services.simpledb.model.NumberSubmittedItemsExceededException
-com.amazonaws.services.simpledb.model.RequestTimeoutException
-com.amazonaws.services.simpledb.model.TooManyRequestedAttributesException
-com.amazonaws.services.simpleemail.model.IdentityType
-com.amazonaws.services.simpleemail.model.MessageRejectedException
-com.amazonaws.services.simpleemail.model.NotificationType
-com.amazonaws.services.simpleemail.model.VerificationStatus
-com.amazonaws.services.simpleworkflow.flow.ActivityFailureException
-com.amazonaws.services.simpleworkflow.flow.ActivityTaskFailedException
-com.amazonaws.services.simpleworkflow.flow.ActivityTaskTimedOutException
-com.amazonaws.services.simpleworkflow.flow.ChildWorkflowFailedException
-com.amazonaws.services.simpleworkflow.flow.ChildWorkflowTerminatedException
-com.amazonaws.services.simpleworkflow.flow.ChildWorkflowTimedOutException
-com.amazonaws.services.simpleworkflow.flow.DataConverterException
-com.amazonaws.services.simpleworkflow.flow.ScheduleActivityTaskFailedException
-com.amazonaws.services.simpleworkflow.flow.SignalExternalWorkflowException
-com.amazonaws.services.simpleworkflow.flow.StartChildWorkflowFailedException
-com.amazonaws.services.simpleworkflow.flow.StartTimerFailedException
-com.amazonaws.services.simpleworkflow.flow.WorkflowException
-com.amazonaws.services.simpleworkflow.flow.common.FlowValueConstraint
-com.amazonaws.services.simpleworkflow.flow.core.TryCatchFinally$State
-com.amazonaws.services.simpleworkflow.flow.worker.DecisionState
-com.amazonaws.services.simpleworkflow.flow.worker.DecisionTarget
-com.amazonaws.services.simpleworkflow.model.ActivityTaskTimeoutType
-com.amazonaws.services.simpleworkflow.model.CancelTimerFailedCause
-com.amazonaws.services.simpleworkflow.model.CancelWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.ChildPolicy
-com.amazonaws.services.simpleworkflow.model.CloseStatus
-com.amazonaws.services.simpleworkflow.model.CompleteWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.ContinueAsNewWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.DecisionTaskTimeoutType
-com.amazonaws.services.simpleworkflow.model.DecisionType
-com.amazonaws.services.simpleworkflow.model.DefaultUndefinedException
-com.amazonaws.services.simpleworkflow.model.DomainAlreadyExistsException
-com.amazonaws.services.simpleworkflow.model.DomainDeprecatedException
-com.amazonaws.services.simpleworkflow.model.EventType
-com.amazonaws.services.simpleworkflow.model.ExecutionStatus
-com.amazonaws.services.simpleworkflow.model.FailWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.LimitExceededException
-com.amazonaws.services.simpleworkflow.model.OperationNotPermittedException
-com.amazonaws.services.simpleworkflow.model.PredefinedDuration
-com.amazonaws.services.simpleworkflow.model.RegistrationStatus
-com.amazonaws.services.simpleworkflow.model.RequestCancelActivityTaskFailedCause
-com.amazonaws.services.simpleworkflow.model.RequestCancelExternalWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.ScheduleActivityTaskFailedCause
-com.amazonaws.services.simpleworkflow.model.SignalExternalWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.StartChildWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.StartTimerFailedCause
-com.amazonaws.services.simpleworkflow.model.TypeAlreadyExistsException
-com.amazonaws.services.simpleworkflow.model.TypeDeprecatedException
-com.amazonaws.services.simpleworkflow.model.UnknownResourceException
-com.amazonaws.services.simpleworkflow.model.WorkflowExecutionAlreadyStartedException
-com.amazonaws.services.simpleworkflow.model.WorkflowExecutionCancelRequestedCause
-com.amazonaws.services.simpleworkflow.model.WorkflowExecutionTerminatedCause
-com.amazonaws.services.simpleworkflow.model.WorkflowExecutionTimeoutType
-com.amazonaws.services.sns.model.AuthorizationErrorException
-com.amazonaws.services.sns.model.InternalErrorException
-com.amazonaws.services.sns.model.InvalidParameterException
-com.amazonaws.services.sns.model.NotFoundException
-com.amazonaws.services.sns.model.SubscriptionLimitExceededException
-com.amazonaws.services.sns.model.TopicLimitExceededException
-com.amazonaws.services.sqs.model.BatchEntryIdsNotDistinctException
-com.amazonaws.services.sqs.model.BatchRequestTooLongException
-com.amazonaws.services.sqs.model.EmptyBatchRequestException
-com.amazonaws.services.sqs.model.InvalidAttributeNameException
-com.amazonaws.services.sqs.model.InvalidBatchEntryIdException
-com.amazonaws.services.sqs.model.InvalidIdFormatException
-com.amazonaws.services.sqs.model.InvalidMessageContentsException
-com.amazonaws.services.sqs.model.MessageNotInflightException
-com.amazonaws.services.sqs.model.OverLimitException
-com.amazonaws.services.sqs.model.QueueAttributeName
-com.amazonaws.services.sqs.model.QueueDeletedRecentlyException
-com.amazonaws.services.sqs.model.QueueDoesNotExistException
-com.amazonaws.services.sqs.model.QueueNameExistsException
-com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException
-com.amazonaws.services.sqs.model.TooManyEntriesInBatchRequestException
-com.amazonaws.services.storagegateway.model.BandwidthType
-com.amazonaws.services.storagegateway.model.DiskAllocationType
-com.amazonaws.services.storagegateway.model.ErrorCode
-com.amazonaws.services.storagegateway.model.GatewayState
-com.amazonaws.services.storagegateway.model.GatewayTimezone
-com.amazonaws.services.storagegateway.model.InternalServerErrorException
-com.amazonaws.services.storagegateway.model.InvalidGatewayRequestException
-com.amazonaws.services.storagegateway.model.VolumeStatus
-com.amazonaws.services.storagegateway.model.VolumeType
-com.amazonaws.util.AWSRequestMetrics$Field
-com.amazonaws.util.json.JSONException
-com.beust.jcommander.MissingCommandException
-com.beust.jcommander.ParameterException
-com.enterprisedt.BaseIOException
-com.enterprisedt.net.ftp.FTPException
-com.enterprisedt.net.ftp.FTPTransferCancelledException
-com.google.common.base.Absent
-com.google.common.base.AbstractIterator$State
-com.google.common.base.CaseFormat$1
-com.google.common.base.CaseFormat$2
-com.google.common.base.CaseFormat$3
-com.google.common.base.CaseFormat$4
-com.google.common.base.CaseFormat$5
-com.google.common.base.Enums$ValueOfFunction
-com.google.common.base.Equivalence$Equals
-com.google.common.base.Equivalence$EquivalentToPredicate
-com.google.common.base.Equivalence$Identity
-com.google.common.base.Equivalence$Wrapper
-com.google.common.base.FunctionalEquivalence
-com.google.common.base.Functions$ConstantFunction
-com.google.common.base.Functions$ForMapWithDefault
-com.google.common.base.Functions$FunctionComposition
-com.google.common.base.Functions$FunctionForMapNoDefault
-com.google.common.base.Functions$IdentityFunction
-com.google.common.base.Functions$PredicateFunction
-com.google.common.base.Functions$SupplierFunction
-com.google.common.base.Functions$ToStringFunction
-com.google.common.base.PairwiseEquivalence
-com.google.common.base.Predicates$AndPredicate
-com.google.common.base.Predicates$AssignableFromPredicate
-com.google.common.base.Predicates$CompositionPredicate
-com.google.common.base.Predicates$ContainsPatternPredicate
-com.google.common.base.Predicates$InPredicate
-com.google.common.base.Predicates$InstanceOfPredicate
-com.google.common.base.Predicates$IsEqualToPredicate
-com.google.common.base.Predicates$NotPredicate
-com.google.common.base.Predicates$ObjectPredicate$1
-com.google.common.base.Predicates$ObjectPredicate$2
-com.google.common.base.Predicates$ObjectPredicate$3
-com.google.common.base.Predicates$ObjectPredicate$4
-com.google.common.base.Predicates$OrPredicate
-com.google.common.base.Present
-com.google.common.base.Suppliers$ExpiringMemoizingSupplier
-com.google.common.base.Suppliers$MemoizingSupplier
-com.google.common.base.Suppliers$SupplierComposition
-com.google.common.base.Suppliers$SupplierFunction
-com.google.common.base.Suppliers$SupplierOfInstance
-com.google.common.base.Suppliers$ThreadSafeSupplier
-com.google.common.base.internal.Finalizer$ShutDown
-com.google.common.cache.CacheBuilder$NullListener
-com.google.common.cache.CacheBuilder$OneWeigher
-com.google.common.cache.CacheLoader$FunctionToCacheLoader
-com.google.common.cache.CacheLoader$InvalidCacheLoadException
-com.google.common.cache.CacheLoader$SupplierToCacheLoader
-com.google.common.cache.CacheLoader$UnsupportedLoadingOperationException
-com.google.common.cache.LocalCache$EntryFactory$1
-com.google.common.cache.LocalCache$EntryFactory$2
-com.google.common.cache.LocalCache$EntryFactory$3
-com.google.common.cache.LocalCache$EntryFactory$4
-com.google.common.cache.LocalCache$EntryFactory$5
-com.google.common.cache.LocalCache$EntryFactory$6
-com.google.common.cache.LocalCache$EntryFactory$7
-com.google.common.cache.LocalCache$EntryFactory$8
-com.google.common.cache.LocalCache$LoadingSerializationProxy
-com.google.common.cache.LocalCache$LocalLoadingCache
-com.google.common.cache.LocalCache$LocalManualCache
-com.google.common.cache.LocalCache$ManualSerializationProxy
-com.google.common.cache.LocalCache$NullEntry
-com.google.common.cache.LocalCache$Segment
-com.google.common.cache.LocalCache$Strength$1
-com.google.common.cache.LocalCache$Strength$2
-com.google.common.cache.LocalCache$Strength$3
-com.google.common.cache.LongAddables$PureJavaLongAddable
-com.google.common.cache.LongAdder
-com.google.common.cache.RemovalCause$1
-com.google.common.cache.RemovalCause$2
-com.google.common.cache.RemovalCause$3
-com.google.common.cache.RemovalCause$4
-com.google.common.cache.RemovalCause$5
-com.google.common.collect.AbstractBiMap$Inverse
-com.google.common.collect.AbstractIterator$State
-com.google.common.collect.AllEqualOrdering
-com.google.common.collect.ArrayListMultimap
-com.google.common.collect.ArrayTable
-com.google.common.collect.BoundType$1
-com.google.common.collect.BoundType$2
-com.google.common.collect.ByFunctionOrdering
-com.google.common.collect.CartesianList$1
-com.google.common.collect.ComparatorOrdering
-com.google.common.collect.CompoundOrdering
-com.google.common.collect.ComputationException
-com.google.common.collect.ComputingConcurrentHashMap
-com.google.common.collect.ComputingConcurrentHashMap$ComputingSegment
-com.google.common.collect.ComputingConcurrentHashMap$ComputingSerializationProxy
-com.google.common.collect.ConcurrentHashMultiset
-com.google.common.collect.Constraints$NotNullConstraint
-com.google.common.collect.Count
-com.google.common.collect.Cut$AboveAll
-com.google.common.collect.Cut$AboveValue
-com.google.common.collect.Cut$BelowAll
-com.google.common.collect.Cut$BelowValue
-com.google.common.collect.DescendingImmutableSortedMultiset
-com.google.common.collect.DescendingImmutableSortedMultiset$1
-com.google.common.collect.DescendingImmutableSortedSet
-com.google.common.collect.DiscreteDomain$BigIntegerDomain
-com.google.common.collect.DiscreteDomain$IntegerDomain
-com.google.common.collect.DiscreteDomain$LongDomain
-com.google.common.collect.EmptyContiguousSet
-com.google.common.collect.EmptyContiguousSet$SerializedForm
-com.google.common.collect.EmptyImmutableBiMap
-com.google.common.collect.EmptyImmutableList
-com.google.common.collect.EmptyImmutableListMultimap
-com.google.common.collect.EmptyImmutableMultiset
-com.google.common.collect.EmptyImmutableSet
-com.google.common.collect.EmptyImmutableSetMultimap
-com.google.common.collect.EmptyImmutableSortedMap
-com.google.common.collect.EmptyImmutableSortedMultiset
-com.google.common.collect.EmptyImmutableSortedSet
-com.google.common.collect.EnumBiMap
-com.google.common.collect.EnumHashBiMap
-com.google.common.collect.EnumMultiset
-com.google.common.collect.ExplicitOrdering
-com.google.common.collect.GeneralRange
-com.google.common.collect.GenericMapMaker$NullListener
-com.google.common.collect.HashBasedTable
-com.google.common.collect.HashBasedTable$Factory
-com.google.common.collect.HashBiMap
-com.google.common.collect.HashBiMap$Inverse
-com.google.common.collect.HashBiMap$InverseSerializedForm
-com.google.common.collect.HashMultimap
-com.google.common.collect.HashMultiset
-com.google.common.collect.ImmutableAsList$SerializedForm
-com.google.common.collect.ImmutableBiMap$SerializedForm
-com.google.common.collect.ImmutableCollection$ArrayImmutableCollection
-com.google.common.collect.ImmutableCollection$EmptyImmutableCollection
-com.google.common.collect.ImmutableCollection$SerializedForm
-com.google.common.collect.ImmutableEntry
-com.google.common.collect.ImmutableEnumMap
-com.google.common.collect.ImmutableEnumMap$1
-com.google.common.collect.ImmutableEnumMap$2
-com.google.common.collect.ImmutableEnumMap$EnumSerializedForm
-com.google.common.collect.ImmutableEnumSet
-com.google.common.collect.ImmutableEnumSet$EnumSerializedForm
-com.google.common.collect.ImmutableList$ReverseImmutableList
-com.google.common.collect.ImmutableList$SerializedForm
-com.google.common.collect.ImmutableList$SubList
-com.google.common.collect.ImmutableListMultimap
-com.google.common.collect.ImmutableMap$1MapViewOfValuesAsSingletonSets
-com.google.common.collect.ImmutableMap$1MapViewOfValuesAsSingletonSets$1
-com.google.common.collect.ImmutableMap$SerializedForm
-com.google.common.collect.ImmutableMapEntrySet$EntrySetSerializedForm
-com.google.common.collect.ImmutableMapKeySet
-com.google.common.collect.ImmutableMapKeySet$1
-com.google.common.collect.ImmutableMapKeySet$KeySetSerializedForm
-com.google.common.collect.ImmutableMapValues
-com.google.common.collect.ImmutableMapValues$1
-com.google.common.collect.ImmutableMapValues$SerializedForm
-com.google.common.collect.ImmutableMultimap$BuilderMultimap
-com.google.common.collect.ImmutableMultimap$EntryCollection
-com.google.common.collect.ImmutableMultimap$Keys
-com.google.common.collect.ImmutableMultimap$Keys$KeysEntrySet
-com.google.common.collect.ImmutableMultimap$Keys$KeysEntrySet$1
-com.google.common.collect.ImmutableMultimap$Values
-com.google.common.collect.ImmutableMultiset$EntrySetSerializedForm
-com.google.common.collect.ImmutableMultiset$SerializedForm
-com.google.common.collect.ImmutableRangeMap$1
-com.google.common.collect.ImmutableRangeSet
-com.google.common.collect.ImmutableRangeSet$1
-com.google.common.collect.ImmutableRangeSet$AsSet
-com.google.common.collect.ImmutableRangeSet$AsSetSerializedForm
-com.google.common.collect.ImmutableRangeSet$ComplementRanges
-com.google.common.collect.ImmutableRangeSet$SerializedForm
-com.google.common.collect.ImmutableSet$SerializedForm
-com.google.common.collect.ImmutableSetMultimap
-com.google.common.collect.ImmutableSetMultimap$BuilderMultimap
-com.google.common.collect.ImmutableSortedAsList
-com.google.common.collect.ImmutableSortedMap$SerializedForm
-com.google.common.collect.ImmutableSortedMultiset$SerializedForm
-com.google.common.collect.ImmutableSortedSet$SerializedForm
-com.google.common.collect.Interners$WeakInterner$Dummy
-com.google.common.collect.LexicographicalOrdering
-com.google.common.collect.LinkedHashMultimap
-com.google.common.collect.LinkedHashMultiset
-com.google.common.collect.LinkedListMultimap
-com.google.common.collect.Lists$OnePlusArrayList
-com.google.common.collect.Lists$StringAsImmutableList
-com.google.common.collect.Lists$TransformingRandomAccessList
-com.google.common.collect.Lists$TransformingSequentialList
-com.google.common.collect.Lists$TwoPlusArrayList
-com.google.common.collect.MapConstraints$ConstrainedListMultimap
-com.google.common.collect.MapConstraints$ConstrainedMultimap
-com.google.common.collect.MapConstraints$ConstrainedSetMultimap
-com.google.common.collect.MapConstraints$ConstrainedSortedSetMultimap
-com.google.common.collect.MapConstraints$NotNullMapConstraint
-com.google.common.collect.MapMaker$ComputingMapAdapter
-com.google.common.collect.MapMaker$NullComputingConcurrentMap
-com.google.common.collect.MapMaker$NullConcurrentMap
-com.google.common.collect.MapMaker$RemovalCause$1
-com.google.common.collect.MapMaker$RemovalCause$2
-com.google.common.collect.MapMaker$RemovalCause$3
-com.google.common.collect.MapMaker$RemovalCause$4
-com.google.common.collect.MapMaker$RemovalCause$5
-com.google.common.collect.MapMaker$RemovalNotification
-com.google.common.collect.MapMakerInternalMap
-com.google.common.collect.MapMakerInternalMap$EntryFactory$1
-com.google.common.collect.MapMakerInternalMap$EntryFactory$2
-com.google.common.collect.MapMakerInternalMap$EntryFactory$3
-com.google.common.collect.MapMakerInternalMap$EntryFactory$4
-com.google.common.collect.MapMakerInternalMap$EntryFactory$5
-com.google.common.collect.MapMakerInternalMap$EntryFactory$6
-com.google.common.collect.MapMakerInternalMap$EntryFactory$7
-com.google.common.collect.MapMakerInternalMap$EntryFactory$8
-com.google.common.collect.MapMakerInternalMap$NullEntry
-com.google.common.collect.MapMakerInternalMap$Segment
-com.google.common.collect.MapMakerInternalMap$SerializationProxy
-com.google.common.collect.MapMakerInternalMap$Strength$1
-com.google.common.collect.MapMakerInternalMap$Strength$2
-com.google.common.collect.MapMakerInternalMap$Strength$3
-com.google.common.collect.Maps$EntryFunction$1
-com.google.common.collect.Maps$EntryFunction$2
-com.google.common.collect.Maps$UnmodifiableBiMap
-com.google.common.collect.Maps$UnmodifiableNavigableMap
-com.google.common.collect.Multimaps$CustomListMultimap
-com.google.common.collect.Multimaps$CustomMultimap
-com.google.common.collect.Multimaps$CustomSetMultimap
-com.google.common.collect.Multimaps$CustomSortedSetMultimap
-com.google.common.collect.Multimaps$MapMultimap
-com.google.common.collect.Multimaps$UnmodifiableListMultimap
-com.google.common.collect.Multimaps$UnmodifiableMultimap
-com.google.common.collect.Multimaps$UnmodifiableSetMultimap
-com.google.common.collect.Multimaps$UnmodifiableSortedSetMultimap
-com.google.common.collect.Multisets$ImmutableEntry
-com.google.common.collect.Multisets$UnmodifiableMultiset
-com.google.common.collect.NaturalOrdering
-com.google.common.collect.NullsFirstOrdering
-com.google.common.collect.NullsLastOrdering
-com.google.common.collect.Ordering$IncomparableValueException
-com.google.common.collect.Range
-com.google.common.collect.RegularContiguousSet
-com.google.common.collect.RegularContiguousSet$SerializedForm
-com.google.common.collect.RegularImmutableAsList
-com.google.common.collect.RegularImmutableBiMap
-com.google.common.collect.RegularImmutableBiMap$1
-com.google.common.collect.RegularImmutableBiMap$BiMapEntry
-com.google.common.collect.RegularImmutableBiMap$Inverse
-com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet
-com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1
-com.google.common.collect.RegularImmutableBiMap$InverseSerializedForm
-com.google.common.collect.RegularImmutableBiMap$NonTerminalBiMapEntry
-com.google.common.collect.RegularImmutableList
-com.google.common.collect.RegularImmutableMap
-com.google.common.collect.RegularImmutableMap$EntrySet
-com.google.common.collect.RegularImmutableMap$NonTerminalEntry
-com.google.common.collect.RegularImmutableMap$TerminalEntry
-com.google.common.collect.RegularImmutableMultiset
-com.google.common.collect.RegularImmutableMultiset$EntrySet
-com.google.common.collect.RegularImmutableMultiset$EntrySet$1
-com.google.common.collect.RegularImmutableSet
-com.google.common.collect.RegularImmutableSortedMap
-com.google.common.collect.RegularImmutableSortedMap$EntrySet
-com.google.common.collect.RegularImmutableSortedMap$EntrySet$1
-com.google.common.collect.RegularImmutableSortedMultiset
-com.google.common.collect.RegularImmutableSortedMultiset$EntrySet
-com.google.common.collect.RegularImmutableSortedMultiset$EntrySet$1
-com.google.common.collect.RegularImmutableSortedSet
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$1
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$Column
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$ColumnMap
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$DenseCellSet
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$DenseCellSet$1
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$Row
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$RowMap
-com.google.common.collect.RegularImmutableTable$ImmutableArrayMap$1
-com.google.common.collect.RegularImmutableTable$ImmutableArrayMap$2
-com.google.common.collect.RegularImmutableTable$SparseImmutableTable$1
-com.google.common.collect.RegularImmutableTable$SparseImmutableTable$SparseCellSet
-com.google.common.collect.RegularImmutableTable$SparseImmutableTable$SparseCellSet$1
-com.google.common.collect.ReverseNaturalOrdering
-com.google.common.collect.ReverseOrdering
-com.google.common.collect.Sets$CartesianSet$1
-com.google.common.collect.Sets$SetFromMap
-com.google.common.collect.Sets$UnmodifiableNavigableSet
-com.google.common.collect.SingletonImmutableBiMap
-com.google.common.collect.SingletonImmutableList
-com.google.common.collect.SingletonImmutableSet
-com.google.common.collect.SortedLists$KeyAbsentBehavior$1
-com.google.common.collect.SortedLists$KeyAbsentBehavior$2
-com.google.common.collect.SortedLists$KeyAbsentBehavior$3
-com.google.common.collect.SortedLists$KeyPresentBehavior$1
-com.google.common.collect.SortedLists$KeyPresentBehavior$2
-com.google.common.collect.SortedLists$KeyPresentBehavior$3
-com.google.common.collect.SortedLists$KeyPresentBehavior$4
-com.google.common.collect.SortedLists$KeyPresentBehavior$5
-com.google.common.collect.StandardRowSortedTable
-com.google.common.collect.StandardTable
-com.google.common.collect.Synchronized$SynchronizedAsMap
-com.google.common.collect.Synchronized$SynchronizedAsMapEntries
-com.google.common.collect.Synchronized$SynchronizedAsMapValues
-com.google.common.collect.Synchronized$SynchronizedBiMap
-com.google.common.collect.Synchronized$SynchronizedCollection
-com.google.common.collect.Synchronized$SynchronizedEntry
-com.google.common.collect.Synchronized$SynchronizedList
-com.google.common.collect.Synchronized$SynchronizedListMultimap
-com.google.common.collect.Synchronized$SynchronizedMap
-com.google.common.collect.Synchronized$SynchronizedMultimap
-com.google.common.collect.Synchronized$SynchronizedMultiset
-com.google.common.collect.Synchronized$SynchronizedNavigableMap
-com.google.common.collect.Synchronized$SynchronizedNavigableSet
-com.google.common.collect.Synchronized$SynchronizedObject
-com.google.common.collect.Synchronized$SynchronizedQueue
-com.google.common.collect.Synchronized$SynchronizedRandomAccessList
-com.google.common.collect.Synchronized$SynchronizedSet
-com.google.common.collect.Synchronized$SynchronizedSetMultimap
-com.google.common.collect.Synchronized$SynchronizedSortedMap
-com.google.common.collect.Synchronized$SynchronizedSortedSet
-com.google.common.collect.Synchronized$SynchronizedSortedSetMultimap
-com.google.common.collect.Tables$ImmutableCell
-com.google.common.collect.Tables$UnmodifiableRowSortedMap
-com.google.common.collect.Tables$UnmodifiableTable
-com.google.common.collect.TreeBasedTable
-com.google.common.collect.TreeBasedTable$Factory
-com.google.common.collect.TreeMultimap
-com.google.common.collect.TreeMultiset
-com.google.common.collect.TreeMultiset$Aggregate$1
-com.google.common.collect.TreeMultiset$Aggregate$2
-com.google.common.collect.UnmodifiableSortedMultiset
-com.google.common.collect.UsingToStringOrdering
-com.google.common.hash.BloomFilter
-com.google.common.hash.BloomFilter$SerialForm
-com.google.common.hash.BloomFilterStrategies$1
-com.google.common.hash.ChecksumHashFunction
-com.google.common.hash.Funnels$ByteArrayFunnel
-com.google.common.hash.Funnels$IntegerFunnel
-com.google.common.hash.Funnels$LongFunnel
-com.google.common.hash.Funnels$StringFunnel
-com.google.common.hash.HashCodes$BytesHashCode
-com.google.common.hash.HashCodes$IntHashCode
-com.google.common.hash.HashCodes$LongHashCode
-com.google.common.hash.Hashing$ChecksumType$1
-com.google.common.hash.Hashing$ChecksumType$2
-com.google.common.hash.MessageDigestHashFunction
-com.google.common.hash.MessageDigestHashFunction$SerializedForm
-com.google.common.hash.Murmur3_128HashFunction
-com.google.common.hash.Murmur3_32HashFunction
-com.google.common.io.FileWriteMode
-com.google.common.net.HostAndPort
-com.google.common.primitives.Booleans$BooleanArrayAsList
-com.google.common.primitives.Booleans$LexicographicalComparator
-com.google.common.primitives.Bytes$ByteArrayAsList
-com.google.common.primitives.Chars$CharArrayAsList
-com.google.common.primitives.Chars$LexicographicalComparator
-com.google.common.primitives.Doubles$DoubleArrayAsList
-com.google.common.primitives.Doubles$LexicographicalComparator
-com.google.common.primitives.Floats$FloatArrayAsList
-com.google.common.primitives.Floats$LexicographicalComparator
-com.google.common.primitives.Ints$IntArrayAsList
-com.google.common.primitives.Ints$LexicographicalComparator
-com.google.common.primitives.Longs$LexicographicalComparator
-com.google.common.primitives.Longs$LongArrayAsList
-com.google.common.primitives.Shorts$LexicographicalComparator
-com.google.common.primitives.Shorts$ShortArrayAsList
-com.google.common.primitives.SignedBytes$LexicographicalComparator
-com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$PureJavaComparator
-com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator
-com.google.common.primitives.UnsignedInteger
-com.google.common.primitives.UnsignedInts$LexicographicalComparator
-com.google.common.primitives.UnsignedLong
-com.google.common.primitives.UnsignedLongs$LexicographicalComparator
-com.google.common.reflect.TypeToken$ClassSet
-com.google.common.reflect.TypeToken$InterfaceSet
-com.google.common.reflect.TypeToken$SimpleTypeToken
-com.google.common.reflect.TypeToken$TypeFilter$1
-com.google.common.reflect.TypeToken$TypeFilter$2
-com.google.common.reflect.TypeToken$TypeSet
-com.google.common.reflect.Types$ClassOwnership$1
-com.google.common.reflect.Types$ClassOwnership$2
-com.google.common.reflect.Types$GenericArrayTypeImpl
-com.google.common.reflect.Types$JavaVersion$2
-com.google.common.reflect.Types$JavaVersion$3
-com.google.common.reflect.Types$ParameterizedTypeImpl
-com.google.common.reflect.Types$WildcardTypeImpl
-com.google.common.util.concurrent.AbstractFuture$Sync
-com.google.common.util.concurrent.AtomicDouble
-com.google.common.util.concurrent.AtomicDoubleArray
-com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantLock
-com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantReadLock
-com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantReadWriteLock
-com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantWriteLock
-com.google.common.util.concurrent.CycleDetectingLockFactory$ExampleStackTrace
-com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$1
-com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$2
-com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$3
-com.google.common.util.concurrent.CycleDetectingLockFactory$PotentialDeadlockException
-com.google.common.util.concurrent.ExecutionError
-com.google.common.util.concurrent.Service$State
-com.google.common.util.concurrent.Striped$PaddedLock
-com.google.common.util.concurrent.Striped$PaddedSemaphore
-com.google.common.util.concurrent.UncheckedExecutionException
-com.google.common.util.concurrent.UncheckedTimeoutException
-com.google.protobuf.CodedOutputStream$OutOfSpaceException
-com.google.protobuf.DescriptorProtos$DescriptorProto
-com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange
-com.google.protobuf.DescriptorProtos$EnumDescriptorProto
-com.google.protobuf.DescriptorProtos$EnumOptions
-com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto
-com.google.protobuf.DescriptorProtos$EnumValueOptions
-com.google.protobuf.DescriptorProtos$FieldDescriptorProto
-com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label
-com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type
-com.google.protobuf.DescriptorProtos$FieldOptions
-com.google.protobuf.DescriptorProtos$FieldOptions$CType
-com.google.protobuf.DescriptorProtos$FileDescriptorProto
-com.google.protobuf.DescriptorProtos$FileDescriptorSet
-com.google.protobuf.DescriptorProtos$FileOptions
-com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode
-com.google.protobuf.DescriptorProtos$MessageOptions
-com.google.protobuf.DescriptorProtos$MethodDescriptorProto
-com.google.protobuf.DescriptorProtos$MethodOptions
-com.google.protobuf.DescriptorProtos$ServiceDescriptorProto
-com.google.protobuf.DescriptorProtos$ServiceOptions
-com.google.protobuf.DescriptorProtos$SourceCodeInfo
-com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location
-com.google.protobuf.DescriptorProtos$UninterpretedOption
-com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart
-com.google.protobuf.Descriptors$DescriptorValidationException
-com.google.protobuf.Descriptors$FieldDescriptor$JavaType
-com.google.protobuf.Descriptors$FieldDescriptor$Type
-com.google.protobuf.GeneratedMessageLite$SerializedForm
-com.google.protobuf.InvalidProtocolBufferException
-com.google.protobuf.RpcUtil$AlreadyCalledException
-com.google.protobuf.ServiceException
-com.google.protobuf.TextFormat$InvalidEscapeSequenceException
-com.google.protobuf.TextFormat$ParseException
-com.google.protobuf.UninitializedMessageException
-com.google.protobuf.WireFormat$FieldType
-com.google.protobuf.WireFormat$FieldType$1
-com.google.protobuf.WireFormat$FieldType$2
-com.google.protobuf.WireFormat$FieldType$3
-com.google.protobuf.WireFormat$FieldType$4
-com.google.protobuf.WireFormat$JavaType
-com.jcraft.jsch.ChannelSftp$RequestQueue$OutOfOrderException
-com.jcraft.jsch.JSchAuthCancelException
-com.jcraft.jsch.JSchException
-com.jcraft.jsch.JSchPartialAuthException
-com.jcraft.jsch.SftpException
-com.jidesoft.alert.Alert
-com.jidesoft.alert.InputPopup
-com.jidesoft.animation.CustomAnimation
-com.jidesoft.animation.CustomAnimation$n_
-com.jidesoft.awt.geom.Insets2D$Double
-com.jidesoft.awt.geom.Insets2D$Float
-com.jidesoft.chart.AboveBoundsException
-com.jidesoft.chart.BarLabelPlacement
-com.jidesoft.chart.BarResizePolicy
-com.jidesoft.chart.BelowBoundsException
-com.jidesoft.chart.Chart
-com.jidesoft.chart.ChartBoundsException
-com.jidesoft.chart.ChartException
-com.jidesoft.chart.ChartType
-com.jidesoft.chart.LabelPlacement
-com.jidesoft.chart.Legend
-com.jidesoft.chart.Legend$d_
-com.jidesoft.chart.Legend$e_
-com.jidesoft.chart.Meter
-com.jidesoft.chart.Orientation
-com.jidesoft.chart.PointShape
-com.jidesoft.chart.ShadowVisibility
-com.jidesoft.chart.a
-com.jidesoft.chart.annotation.Rotation
-com.jidesoft.chart.axis.AxisComponent
-com.jidesoft.chart.axis.AxisPlacement
-com.jidesoft.chart.axis.AxisQuantity
-com.jidesoft.chart.axis.AxisType
-com.jidesoft.chart.event.AxisZoomController
-com.jidesoft.chart.event.AxisZoomController$b_
-com.jidesoft.chart.event.ChartValueReporter
-com.jidesoft.chart.event.DirectionZoomEvent
-com.jidesoft.chart.event.ImageChangeEvent
-com.jidesoft.chart.event.PanEvent
-com.jidesoft.chart.event.PanIndicator$Placement
-com.jidesoft.chart.event.PointSelectionEvent
-com.jidesoft.chart.event.RectangleSelectionEvent
-com.jidesoft.chart.event.ZoomDirection
-com.jidesoft.chart.event.ZoomLocation
-com.jidesoft.chart.event.ZoomOrientation
-com.jidesoft.chart.l
-com.jidesoft.chart.model.ChartModelChangeEvent
-com.jidesoft.chart.model.ChartModelChangeType
-com.jidesoft.chart.model.ChartableTableModel
-com.jidesoft.chart.preference.ChartPreferencePanel
-com.jidesoft.chart.preference.LineWidthChooser
-com.jidesoft.chart.preference.PointShapeChooser
-com.jidesoft.chart.preference.PointShapeLabel
-com.jidesoft.chart.preference.PointSizeChooser
-com.jidesoft.chart.render.CandlestickChartType
-com.jidesoft.chart.render.ZAlignment
-com.jidesoft.chart.render.a
-com.jidesoft.chart.servlet.ChartServlet
-com.jidesoft.chart.servlet.ComponentServlet
-com.jidesoft.chart.servlet.JButtonServlet
-com.jidesoft.chart.util.Rotation
-com.jidesoft.combobox.AbstractComboBox$6
-com.jidesoft.combobox.AbstractComboBox$7
-com.jidesoft.combobox.AbstractComboBox$8
-com.jidesoft.combobox.AbstractComboBox$9
-com.jidesoft.combobox.AbstractComboBox$AccessibleJComboBox
-com.jidesoft.combobox.AbstractComboBox$ComboBoxSpinner
-com.jidesoft.combobox.AbstractComboBox$ComboBoxTextField
-com.jidesoft.combobox.AbstractComboBox$DefaultRendererComponent
-com.jidesoft.combobox.AbstractComboBox$DefaultTextFieldEditorComponent
-com.jidesoft.combobox.AbstractComboBox$EditorComponent$0
-com.jidesoft.combobox.AbstractComboBox$EditorComponent$1
-com.jidesoft.combobox.AbstractComboBox$EnterLazyDelegateAction
-com.jidesoft.combobox.AbstractComboBox$LazyDelegateAction
-com.jidesoft.combobox.AbstractComboBox$SpinnerEditorComponent
-com.jidesoft.combobox.AbstractComboBox$a_
-com.jidesoft.combobox.AbstractComboBox$a_$2
-com.jidesoft.combobox.AbstractComboBox$a_$3
-com.jidesoft.combobox.AbstractComboBox$a_$4
-com.jidesoft.combobox.CalculatorComboBox
-com.jidesoft.combobox.CalculatorComboBox$4
-com.jidesoft.combobox.CalculatorComboBox$4$0
-com.jidesoft.combobox.CalculatorComboBox$5
-com.jidesoft.combobox.CalculatorComboBox$5$0
-com.jidesoft.combobox.CalculatorComboBox$6
-com.jidesoft.combobox.CalculatorComboBox$a_
-com.jidesoft.combobox.CalculatorPopupPanel
-com.jidesoft.combobox.CalendarViewer
-com.jidesoft.combobox.CheckBoxListChooserPanel
-com.jidesoft.combobox.CheckBoxListChooserPanel$CheckBoxListWithResourceProvider
-com.jidesoft.combobox.CheckBoxListComboBox
-com.jidesoft.combobox.CheckBoxListComboBox$1
-com.jidesoft.combobox.CheckBoxListExComboBox
-com.jidesoft.combobox.CheckBoxListExComboBox$1
-com.jidesoft.combobox.CheckBoxTreeChooserPanel
-com.jidesoft.combobox.CheckBoxTreeChooserPanel$0
-com.jidesoft.combobox.CheckBoxTreeChooserPanel$d_
-com.jidesoft.combobox.CheckBoxTreeExComboBox
-com.jidesoft.combobox.CheckBoxTreeExComboBox$0
-com.jidesoft.combobox.ColorChooserPanel
-com.jidesoft.combobox.ColorChooserPanel$0
-com.jidesoft.combobox.ColorChooserPanel$10
-com.jidesoft.combobox.ColorChooserPanel$4
-com.jidesoft.combobox.ColorChooserPanel$5
-com.jidesoft.combobox.ColorChooserPanel$6
-com.jidesoft.combobox.ColorChooserPanel$7
-com.jidesoft.combobox.ColorChooserPanel$8
-com.jidesoft.combobox.ColorChooserPanel$9
-com.jidesoft.combobox.ColorChooserPanel$ColorButton
-com.jidesoft.combobox.ColorChooserPanel$b_
-com.jidesoft.combobox.ColorComboBox
-com.jidesoft.combobox.ColorComboBox$ColorEditorComponent
-com.jidesoft.combobox.ColorComboBox$ColorLabel
-com.jidesoft.combobox.ColorComboBox$ColorRendererComponent
-com.jidesoft.combobox.ColorExComboBox
-com.jidesoft.combobox.DateChooserPanel
-com.jidesoft.combobox.DateChooserPanel$0
-com.jidesoft.combobox.DateChooserPanel$1
-com.jidesoft.combobox.DateChooserPanel$16
-com.jidesoft.combobox.DateChooserPanel$17
-com.jidesoft.combobox.DateChooserPanel$18
-com.jidesoft.combobox.DateChooserPanel$19
-com.jidesoft.combobox.DateChooserPanel$2
-com.jidesoft.combobox.DateChooserPanel$20
-com.jidesoft.combobox.DateChooserPanel$21
-com.jidesoft.combobox.DateChooserPanel$22
-com.jidesoft.combobox.DateChooserPanel$23
-com.jidesoft.combobox.DateChooserPanel$24
-com.jidesoft.combobox.DateChooserPanel$25
-com.jidesoft.combobox.DateChooserPanel$26
-com.jidesoft.combobox.DateChooserPanel$27
-com.jidesoft.combobox.DateChooserPanel$4
-com.jidesoft.combobox.DateChooserPanel$d_
-com.jidesoft.combobox.DateComboBox
-com.jidesoft.combobox.DateComboBox$DateEditorComponent
-com.jidesoft.combobox.DateComboBox$DateRendererComponent
-com.jidesoft.combobox.DateExComboBox
-com.jidesoft.combobox.DateModelEvent
-com.jidesoft.combobox.DateSelectionEvent
-com.jidesoft.combobox.DateSpinnerComboBox
-com.jidesoft.combobox.DateSpinnerComboBox$0
-com.jidesoft.combobox.DateSpinnerComboBox$DateSpinnerEditorComponent
-com.jidesoft.combobox.DefaultComboBoxModelWrapper
-com.jidesoft.combobox.ExComboBox$0
-com.jidesoft.combobox.ExComboBox$1
-com.jidesoft.combobox.ExComboBox$2
-com.jidesoft.combobox.ExComboBox$3
-com.jidesoft.combobox.ExComboBox$LazyDelegateAction
-com.jidesoft.combobox.FileChooserComboBox
-com.jidesoft.combobox.FileChooserComboBox$0
-com.jidesoft.combobox.FileChooserComboBox$1
-com.jidesoft.combobox.FileChooserExComboBox
-com.jidesoft.combobox.FileChooserExComboBox$0
-com.jidesoft.combobox.FileChooserExComboBox$1
-com.jidesoft.combobox.FileChooserPanel
-com.jidesoft.combobox.FileNameChooserComboBox
-com.jidesoft.combobox.FileNameChooserComboBox$0
-com.jidesoft.combobox.FileNameChooserComboBox$1
-com.jidesoft.combobox.FileNameChooserExComboBox
-com.jidesoft.combobox.FileNameChooserExComboBox$0
-com.jidesoft.combobox.FileNameChooserExComboBox$1
-com.jidesoft.combobox.FileNameChooserPanel
-com.jidesoft.combobox.FilterableComboBoxModel
-com.jidesoft.combobox.FolderChooserComboBox
-com.jidesoft.combobox.FolderChooserExComboBox
-com.jidesoft.combobox.FolderChooserPanel
-com.jidesoft.combobox.FolderChooserPanel$0
-com.jidesoft.combobox.FolderNameChooserComboBox
-com.jidesoft.combobox.FolderNameChooserExComboBox
-com.jidesoft.combobox.FolderNameChooserPanel
-com.jidesoft.combobox.FontChooserPanel
-com.jidesoft.combobox.FontComboBox
-com.jidesoft.combobox.FontExComboBox
-com.jidesoft.combobox.FontListCellRenderer
-com.jidesoft.combobox.InsetsChooserPanel
-com.jidesoft.combobox.InsetsChooserPanel$1
-com.jidesoft.combobox.InsetsChooserPanel$2
-com.jidesoft.combobox.InsetsChooserPanel$d_
-com.jidesoft.combobox.InsetsComboBox
-com.jidesoft.combobox.InsetsExComboBox
-com.jidesoft.combobox.JideColorSplitButton
-com.jidesoft.combobox.JideColorSplitButton$2
-com.jidesoft.combobox.ListChooserPanel
-com.jidesoft.combobox.ListChooserPanel$2
-com.jidesoft.combobox.ListChooserPanel$Handler
-com.jidesoft.combobox.ListChooserPanel$d_
-com.jidesoft.combobox.ListComboBox
-com.jidesoft.combobox.ListComboBox$1
-com.jidesoft.combobox.ListComboBox$2
-com.jidesoft.combobox.ListComboBox$3
-com.jidesoft.combobox.ListComboBox$4
-com.jidesoft.combobox.ListComboBox$5
-com.jidesoft.combobox.ListComboBox$6
-com.jidesoft.combobox.ListComboBox$7
-com.jidesoft.combobox.ListComboBox$ListEditorComponent
-com.jidesoft.combobox.ListComboBox$ListRendererComponent
-com.jidesoft.combobox.ListExComboBox
-com.jidesoft.combobox.ListExComboBox$0
-com.jidesoft.combobox.MonthChooserPanel
-com.jidesoft.combobox.MonthChooserPanel$0
-com.jidesoft.combobox.MonthChooserPanel$1
-com.jidesoft.combobox.MonthChooserPanel$10
-com.jidesoft.combobox.MonthChooserPanel$11
-com.jidesoft.combobox.MonthChooserPanel$12
-com.jidesoft.combobox.MonthChooserPanel$4
-com.jidesoft.combobox.MonthChooserPanel$5
-com.jidesoft.combobox.MonthChooserPanel$6
-com.jidesoft.combobox.MonthChooserPanel$7
-com.jidesoft.combobox.MonthChooserPanel$8
-com.jidesoft.combobox.MonthChooserPanel$9
-com.jidesoft.combobox.MonthComboBox
-com.jidesoft.combobox.MonthExComboBox
-com.jidesoft.combobox.MultiSelectListChooserPanel
-com.jidesoft.combobox.MultiSelectListChooserPanel$2
-com.jidesoft.combobox.MultiSelectListChooserPanel$3
-com.jidesoft.combobox.MultiSelectListChooserPanel$Handler
-com.jidesoft.combobox.MultiSelectListComboBox
-com.jidesoft.combobox.MultiSelectListComboBox$1
-com.jidesoft.combobox.MultiSelectListExComboBox
-com.jidesoft.combobox.MultiSelectListExComboBox$1
-com.jidesoft.combobox.MultilineStringComboBox
-com.jidesoft.combobox.MultilineStringExComboBox
-com.jidesoft.combobox.MultilineStringPopupPanel
-com.jidesoft.combobox.NumberSpinnerComboBox$NumberSpinner
-com.jidesoft.combobox.NumberSpinnerComboBox$NumberSpinnerEditorComponent
-com.jidesoft.combobox.PopupPanel
-com.jidesoft.combobox.QuickComboBoxFilterField
-com.jidesoft.combobox.SortableComboBoxModel
-com.jidesoft.combobox.StringArrayComboBox
-com.jidesoft.combobox.StringArrayExComboBox
-com.jidesoft.combobox.StringArrayPopupPanel
-com.jidesoft.combobox.TableChooserPanel
-com.jidesoft.combobox.TableChooserPanel$3
-com.jidesoft.combobox.TableChooserPanel$c_
-com.jidesoft.combobox.TableComboBox
-com.jidesoft.combobox.TableComboBox$0
-com.jidesoft.combobox.TableComboBox$3
-com.jidesoft.combobox.TableComboBox$b_
-com.jidesoft.combobox.TableComboBox$b_$0
-com.jidesoft.combobox.TableComboBox$b_$1
-com.jidesoft.combobox.TableComboBox$c_
-com.jidesoft.combobox.TableComboBox$c_$1
-com.jidesoft.combobox.TableComboBox$c_$2
-com.jidesoft.combobox.TableExComboBox
-com.jidesoft.combobox.TableExComboBox$2
-com.jidesoft.combobox.TableExComboBox$b_
-com.jidesoft.combobox.TreeChooserPanel
-com.jidesoft.combobox.TreeChooserPanel$2
-com.jidesoft.combobox.TreeChooserPanel$3
-com.jidesoft.combobox.TreeChooserPanel$b_
-com.jidesoft.combobox.TreeComboBox
-com.jidesoft.combobox.TreeComboBox$0
-com.jidesoft.combobox.TreeComboBox$2
-com.jidesoft.combobox.TreeComboBox$b_
-com.jidesoft.combobox.TreeExComboBox
-com.jidesoft.combobox.TreeExComboBox$0
-com.jidesoft.comparator.CharSequenceComparator
-com.jidesoft.comparator.ComparableComparator
-com.jidesoft.comparator.ComparatorContext
-com.jidesoft.comparator.FastComparableComparator
-com.jidesoft.converter.ConverterContext
-com.jidesoft.converter.RegistrationEvent
-com.jidesoft.csv.CsvParseEvent
-com.jidesoft.csv.CsvParseEvent$EventType
-com.jidesoft.csv.a$a_
-com.jidesoft.dialog.BannerPanel
-com.jidesoft.dialog.BannerPanel$1
-com.jidesoft.dialog.BannerPanel$3
-com.jidesoft.dialog.ButtonEvent
-com.jidesoft.dialog.ButtonPanel
-com.jidesoft.dialog.ButtonPanelLayout
-com.jidesoft.dialog.DialogPageListCellRenderer
-com.jidesoft.dialog.DialogPageTreeCellRenderer
-com.jidesoft.dialog.JideOptionPane
-com.jidesoft.dialog.MultiplePageDialog
-com.jidesoft.dialog.MultiplePageDialog$1
-com.jidesoft.dialog.MultiplePageDialog$14
-com.jidesoft.dialog.MultiplePageDialog$16
-com.jidesoft.dialog.MultiplePageDialog$18
-com.jidesoft.dialog.MultiplePageDialog$2
-com.jidesoft.dialog.MultiplePageDialog$3
-com.jidesoft.dialog.MultiplePageDialogPane
-com.jidesoft.dialog.MultiplePageDialogPane$1
-com.jidesoft.dialog.MultiplePageDialogPane$12
-com.jidesoft.dialog.MultiplePageDialogPane$14
-com.jidesoft.dialog.MultiplePageDialogPane$16
-com.jidesoft.dialog.MutableTreeNodeEx
-com.jidesoft.dialog.PageEvent
-com.jidesoft.dialog.PageList
-com.jidesoft.dialog.ScrollableButtonPanel
-com.jidesoft.dialog.StandardDialog$2
-com.jidesoft.dialog.StandardDialog$3
-com.jidesoft.dialog.StandardDialog$DefaultStandardDialogPane
-com.jidesoft.dialog.StandardDialog$StandardDialogPropertyChangeListener$1
-com.jidesoft.dialog.StandardDialogPane$1
-com.jidesoft.dialog.StandardDialogPane$2
-com.jidesoft.document.DialogFloatingDocumentContainer
-com.jidesoft.document.DialogFloatingDocumentContainer$4
-com.jidesoft.document.DocumentComponentEvent
-com.jidesoft.document.DocumentPane
-com.jidesoft.document.DocumentPane$32
-com.jidesoft.document.DocumentPane$33
-com.jidesoft.document.DocumentPane$34
-com.jidesoft.document.FrameFloatingDocumentContainer
-com.jidesoft.document.FrameFloatingDocumentContainer$4
-com.jidesoft.document.TdiGroup
-com.jidesoft.document.a
-com.jidesoft.field.IPTextField
-com.jidesoft.field.IPTextField$a_
-com.jidesoft.field.IPTextField$b_
-com.jidesoft.field.IPTextField$c_
-com.jidesoft.field.IPTextField$d_
-com.jidesoft.field.IPTextField$e_
-com.jidesoft.field.IPTextField$k_
-com.jidesoft.field.creditcard.CreditCardTextField
-com.jidesoft.filter.AllFilter
-com.jidesoft.filter.AndFilter
-com.jidesoft.filter.BetweenFilter
-com.jidesoft.filter.CustomFilterEditor
-com.jidesoft.filter.CustomFilterEditor$3
-com.jidesoft.filter.EmptyFilter
-com.jidesoft.filter.EqualFilter
-com.jidesoft.filter.GreaterOrEqualFilter
-com.jidesoft.filter.GreaterThanFilter
-com.jidesoft.filter.InFilter
-com.jidesoft.filter.LastMonthFilter
-com.jidesoft.filter.LastQuarterFilter
-com.jidesoft.filter.LastWeekFilter
-com.jidesoft.filter.LastYearFilter
-com.jidesoft.filter.LessOrEqualFilter
-com.jidesoft.filter.LessThanFilter
-com.jidesoft.filter.LikeFilter
-com.jidesoft.filter.LikeFilter$0
-com.jidesoft.filter.MonthFilter
-com.jidesoft.filter.NextMonthFilter
-com.jidesoft.filter.NextQuarterFilter
-com.jidesoft.filter.NextWeekFilter
-com.jidesoft.filter.NextYearFilter
-com.jidesoft.filter.NoneFilter
-com.jidesoft.filter.NotBetweenFilter
-com.jidesoft.filter.NotEqualFilter
-com.jidesoft.filter.NotFilter
-com.jidesoft.filter.NotInFilter
-com.jidesoft.filter.NotLikeFilter
-com.jidesoft.filter.OrFilter
-com.jidesoft.filter.QuarterFilter
-com.jidesoft.filter.RegexFilter
-com.jidesoft.filter.ThisMonthFilter
-com.jidesoft.filter.ThisQuarterFilter
-com.jidesoft.filter.ThisWeekFilter
-com.jidesoft.filter.ThisYearFilter
-com.jidesoft.filter.TodayFilter
-com.jidesoft.filter.TomorrowFilter
-com.jidesoft.filter.ValueEditor
-com.jidesoft.filter.ValueEditor$2
-com.jidesoft.filter.WildcardFilter
-com.jidesoft.filter.YearFilter
-com.jidesoft.filter.YesterdayFilter
-com.jidesoft.gauge.Bullet
-com.jidesoft.gauge.BulletAxisPlacement
-com.jidesoft.gauge.BulletIndicatorLegendItem
-com.jidesoft.gauge.BulletIntervalMarkerLegendItem
-com.jidesoft.gauge.BulletLabel
-com.jidesoft.gauge.Clock
-com.jidesoft.gauge.Dial
-com.jidesoft.gauge.DialIntervalMarkerLegendItem
-com.jidesoft.gauge.DialLabelOrientation
-com.jidesoft.gauge.GaugeModelEvent
-com.jidesoft.gauge.LineLabelPlacement
-com.jidesoft.gauge.MarkerShape
-com.jidesoft.gauge.NeedleEndShape
-com.jidesoft.gauge.NeedleLegendItem
-com.jidesoft.gauge.PointerIndicatorPlacement
-com.jidesoft.gauge.PointerLabelPlacement
-com.jidesoft.grid.AutoFilterBox
-com.jidesoft.grid.AutoFilterBox$10
-com.jidesoft.grid.AutoFilterBox$7
-com.jidesoft.grid.AutoFilterBox$9
-com.jidesoft.grid.AutoFilterBox$AutoFilterBoxFilterField
-com.jidesoft.grid.AutoFilterBox$AutoFilterBoxFilterField$a_
-com.jidesoft.grid.AutoFilterTableHeader
-com.jidesoft.grid.AutoFilterTableHeader$0
-com.jidesoft.grid.AutoFilterTableHeader$1
-com.jidesoft.grid.AutoFilterTableHeaderEditor
-com.jidesoft.grid.AutoFilterTableHeaderRenderer
-com.jidesoft.grid.AutoFilterUtils$5
-com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTable
-com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTable$1
-com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTableModel
-com.jidesoft.grid.AutoFilterUtils$TableWildcardFilter
-com.jidesoft.grid.AutoResizePopupMenuCustomizer$0
-com.jidesoft.grid.AutoResizePopupMenuCustomizer$1
-com.jidesoft.grid.BasicTableModel
-com.jidesoft.grid.BeanTableModel
-com.jidesoft.grid.BooleanCellEditor
-com.jidesoft.grid.BooleanCheckBoxCellEditor
-com.jidesoft.grid.BooleanCheckBoxCellRenderer
-com.jidesoft.grid.ButtonTableCellEditorRenderer
-com.jidesoft.grid.ByteCellEditor
-com.jidesoft.grid.CachedTableModel
-com.jidesoft.grid.CalculatorCellEditor
-com.jidesoft.grid.CalculatorCellEditor$0
-com.jidesoft.grid.CalculatorCellEditor$0$1
-com.jidesoft.grid.CategorizedTable
-com.jidesoft.grid.CellChangeEvent
-com.jidesoft.grid.CellRendererPaneEx
-com.jidesoft.grid.CellSpanTable
-com.jidesoft.grid.CellSpanTable$DelegateAction
-com.jidesoft.grid.CellStyleEditor
-com.jidesoft.grid.CellStyleEditor$1
-com.jidesoft.grid.CellStyleTable
-com.jidesoft.grid.CellStyleTableHeader
-com.jidesoft.grid.CheckBoxListComboBoxCellEditor
-com.jidesoft.grid.CheckBoxTreeComboBoxCellEditor
-com.jidesoft.grid.ColorCellEditor
-com.jidesoft.grid.ColorCellRenderer
-com.jidesoft.grid.ComboBoxShrinkSearchableSupport$0
-com.jidesoft.grid.CompoundTableModelEvent
-com.jidesoft.grid.ContextSensitiveCellRenderer
-com.jidesoft.grid.ContextSensitiveTable
-com.jidesoft.grid.ContextSensitiveTable$0
-com.jidesoft.grid.ContextSensitiveTableTransferHandler
-com.jidesoft.grid.CustomFilterEditorDialog
-com.jidesoft.grid.CustomValueFilterListSelectionModel
-com.jidesoft.grid.DateCellEditor
-com.jidesoft.grid.DefaultColumnTableModelWrapper
-com.jidesoft.grid.DefaultContextSensitiveTableModel
-com.jidesoft.grid.DefaultGroupTableModel
-com.jidesoft.grid.DefaultGroupableTableModel
-com.jidesoft.grid.DefaultMultiTableModel
-com.jidesoft.grid.DefaultNavigableTableModel
-com.jidesoft.grid.DefaultProperty
-com.jidesoft.grid.DefaultSpanTableModel
-com.jidesoft.grid.DefaultStyleTableModel
-com.jidesoft.grid.DefaultTableModelWrapper
-com.jidesoft.grid.DefaultTableSelectionModel
-com.jidesoft.grid.DefaultUndoableTableModel
-com.jidesoft.grid.DimensionCellEditor
-com.jidesoft.grid.DoubleCellEditor
-com.jidesoft.grid.DraggingTableHeader
-com.jidesoft.grid.DualTable
-com.jidesoft.grid.DualTable$4
-com.jidesoft.grid.DualTable$5
-com.jidesoft.grid.DualTable$6
-com.jidesoft.grid.DualTable$7
-com.jidesoft.grid.DualTable$8
-com.jidesoft.grid.DualTable$d_
-com.jidesoft.grid.EditableTableHeader
-com.jidesoft.grid.EditableTableHeader$4
-com.jidesoft.grid.EditableTableHeader$4$0
-com.jidesoft.grid.EditingNotStoppedException
-com.jidesoft.grid.EditorContext
-com.jidesoft.grid.EnumCellEditor
-com.jidesoft.grid.EnumCellRenderer
-com.jidesoft.grid.ExpandablePanel
-com.jidesoft.grid.ExpandableTableCellRenderer
-com.jidesoft.grid.Field
-com.jidesoft.grid.FileCellEditor
-com.jidesoft.grid.FileNameCellEditor
-com.jidesoft.grid.FilterEvent
-com.jidesoft.grid.FilterListCellRenderer
-com.jidesoft.grid.FilterableTableModel
-com.jidesoft.grid.FilterableTableModel$0
-com.jidesoft.grid.FilterableTableModel$1
-com.jidesoft.grid.FilterableTableModelEvent
-com.jidesoft.grid.FilterableTreeTableModel
-com.jidesoft.grid.FloatCellEditor
-com.jidesoft.grid.FolderCellEditor
-com.jidesoft.grid.FolderNameCellEditor
-com.jidesoft.grid.FontCellEditor
-com.jidesoft.grid.FontNameCellEditor
-com.jidesoft.grid.FontNameCellEditor$a_
-com.jidesoft.grid.FormattedTextFieldCellEditor
-com.jidesoft.grid.FormattedTextFieldCellEditor$0
-com.jidesoft.grid.FormattedTextFieldCellEditor$1
-com.jidesoft.grid.GroupTable
-com.jidesoft.grid.GroupTableHeader
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$0
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$1
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$2
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$3
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$4
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$5
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$6
-com.jidesoft.grid.HierarchicalPanel
-com.jidesoft.grid.HierarchicalPanel$c_
-com.jidesoft.grid.HierarchicalTable
-com.jidesoft.grid.HierarchicalTable$HierarchicalTableAction
-com.jidesoft.grid.HierarchicalTableCellRenderer
-com.jidesoft.grid.HyperlinkTableCellEditorRenderer
-com.jidesoft.grid.IFilterableTableModel$FilterItem
-com.jidesoft.grid.IPAddressCellEditor
-com.jidesoft.grid.ISortableTableModel$SortItem
-com.jidesoft.grid.IconCellRenderer
-com.jidesoft.grid.IconRenderer
-com.jidesoft.grid.IndexChangeEvent
-com.jidesoft.grid.IndexChangeListenerHelper
-com.jidesoft.grid.InsetsCellEditor
-com.jidesoft.grid.IntegerCellEditor
-com.jidesoft.grid.JideTable
-com.jidesoft.grid.JideTable$10
-com.jidesoft.grid.JideTable$22
-com.jidesoft.grid.JideTable$23
-com.jidesoft.grid.JideTable$24
-com.jidesoft.grid.JideTable$25
-com.jidesoft.grid.JideTable$26
-com.jidesoft.grid.JideTable$27
-com.jidesoft.grid.JideTable$NonContiguousTransferHandler
-com.jidesoft.grid.JideTable$s_
-com.jidesoft.grid.JideTable$t_
-com.jidesoft.grid.JideTable$u_
-com.jidesoft.grid.JideTableTransferHandler
-com.jidesoft.grid.JoinTableModel
-com.jidesoft.grid.LegacyBooleanCellEditor
-com.jidesoft.grid.LegacyCheckBoxListComboBoxCellEditor
-com.jidesoft.grid.LegacyColorCellEditor
-com.jidesoft.grid.LegacyColorCellRenderer
-com.jidesoft.grid.LegacyDateCellEditor
-com.jidesoft.grid.LegacyEnumCellEditor
-com.jidesoft.grid.LegacyEnumCellRenderer
-com.jidesoft.grid.LegacyFileCellEditor
-com.jidesoft.grid.LegacyFileNameCellEditor
-com.jidesoft.grid.LegacyFolderCellEditor
-com.jidesoft.grid.LegacyFolderNameCellEditor
-com.jidesoft.grid.LegacyFontNameCellEditor
-com.jidesoft.grid.LegacyFontNameCellEditor$a_
-com.jidesoft.grid.LegacyInsetsCellEditor
-com.jidesoft.grid.LegacyListComboBoxCellEditor
-com.jidesoft.grid.LegacyMonthCellEditor
-com.jidesoft.grid.LegacyMultilineStringCellEditor
-com.jidesoft.grid.LegacySortableTableHeader
-com.jidesoft.grid.LegacyStringArrayCellEditor
-com.jidesoft.grid.LegacyTableComboBoxCellEditor
-com.jidesoft.grid.LegacyTreeComboBoxCellEditor
-com.jidesoft.grid.ListComboBoxCellEditor
-com.jidesoft.grid.ListComboBoxShrinkSearchableSupport$0
-com.jidesoft.grid.ListSelectionModelGroup
-com.jidesoft.grid.ListShrinkSearchableSupport$0
-com.jidesoft.grid.ListTableModelAdapter
-com.jidesoft.grid.LongCellEditor
-com.jidesoft.grid.MarginExpandablePanel
-com.jidesoft.grid.MixedTableSelectionModelGroup
-com.jidesoft.grid.MixedTableSelectionModelGroup$0
-com.jidesoft.grid.MonthCellEditor
-com.jidesoft.grid.MultiValuedMap
-com.jidesoft.grid.MultilineStringCellEditor
-com.jidesoft.grid.MultilineStringCellRenderer
-com.jidesoft.grid.MultilineTableCellEditor
-com.jidesoft.grid.MultilineTableCellRenderer
-com.jidesoft.grid.MultilineTableCellRenderer$UIResource
-com.jidesoft.grid.MultipleEnumCellEditor
-com.jidesoft.grid.MultipleValuesFilter
-com.jidesoft.grid.NavigableTable
-com.jidesoft.grid.NavigationHierarchicalTable
-com.jidesoft.grid.NavigationSortableTable
-com.jidesoft.grid.NavigationTreeTable
-com.jidesoft.grid.NestedSortableTableHeader
-com.jidesoft.grid.NestedTableHeader
-com.jidesoft.grid.NumberCellEditor
-com.jidesoft.grid.NumberCellRenderer
-com.jidesoft.grid.PasswordCellEditor
-com.jidesoft.grid.PasswordCellRenderer
-com.jidesoft.grid.PointCellEditor
-com.jidesoft.grid.PropertyPane
-com.jidesoft.grid.PropertyPane$0
-com.jidesoft.grid.PropertyPane$3
-com.jidesoft.grid.PropertyPane$4
-com.jidesoft.grid.PropertyPane$5
-com.jidesoft.grid.PropertyPane$6
-com.jidesoft.grid.PropertyPane$7
-com.jidesoft.grid.PropertyTable
-com.jidesoft.grid.PropertyTable$0
-com.jidesoft.grid.PropertyTableCellRenderer
-com.jidesoft.grid.PropertyTableModel
-com.jidesoft.grid.QuickFilterField$1
-com.jidesoft.grid.QuickFilterField$2
-com.jidesoft.grid.QuickFilterField$3
-com.jidesoft.grid.QuickFilterField$4
-com.jidesoft.grid.QuickFilterField$5
-com.jidesoft.grid.QuickFilterField$6
-com.jidesoft.grid.QuickFilterField$7
-com.jidesoft.grid.QuickFilterField$8
-com.jidesoft.grid.QuickFilterField$9
-com.jidesoft.grid.QuickFilterField$FieldFilter
-com.jidesoft.grid.QuickFilterPane
-com.jidesoft.grid.QuickFilterPane$0
-com.jidesoft.grid.QuickFilterPane$1
-com.jidesoft.grid.QuickFilterPane$2
-com.jidesoft.grid.QuickFilterPane$QuickFilterCheckBoxList
-com.jidesoft.grid.QuickFilterPane$QuickFilterList
-com.jidesoft.grid.QuickTableFilterField
-com.jidesoft.grid.QuickTableFilterField$0
-com.jidesoft.grid.QuickTableFilterField$0$1
-com.jidesoft.grid.QuickTableFilterField$1
-com.jidesoft.grid.QuickTableFilterField$1$0
-com.jidesoft.grid.QuickTableFilterField$10
-com.jidesoft.grid.QuickTableFilterField$3
-com.jidesoft.grid.QuickTableFilterField$4
-com.jidesoft.grid.QuickTableFilterField$5
-com.jidesoft.grid.QuickTableFilterField$6
-com.jidesoft.grid.QuickTableFilterField$7
-com.jidesoft.grid.QuickTableFilterField$8
-com.jidesoft.grid.QuickTableFilterField$9
-com.jidesoft.grid.QuickTableFilterField$FieldTableFilter
-com.jidesoft.grid.QuickTableFilterField$c_
-com.jidesoft.grid.RectangleCellEditor
-com.jidesoft.grid.RowHeightChangeEvent
-com.jidesoft.grid.SelectTablePopupMenuCustomizer$0
-com.jidesoft.grid.SelectTablePopupMenuCustomizer$1
-com.jidesoft.grid.ShortCellEditor
-com.jidesoft.grid.SingleValueFilter
-com.jidesoft.grid.SliderCellEditor
-com.jidesoft.grid.SortEvent
-com.jidesoft.grid.SortItemEditor
-com.jidesoft.grid.SortOrderEditor
-com.jidesoft.grid.SortTableHeaderRenderer$a_
-com.jidesoft.grid.SortTableHeaderRenderer$b_
-com.jidesoft.grid.SortableTable
-com.jidesoft.grid.SortableTableHeader
-com.jidesoft.grid.SortableTableModel
-com.jidesoft.grid.SortableTableModel$1
-com.jidesoft.grid.SortableTableModel$2
-com.jidesoft.grid.SortableTableModel$3
-com.jidesoft.grid.SortableTreeTableModel
-com.jidesoft.grid.SpanModelEvent
-com.jidesoft.grid.SpinnerCellEditor
-com.jidesoft.grid.SpinnerCellEditor$0
-com.jidesoft.grid.SpinnerCellEditor$0$1
-com.jidesoft.grid.SpinnerCellEditor$0$2
-com.jidesoft.grid.SpinnerCellEditor$0$3
-com.jidesoft.grid.SpinnerCellEditor$0$4
-com.jidesoft.grid.StringArrayCellEditor
-com.jidesoft.grid.StringCellEditor
-com.jidesoft.grid.StyledTableCellRenderer
-com.jidesoft.grid.StyledTableCellRenderer$UIResource
-com.jidesoft.grid.TableCellStyleEditor
-com.jidesoft.grid.TableColumnChooser$0
-com.jidesoft.grid.TableColumnChooser$1
-com.jidesoft.grid.TableColumnChooser$2
-com.jidesoft.grid.TableColumnChooser$3
-com.jidesoft.grid.TableColumnChooser$4
-com.jidesoft.grid.TableColumnChooser$5
-com.jidesoft.grid.TableColumnChooserDialog
-com.jidesoft.grid.TableColumnChooserDialog$0
-com.jidesoft.grid.TableColumnChooserDialog$1
-com.jidesoft.grid.TableColumnChooserDialog$5
-com.jidesoft.grid.TableColumnChooserDialog$6
-com.jidesoft.grid.TableColumnChooserDialog$7
-com.jidesoft.grid.TableColumnChooserDialog$8
-com.jidesoft.grid.TableColumnChooserDialog$j_
-com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$2
-com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$3
-com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$4
-com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$5
-com.jidesoft.grid.TableColumnGroup
-com.jidesoft.grid.TableComboBoxCellEditor
-com.jidesoft.grid.TableComboBoxShrinkSearchableSupport$0
-com.jidesoft.grid.TableCustomFilterEditor
-com.jidesoft.grid.TableCustomFilterEditor$0
-com.jidesoft.grid.TableCustomFilterEditor$10
-com.jidesoft.grid.TableCustomFilterEditor$11
-com.jidesoft.grid.TableCustomFilterEditor$5
-com.jidesoft.grid.TableCustomFilterEditor$6
-com.jidesoft.grid.TableCustomFilterEditor$7
-com.jidesoft.grid.TableCustomFilterEditor$8
-com.jidesoft.grid.TableCustomFilterEditor$9
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$2
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$3
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$4
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$5
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$6
-com.jidesoft.grid.TableModelWrapperImpl
-com.jidesoft.grid.TableScrollPane
-com.jidesoft.grid.TableSelectionEvent
-com.jidesoft.grid.TableSelectionModelGroup
-com.jidesoft.grid.TableSelectionModelGroup$0
-com.jidesoft.grid.TableShrinkSearchableSupport$0
-com.jidesoft.grid.TableSortItemEditor
-com.jidesoft.grid.TableSortItemEditor$2
-com.jidesoft.grid.TableSplitPane
-com.jidesoft.grid.TableSplitPane$0
-com.jidesoft.grid.TableUtils$ab_
-com.jidesoft.grid.TableUtils$bb_
-com.jidesoft.grid.TableUtils$cb_
-com.jidesoft.grid.TableUtils$s_
-com.jidesoft.grid.TableUtils$t_
-com.jidesoft.grid.TableUtils$u_
-com.jidesoft.grid.TableUtils$v_
-com.jidesoft.grid.TableUtils$w_
-com.jidesoft.grid.TableUtils$x_
-com.jidesoft.grid.TableUtils$y_
-com.jidesoft.grid.TableUtils$z_
-com.jidesoft.grid.TextFieldCellEditor
-com.jidesoft.grid.TextFieldCellEditor$0
-com.jidesoft.grid.TransposeTableModel
-com.jidesoft.grid.TreeComboBoxCellEditor
-com.jidesoft.grid.TreeExpandablePanel
-com.jidesoft.grid.TreeLikeHierarchicalPanel
-com.jidesoft.grid.TreeTable
-com.jidesoft.grid.TreeTable$TreeTableAction
-com.jidesoft.grid.TreeTableCellRenderer
-com.jidesoft.grid.TreeTableModel$b_
-com.jidesoft.grid.TristateCheckBoxCellEditor
-com.jidesoft.grid.TristateCheckBoxCellRenderer
-com.jidesoft.grid.UndoableTableModelEvent
-com.jidesoft.grid.ValueFilterListSelectionModel
-com.jidesoft.grid.VerticalContextSensitiveCellRenderer
-com.jidesoft.grid.VerticalTableCellRenderer
-com.jidesoft.grid.VerticalTableCellRenderer$UIResource
-com.jidesoft.grid.a
-com.jidesoft.grid.j
-com.jidesoft.grid.k
-com.jidesoft.grid.l
-com.jidesoft.grid.l$0
-com.jidesoft.grid.m
-com.jidesoft.grid.m$a_
-com.jidesoft.grid.n
-com.jidesoft.grid.o
-com.jidesoft.grouper.GrouperContext
-com.jidesoft.hints.AbstractIntelliHints$3
-com.jidesoft.hints.AbstractInte

<TRUNCATED>

[17/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
new file mode 100644
index 0000000..8cfaca8
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
@@ -0,0 +1,450 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+import sun.misc.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.nio.charset.*;
+import java.security.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.marshaller.optimized.GridOptimizedMarshallable.*;
+
+/**
+ * Miscellaneous utility methods to facilitate {@link GridOptimizedMarshaller}.
+ */
+class GridOptimizedMarshallerUtils {
+    /** Unsafe. */
+    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
+
+    /** {@code Null} object reference. */
+    static final byte NULL = (byte)0x70;
+
+    /** Handle reference. */
+    static final byte HANDLE = (byte)0x71;
+
+    /** Object reference. */
+    static final byte OBJECT = (byte)0x72;
+
+    /** UTF-8 character name. */
+    static final Charset UTF_8 = Charset.forName("UTF-8");
+
+    /** Class descriptors cache. */
+    private static final ConcurrentMap<Class<?>, GridOptimizedClassDescriptor> CLS_DESC_CACHE =
+        new ConcurrentHashMap8<>(256);
+
+    /** Classes cache by name. */
+    private static final ConcurrentHashMap8<ClassLoader, ConcurrentHashMap8<String, Class<?>>> CLS_BY_NAME_CACHE =
+        new ConcurrentHashMap8<>();
+
+    /**
+     * Suppresses default constructor, ensuring non-instantiability.
+     */
+    private GridOptimizedMarshallerUtils() {
+        // No-op.
+    }
+
+    /**
+     * Gets class for given name and class loader.
+     *
+     * @param name Class name.
+     * @param ldr Class loader.
+     * @return Class.
+     * @throws ClassNotFoundException If class was not found.
+     */
+    static Class<?> forName(String name, ClassLoader ldr) throws ClassNotFoundException {
+        assert ldr != null;
+        assert name != null;
+
+        ConcurrentHashMap8<String, Class<?>> cache = CLS_BY_NAME_CACHE.get(ldr);
+
+        Class<?> cls = null;
+
+        if (cache == null) {
+            cache = new ConcurrentHashMap8<>();
+
+            ConcurrentHashMap8<String, Class<?>> old = CLS_BY_NAME_CACHE.putIfAbsent(ldr, cache);
+
+            if (old != null) {
+                cache = old;
+
+                cls = cache.get(name);
+            }
+        }
+        else
+            cls = cache.get(name);
+
+        if (cls == null) {
+            cls = Class.forName(name, true, ldr);
+
+            cache.put(name, cls);
+        }
+
+        return cls;
+    }
+
+    /**
+     * Gets descriptor for provided class.
+     *
+     * @param cls Class.
+     * @param obj Object.
+     * @return Descriptor.
+     * @throws IOException In case of error.
+     */
+    static GridOptimizedClassDescriptor classDescriptor(Class<?> cls, @Nullable Object obj) throws IOException {
+        if (obj != null) {
+            if (obj instanceof GridOptimizedMarshallable) {
+                GridOptimizedMarshallable m = (GridOptimizedMarshallable)obj;
+
+                Object clsId = m.ggClassId();
+
+                if (clsId != null && !(clsId instanceof GridOptimizedClassDescriptor))
+                    throw new IOException("Method '" + obj.getClass().getName() + ".ggClassId() must return " +
+                        "the value of the field '" + CLS_ID_FIELD_NAME + "'.");
+
+                GridOptimizedClassDescriptor desc = (GridOptimizedClassDescriptor)clsId;
+
+                if (desc == null) {
+                    desc = new GridOptimizedClassDescriptor(cls);
+
+                    try {
+                        Field field = obj.getClass().getDeclaredField(CLS_ID_FIELD_NAME);
+
+                        field.setAccessible(true);
+
+                        Object o = field.get(null);
+
+                        if (o == null) {
+                            if ((field.getModifiers() & Modifier.STATIC) == 0)
+                                throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared static: " +
+                                    obj.getClass().getName());
+
+                            field.set(null, desc);
+
+                            if (m.ggClassId() == null)
+                                throw new IOException( "Method '" + obj.getClass().getName() + ".ggClassId() must " +
+                                    "return the value of the field '" + CLS_ID_FIELD_NAME + "': "
+                                    + obj.getClass().getName());
+                        }
+                        else if (!(o instanceof GridOptimizedClassDescriptor))
+                            throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared with " +
+                                "null value: " + obj.getClass().getName());
+                    }
+                    catch (NoSuchFieldException e) {
+                        throw new IOException("GridOptimizedMarshallable classes must have static field declared " +
+                            "[fieldName=" + CLS_ID_FIELD_NAME + ", cls=" + obj.getClass().getName() + ']', e);
+                    }
+                    catch (IllegalAccessException e) {
+                        throw new IOException("Failed to set field '" + CLS_ID_FIELD_NAME + "' on '" +
+                            obj.getClass().getName() + "' class.", e);
+                    }
+                }
+
+                return desc;
+            }
+        }
+
+        GridOptimizedClassDescriptor desc = CLS_DESC_CACHE.get(cls);
+
+        if (desc == null) {
+            GridOptimizedClassDescriptor existing = CLS_DESC_CACHE.putIfAbsent(cls,
+                desc = new GridOptimizedClassDescriptor(cls));
+
+            if (existing != null)
+                desc = existing;
+        }
+
+        return desc;
+    }
+
+    /**
+     * Undeployment callback.
+     *
+     * @param ldr Undeployed class loader.
+     */
+    public static void onUndeploy(ClassLoader ldr) {
+        CLS_BY_NAME_CACHE.remove(ldr);
+
+        for (Class<?> cls : CLS_DESC_CACHE.keySet()) {
+            if (ldr.equals(cls.getClassLoader()))
+                CLS_DESC_CACHE.remove(cls);
+        }
+    }
+
+    /**
+     * Intended for test purposes only.
+     */
+    public static void clearCache() {
+        CLS_BY_NAME_CACHE.clear();
+        CLS_DESC_CACHE.clear();
+    }
+
+    /**
+     *
+     */
+    public static void printMemoryStats() {
+        X.println(">>>");
+        X.println(">>> GridOptimizedMarshallerUtils memory stats:");
+        X.println(" Cache size: " + CLS_DESC_CACHE.size());
+
+        for (Map.Entry<Class<?>, GridOptimizedClassDescriptor> e : CLS_DESC_CACHE.entrySet())
+            X.println(" " + e.getKey() + " : " + e.getValue());
+    }
+
+    /**
+     * Computes the serial version UID value for the given class.
+     * The code is taken from {@link ObjectStreamClass#computeDefaultSUID(Class)}.
+     *
+     * @param cls A class.
+     * @param fields Fields.
+     * @return A serial version UID.
+     * @throws IOException If failed.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    static Long computeSerialVersionUid(Class cls, List<Field> fields) throws IOException {
+        if (Serializable.class.isAssignableFrom(cls) && !Enum.class.isAssignableFrom(cls))
+            return ObjectStreamClass.lookup(cls).getSerialVersionUID();
+
+        MessageDigest md;
+
+        try {
+            md = MessageDigest.getInstance("SHA");
+        }
+        catch (NoSuchAlgorithmException e) {
+            throw new IOException("Failed to get digest for SHA.", e);
+        }
+
+        md.update(cls.getName().getBytes(UTF_8));
+
+        if (!F.isEmpty(fields)) {
+            for (int i = 0; i < fields.size(); i++) {
+                Field f = fields.get(i);
+
+                md.update(f.getName().getBytes(UTF_8));
+                md.update(f.getType().getName().getBytes(UTF_8));
+            }
+        }
+
+        byte[] hashBytes = md.digest();
+
+        long hash = 0;
+
+        // Composes a single-long hash from the byte[] hash.
+        for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--)
+            hash = (hash << 8) | (hashBytes[i] & 0xFF);
+
+        return hash;
+    }
+
+    /**
+     * Gets byte field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Byte value.
+     */
+    static byte getByte(Object obj, long off) {
+        return UNSAFE.getByte(obj, off);
+    }
+
+    /**
+     * Sets byte field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setByte(Object obj, long off, byte val) {
+        UNSAFE.putByte(obj, off, val);
+    }
+
+    /**
+     * Gets short field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Short value.
+     */
+    static short getShort(Object obj, long off) {
+        return UNSAFE.getShort(obj, off);
+    }
+
+    /**
+     * Sets short field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setShort(Object obj, long off, short val) {
+        UNSAFE.putShort(obj, off, val);
+    }
+
+    /**
+     * Gets integer field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Integer value.
+     */
+    static int getInt(Object obj, long off) {
+        return UNSAFE.getInt(obj, off);
+    }
+
+    /**
+     * Sets integer field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setInt(Object obj, long off, int val) {
+        UNSAFE.putInt(obj, off, val);
+    }
+
+    /**
+     * Gets long field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Long value.
+     */
+    static long getLong(Object obj, long off) {
+        return UNSAFE.getLong(obj, off);
+    }
+
+    /**
+     * Sets long field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setLong(Object obj, long off, long val) {
+        UNSAFE.putLong(obj, off, val);
+    }
+
+    /**
+     * Gets float field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Float value.
+     */
+    static float getFloat(Object obj, long off) {
+        return UNSAFE.getFloat(obj, off);
+    }
+
+    /**
+     * Sets float field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setFloat(Object obj, long off, float val) {
+        UNSAFE.putFloat(obj, off, val);
+    }
+
+    /**
+     * Gets double field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Double value.
+     */
+    static double getDouble(Object obj, long off) {
+        return UNSAFE.getDouble(obj, off);
+    }
+
+    /**
+     * Sets double field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setDouble(Object obj, long off, double val) {
+        UNSAFE.putDouble(obj, off, val);
+    }
+
+    /**
+     * Gets char field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Char value.
+     */
+    static char getChar(Object obj, long off) {
+        return UNSAFE.getChar(obj, off);
+    }
+
+    /**
+     * Sets char field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setChar(Object obj, long off, char val) {
+        UNSAFE.putChar(obj, off, val);
+    }
+
+    /**
+     * Gets boolean field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Boolean value.
+     */
+    static boolean getBoolean(Object obj, long off) {
+        return UNSAFE.getBoolean(obj, off);
+    }
+
+    /**
+     * Sets boolean field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setBoolean(Object obj, long off, boolean val) {
+        UNSAFE.putBoolean(obj, off, val);
+    }
+
+    /**
+     * Gets field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Value.
+     */
+    static Object getObject(Object obj, long off) {
+        return UNSAFE.getObject(obj, off);
+    }
+
+    /**
+     * Sets field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setObject(Object obj, long off, Object val) {
+        UNSAFE.putObject(obj, off, val);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
new file mode 100644
index 0000000..384b643
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
@@ -0,0 +1,1008 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.io.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import sun.misc.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import static org.apache.ignite.marshaller.optimized.GridOptimizedMarshallerUtils.*;
+
+/**
+ * Optimized object input stream.
+ */
+class GridOptimizedObjectInputStream extends ObjectInputStream {
+    /** Unsafe. */
+    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
+
+    /** Dummy object for HashSet. */
+    private static final Object DUMMY = new Object();
+
+    /** */
+    private final HandleTable handles = new HandleTable(10);
+
+    /** */
+    private ClassLoader clsLdr;
+
+    /** */
+    private GridDataInput in;
+
+    /** */
+    private Object curObj;
+
+    /** */
+    private List<T2<GridOptimizedFieldType, Long>> curFields;
+
+    /** */
+    private List<IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoList;
+
+    /** */
+    private Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoMap;
+
+    /** */
+    private Class<?> curCls;
+
+    /**
+     * @param in Input.
+     * @throws IOException In case of error.
+     */
+    GridOptimizedObjectInputStream(GridDataInput in) throws IOException {
+        this.in = in;
+    }
+
+    /**
+     * @throws IOException In case of error.
+     */
+    GridOptimizedObjectInputStream() throws IOException {
+        // No-op.
+    }
+
+    /**
+     * @param clsLdr Class loader.
+     */
+    void classLoader(ClassLoader clsLdr) {
+        this.clsLdr = clsLdr;
+    }
+
+    /**
+     * @return Class loader.
+     */
+    ClassLoader classLoader() {
+        return clsLdr;
+    }
+
+    /**
+     * @return Input.
+     */
+    public GridDataInput in() {
+        return in;
+    }
+
+    /**
+     * @param in Input.
+     */
+    public void in(GridDataInput in) {
+        this.in = in;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void close() throws IOException {
+        reset();
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public void reset() throws IOException {
+        in.reset();
+        handles.clear();
+
+        curObj = null;
+        curFields = null;
+        curFieldInfoList = null;
+        curFieldInfoMap = null;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Object readObjectOverride() throws ClassNotFoundException, IOException {
+        curObj = null;
+        curFields = null;
+        curFieldInfoList = null;
+        curFieldInfoMap = null;
+
+        byte ref = in.readByte();
+
+        switch (ref) {
+            case NULL:
+                return null;
+
+            case HANDLE:
+                return handles.lookup(readInt());
+
+            case OBJECT:
+                GridOptimizedClassDescriptor desc = GridOptimizedClassResolver.readClass(this, clsLdr);
+
+                curCls = desc.describedClass();
+
+                return desc.read(this);
+
+            default:
+                SB msg = new SB("Unexpected error occurred during unmarshalling");
+
+                if (curCls != null)
+                    msg.a(" of an instance of the class: ").a(curCls.getName());
+
+                msg.a(". Check that all nodes are running the same version of GridGain and that all nodes have " +
+                    "GridOptimizedMarshaller configured with identical optimized classes lists, if any " +
+                    "(see setClassNames and setClassNamesPath methods). If your serialized classes implement " +
+                    "java.io.Externalizable interface, verify that serialization logic is correct.");
+
+                throw new IOException(msg.toString());
+        }
+    }
+
+    /**
+     * Reads array from this stream.
+     *
+     * @param compType Array component type.
+     * @return Array.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    <T> T[] readArray(Class<T> compType) throws ClassNotFoundException, IOException {
+        int len = in.readInt();
+
+        T[] arr = (T[])Array.newInstance(compType, len);
+
+        handles.assign(arr);
+
+        for (int i = 0; i < len; i++)
+            arr[i] = (T)readObject();
+
+        return arr;
+    }
+
+    /**
+     * Reads {@link UUID} from this stream.
+     *
+     * @return UUID.
+     * @throws IOException In case of error.
+     */
+    UUID readUuid() throws IOException {
+        UUID uuid = new UUID(readLong(), readLong());
+
+        handles.assign(uuid);
+
+        return uuid;
+    }
+
+    /**
+     * Reads {@link Properties} from this stream.
+     *
+     * @return Properties.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    Properties readProperties() throws ClassNotFoundException, IOException {
+        Properties dflts = readBoolean() ? null : (Properties)readObject();
+
+        Properties props = new Properties(dflts);
+
+        int size = in.readInt();
+
+        for (int i = 0; i < size; i++)
+            props.setProperty(readUTF(), readUTF());
+
+        handles.assign(props);
+
+        return props;
+    }
+
+    /**
+     * Reads and sets all non-static and non-transient field values from this stream.
+     *
+     * @param obj Object.
+     * @param fieldOffs Field offsets.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    void readFields(Object obj, List<T2<GridOptimizedFieldType, Long>> fieldOffs) throws ClassNotFoundException,
+        IOException {
+        for (int i = 0; i < fieldOffs.size(); i++) {
+            T2<GridOptimizedFieldType, Long> t = fieldOffs.get(i);
+
+            switch ((t.get1())) {
+                case BYTE:
+                    setByte(obj, t.get2(), readByte());
+
+                    break;
+
+                case SHORT:
+                    setShort(obj, t.get2(), readShort());
+
+                    break;
+
+                case INT:
+                    setInt(obj, t.get2(), readInt());
+
+                    break;
+
+                case LONG:
+                    setLong(obj, t.get2(), readLong());
+
+                    break;
+
+                case FLOAT:
+                    setFloat(obj, t.get2(), readFloat());
+
+                    break;
+
+                case DOUBLE:
+                    setDouble(obj, t.get2(), readDouble());
+
+                    break;
+
+                case CHAR:
+                    setChar(obj, t.get2(), readChar());
+
+                    break;
+
+                case BOOLEAN:
+                    setBoolean(obj, t.get2(), readBoolean());
+
+                    break;
+
+                case OTHER:
+                    setObject(obj, t.get2(), readObject());
+            }
+        }
+    }
+
+    /**
+     * Reads {@link Externalizable} object.
+     *
+     * @param constructor Constructor.
+     * @param readResolveMtd {@code readResolve} method.
+     * @return Object.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    Object readExternalizable(Constructor<?> constructor, Method readResolveMtd)
+        throws ClassNotFoundException, IOException {
+        Object obj;
+
+        try {
+            obj = constructor.newInstance();
+        }
+        catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+            throw new IOException(e);
+        }
+
+        int handle = handles.assign(obj);
+
+        Externalizable extObj = ((Externalizable)obj);
+
+        extObj.readExternal(this);
+
+        if (readResolveMtd != null) {
+            try {
+                obj = readResolveMtd.invoke(obj);
+
+                handles.set(handle, obj);
+            }
+            catch (IllegalAccessException | InvocationTargetException e) {
+                throw new IOException(e);
+            }
+        }
+
+        return obj;
+    }
+
+    /**
+     * Reads serializable object.
+     *
+     * @param cls Class.
+     * @param mtds {@code readObject} methods.
+     * @param readResolveMtd {@code readResolve} method.
+     * @param fields class fields details.
+     * @return Object.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    Object readSerializable(Class<?> cls, List<Method> mtds, Method readResolveMtd,
+        GridOptimizedClassDescriptor.Fields fields) throws ClassNotFoundException, IOException {
+        Object obj;
+
+        try {
+            obj = UNSAFE.allocateInstance(cls);
+        }
+        catch (InstantiationException e) {
+            throw new IOException(e);
+        }
+
+        int handle = handles.assign(obj);
+
+        for (int i = 0; i < mtds.size(); i++) {
+            Method mtd = mtds.get(i);
+
+            if (mtd != null) {
+                curObj = obj;
+                curFields = fields.fieldOffs(i);
+                curFieldInfoList = fields.fieldInfoList(i);
+                curFieldInfoMap = fields.fieldInfoMap(i);
+
+                try {
+                    mtd.invoke(obj, this);
+                }
+                catch (IllegalAccessException | InvocationTargetException e) {
+                    throw new IOException(e);
+                }
+            }
+            else
+                readFields(obj, fields.fieldOffs(i));
+        }
+
+        if (readResolveMtd != null) {
+            try {
+                obj = readResolveMtd.invoke(obj);
+
+                handles.set(handle, obj);
+            }
+            catch (IllegalAccessException | InvocationTargetException e) {
+                throw new IOException(e);
+            }
+        }
+
+        return obj;
+    }
+
+    /**
+     * Reads {@link ArrayList}.
+     *
+     * @return List.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    ArrayList<?> readArrayList() throws ClassNotFoundException, IOException {
+        int size = readInt();
+
+        ArrayList<Object> list = new ArrayList<>(size);
+
+        handles.assign(list);
+
+        for (int i = 0; i < size; i++)
+            list.add(readObject());
+
+        return list;
+    }
+
+    /**
+     * Reads {@link HashMap}.
+     *
+     * @param set Whether reading underlying map from {@link HashSet}.
+     * @return Map.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    HashMap<?, ?> readHashMap(boolean set) throws ClassNotFoundException, IOException {
+        int size = readInt();
+        float loadFactor = readFloat();
+
+        HashMap<Object, Object> map = new HashMap<>(size, loadFactor);
+
+        if (!set)
+            handles.assign(map);
+
+        for (int i = 0; i < size; i++) {
+            Object key = readObject();
+            Object val = !set ? readObject() : DUMMY;
+
+            map.put(key, val);
+        }
+
+        return map;
+    }
+
+    /**
+     * Reads {@link HashSet}.
+     *
+     * @param mapFieldOff Map field offset.
+     * @return Set.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    HashSet<?> readHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
+        try {
+            HashSet<Object> set = (HashSet<Object>)UNSAFE.allocateInstance(HashSet.class);
+
+            handles.assign(set);
+
+            setObject(set, mapFieldOff, readHashMap(true));
+
+            return set;
+        }
+        catch (InstantiationException e) {
+            throw new IOException(e);
+        }
+    }
+
+    /**
+     * Reads {@link LinkedList}.
+     *
+     * @return List.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    LinkedList<?> readLinkedList() throws ClassNotFoundException, IOException {
+        int size = readInt();
+
+        LinkedList<Object> list = new LinkedList<>();
+
+        handles.assign(list);
+
+        for (int i = 0; i < size; i++)
+            list.add(readObject());
+
+        return list;
+    }
+
+    /**
+     * Reads {@link LinkedHashMap}.
+     *
+     * @param set Whether reading underlying map from {@link LinkedHashSet}.
+     * @return Map.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    LinkedHashMap<?, ?> readLinkedHashMap(boolean set) throws ClassNotFoundException, IOException {
+        int size = readInt();
+        float loadFactor = readFloat();
+        boolean accessOrder = readBoolean();
+
+        LinkedHashMap<Object, Object> map = new LinkedHashMap<>(size, loadFactor, accessOrder);
+
+        if (!set)
+            handles.assign(map);
+
+        for (int i = 0; i < size; i++) {
+            Object key = readObject();
+            Object val = !set ? readObject() : DUMMY;
+
+            map.put(key, val);
+        }
+
+        return map;
+    }
+
+    /**
+     * Reads {@link LinkedHashSet}.
+     *
+     * @param mapFieldOff Map field offset.
+     * @return Set.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    LinkedHashSet<?> readLinkedHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
+        try {
+            LinkedHashSet<Object> set = (LinkedHashSet<Object>)UNSAFE.allocateInstance(LinkedHashSet.class);
+
+            handles.assign(set);
+
+            setObject(set, mapFieldOff, readLinkedHashMap(true));
+
+            return set;
+        }
+        catch (InstantiationException e) {
+            throw new IOException(e);
+        }
+    }
+
+    /**
+     * Reads {@link Date}.
+     *
+     * @return Date.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    Date readDate() throws ClassNotFoundException, IOException {
+        Date date = new Date(readLong());
+
+        handles.assign(date);
+
+        return date;
+    }
+
+    /**
+     * Reads array of {@code byte}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    byte[] readByteArray() throws IOException {
+        byte[] arr = in.readByteArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code short}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    short[] readShortArray() throws IOException {
+        short[] arr = in.readShortArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code int}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    int[] readIntArray() throws IOException {
+        int[] arr = in.readIntArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code long}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    long[] readLongArray() throws IOException {
+        long[] arr = in.readLongArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code float}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    float[] readFloatArray() throws IOException {
+        float[] arr = in.readFloatArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code double}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    double[] readDoubleArray() throws IOException {
+        double[] arr = in.readDoubleArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code char}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    char[] readCharArray() throws IOException {
+        char[] arr = in.readCharArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code boolean}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    boolean[] readBooleanArray() throws IOException {
+        boolean[] arr = in.readBooleanArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads {@link String}.
+     *
+     * @return String.
+     * @throws IOException In case of error.
+     */
+    public String readString() throws IOException {
+        String str = in.readUTF();
+
+        handles.assign(str);
+
+        return str;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readFully(byte[] b) throws IOException {
+        in.readFully(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readFully(byte[] b, int off, int len) throws IOException {
+        in.readFully(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int skipBytes(int n) throws IOException {
+        return in.skipBytes(n);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean readBoolean() throws IOException {
+        return in.readBoolean();
+    }
+
+    /** {@inheritDoc} */
+    @Override public byte readByte() throws IOException {
+        return in.readByte();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int readUnsignedByte() throws IOException {
+        return in.readUnsignedByte();
+    }
+
+    /** {@inheritDoc} */
+    @Override public short readShort() throws IOException {
+        return in.readShort();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int readUnsignedShort() throws IOException {
+        return in.readUnsignedShort();
+    }
+
+    /** {@inheritDoc} */
+    @Override public char readChar() throws IOException {
+        return in.readChar();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int readInt() throws IOException {
+        return in.readInt();
+    }
+
+    /** {@inheritDoc} */
+    @Override public long readLong() throws IOException {
+        return in.readLong();
+    }
+
+    /** {@inheritDoc} */
+    @Override public float readFloat() throws IOException {
+        return in.readFloat();
+    }
+
+    /** {@inheritDoc} */
+    @Override public double readDouble() throws IOException {
+        return in.readDouble();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read() throws IOException {
+        return in.read();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read(byte[] b) throws IOException {
+        return in.read(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read(byte[] b, int off, int len) throws IOException {
+        return in.read(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("deprecation")
+    @Override public String readLine() throws IOException {
+        return in.readLine();
+    }
+
+    /** {@inheritDoc} */
+    @Override public String readUTF() throws IOException {
+        return in.readUTF();
+    }
+
+    /** {@inheritDoc} */
+    @Override public Object readUnshared() throws IOException, ClassNotFoundException {
+        return readObject();
+    }
+
+    /** {@inheritDoc} */
+    @Override public void defaultReadObject() throws IOException, ClassNotFoundException {
+        if (curObj == null)
+            throw new NotActiveException("Not in readObject() call.");
+
+        readFields(curObj, curFields);
+    }
+
+    /** {@inheritDoc} */
+    @Override public ObjectInputStream.GetField readFields() throws IOException, ClassNotFoundException {
+        if (curObj == null)
+            throw new NotActiveException("Not in readObject() call.");
+
+        return new GetFieldImpl(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void registerValidation(ObjectInputValidation obj, int pri) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public int available() throws IOException {
+        return -1;
+    }
+
+    /**
+     * Returns objects that were added to handles table.
+     * Used ONLY for test purposes.
+     *
+     * @return Handled objects.
+     */
+    Object[] handledObjects() {
+        return handles.entries;
+    }
+
+    /**
+     * Lightweight identity hash table which maps objects to integer handles,
+     * assigned in ascending order.
+     */
+    private static class HandleTable {
+        /** Array mapping handle -> object/exception (depending on status). */
+        private Object[] entries;
+
+        /** Number of handles in table. */
+        private int size;
+
+        /**
+         * Creates handle table with the given initial capacity.
+         *
+         * @param initCap Initial capacity.
+         */
+        HandleTable(int initCap) {
+            entries = new Object[initCap];
+        }
+
+        /**
+         * Assigns next available handle to given object, and returns assigned
+         * handle.
+         *
+         * @param obj Object.
+         * @return Handle.
+         */
+        int assign(Object obj) {
+            if (size >= entries.length)
+                grow();
+
+            entries[size] = obj;
+
+            return size++;
+        }
+
+        /**
+         * Assigns new object to existing handle. Old object is forgotten.
+         *
+         * @param handle Handle.
+         * @param obj Object.
+         */
+        void set(int handle, Object obj) {
+            entries[handle] = obj;
+        }
+
+        /**
+         * Looks up and returns object associated with the given handle.
+         *
+         * @param handle Handle.
+         * @return Object.
+         */
+        Object lookup(int handle) {
+            return entries[handle];
+        }
+
+        /**
+         * Resets table to its initial state.
+         */
+        void clear() {
+            Arrays.fill(entries, 0, size, null);
+
+            size = 0;
+        }
+
+        /**
+         * Expands capacity of internal arrays.
+         */
+        private void grow() {
+            int newCap = (entries.length << 1) + 1;
+
+            Object[] newEntries = new Object[newCap];
+
+            System.arraycopy(entries, 0, newEntries, 0, size);
+
+            entries = newEntries;
+        }
+    }
+
+    /**
+     * {@link GetField} implementation.
+     */
+    private static class GetFieldImpl extends GetField {
+        /** Field info map. */
+        private final Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap;
+
+        /** Values. */
+        private final Object[] objs;
+
+        /**
+         * @param in Stream.
+         * @throws IOException In case of error.
+         * @throws ClassNotFoundException If class not found.
+         */
+        @SuppressWarnings("ForLoopReplaceableByForEach")
+        private GetFieldImpl(GridOptimizedObjectInputStream in) throws IOException, ClassNotFoundException {
+            fieldInfoMap = in.curFieldInfoMap;
+
+            List<IgniteBiTuple<Integer, GridOptimizedFieldType>> infos = in.curFieldInfoList;
+
+            objs = new Object[infos.size()];
+
+            for (int i = 0; i < infos.size(); i++) {
+                IgniteBiTuple<Integer, GridOptimizedFieldType> t = infos.get(i);
+
+                Object obj = null;
+
+                switch (t.get2()) {
+                    case BYTE:
+                        obj = in.readByte();
+
+                        break;
+
+                    case SHORT:
+                        obj = in.readShort();
+
+                        break;
+
+                    case INT:
+                        obj = in.readInt();
+
+                        break;
+
+                    case LONG:
+                        obj = in.readLong();
+
+                        break;
+
+                    case FLOAT:
+                        obj = in.readFloat();
+
+                        break;
+
+                    case DOUBLE:
+                        obj = in.readDouble();
+
+                        break;
+
+                    case CHAR:
+                        obj = in.readChar();
+
+                        break;
+
+                    case BOOLEAN:
+                        obj = in.readBoolean();
+
+                        break;
+
+                    case OTHER:
+                        obj = in.readObject();
+                }
+
+                objs[t.get1()] = obj;
+            }
+        }
+
+        /** {@inheritDoc} */
+        @Override public ObjectStreamClass getObjectStreamClass() {
+            throw new UnsupportedOperationException();
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean defaulted(String name) throws IOException {
+            return objs[fieldInfoMap.get(name).get1()] == null;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean get(String name, boolean dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public byte get(String name, byte dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public char get(String name, char dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public short get(String name, short dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public int get(String name, int dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public long get(String name, long dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public float get(String name, float dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public double get(String name, double dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public Object get(String name, Object dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /**
+         * @param name Field name.
+         * @param dflt Default value.
+         * @return Value.
+         */
+        private <T> T value(String name, T dflt) {
+            return objs[fieldInfoMap.get(name).get1()] != null ? (T)objs[fieldInfoMap.get(name).get1()] : dflt;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
new file mode 100644
index 0000000..55125e3
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
@@ -0,0 +1,831 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.io.*;
+import org.gridgain.grid.util.typedef.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import static org.apache.ignite.marshaller.optimized.GridOptimizedMarshallerUtils.*;
+
+/**
+ * Optimized object output stream.
+ */
+class GridOptimizedObjectOutputStream extends ObjectOutputStream {
+    /** */
+    private static final Collection<String> CONVERTED_ERR = F.asList(
+        "weblogic/management/ManagementException",
+        "Externalizable class doesn't have default constructor: class " +
+            "org.gridgain.grid.kernal.processors.email.GridEmailProcessor$2"
+    );
+
+    /** */
+    private final GridHandleTable handles = new GridHandleTable(10, 3.00f);
+
+    /** */
+    private boolean requireSer;
+
+    /** */
+    private GridDataOutput out;
+
+    /** */
+    private Object curObj;
+
+    /** */
+    private List<T2<GridOptimizedFieldType, Long>> curFields;
+
+    /** */
+    private Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoMap;
+
+    /** */
+    private PutFieldImpl curPut;
+
+
+    /**
+     * @throws IOException In case of error.
+     */
+    GridOptimizedObjectOutputStream() throws IOException {
+        // No-op.
+    }
+
+    /**
+     * @param out Output.
+     * @throws IOException In case of error.
+     */
+    GridOptimizedObjectOutputStream(GridDataOutput out) throws IOException {
+        this.out = out;
+    }
+
+    /**
+     * @param requireSer Require {@link Serializable} flag.
+     */
+    void requireSerializable(boolean requireSer) {
+        this.requireSer = requireSer;
+    }
+
+    /**
+     * @return Require {@link Serializable} flag.
+     */
+    boolean requireSerializable() {
+        return requireSer;
+    }
+
+    /**
+     * @param out Output.
+     */
+    public void out(GridDataOutput out) {
+        this.out = out;
+    }
+
+    /**
+     * @return Output.
+     */
+    public GridDataOutput out() {
+        return out;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void close() throws IOException {
+        reset();
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(byte[] b) throws IOException {
+        out.write(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(byte[] b, int off, int len) throws IOException {
+        out.write(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void writeObjectOverride(Object obj) throws IOException {
+        try {
+            writeObject0(obj);
+        }
+        catch (IOException e) {
+            Throwable t = e;
+
+            do {
+                if (CONVERTED_ERR.contains(t.getMessage()))
+                    throw new IOException("You are trying to serialize internal classes that are not supposed " +
+                        "to be serialized. Check that all non-serializable fields are transient. Consider using " +
+                        "static inner classes instead of non-static inner classes and anonymous classes.", e);
+            }
+            while ((t = t.getCause()) != null);
+
+            throw e;
+        }
+    }
+
+    /**
+     * Writes object to stream.
+     *
+     * @param obj Object.
+     * @throws IOException In case of error.
+     */
+    private void writeObject0(Object obj) throws IOException {
+        curObj = null;
+        curFields = null;
+        curPut = null;
+        curFieldInfoMap = null;
+
+        if (obj == null)
+            writeByte(NULL);
+        else {
+            Class<?> cls = obj.getClass();
+
+            GridOptimizedClassDescriptor desc = classDescriptor(cls, obj);
+
+            if (desc.excluded()) {
+                writeByte(NULL);
+
+                return;
+            }
+
+            Object obj0 = desc.replace(obj);
+
+            if (obj0 == null) {
+                writeByte(NULL);
+
+                return;
+            }
+
+            int handle = -1;
+
+            if (!desc.isPrimitive() && !desc.isEnum() && !desc.isClass())
+                handle = handles.lookup(obj);
+
+            if (obj0 != obj) {
+                obj = obj0;
+
+                desc = classDescriptor(obj.getClass(), obj);
+            }
+
+            if (handle >= 0) {
+                writeByte(HANDLE);
+                writeInt(handle);
+            }
+            else {
+                writeByte(OBJECT);
+
+                GridOptimizedClassResolver.writeClass(this, desc);
+
+                desc.write(this, obj);
+            }
+        }
+    }
+
+    /**
+     * Writes array to this stream.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    void writeArray(Object[] arr) throws IOException {
+        int len = arr.length;
+
+        writeInt(len);
+
+        for (int i = 0; i < len; i++) {
+            Object obj = arr[i];
+
+            writeObject0(obj);
+        }
+    }
+
+    /**
+     * Writes {@link UUID} to this stream.
+     *
+     * @param uuid UUID.
+     * @throws IOException In case of error.
+     */
+    void writeUuid(UUID uuid) throws IOException {
+        writeLong(uuid.getMostSignificantBits());
+        writeLong(uuid.getLeastSignificantBits());
+    }
+
+    /**
+     * Writes {@link Properties} to this stream.
+     *
+     * @param props Properties.
+     * @param dfltsFieldOff Defaults field offset.
+     * @throws IOException In case of error.
+     */
+    void writeProperties(Properties props, long dfltsFieldOff) throws IOException {
+        Properties dflts = (Properties)getObject(props, dfltsFieldOff);
+
+        if (dflts == null)
+            writeBoolean(true);
+        else {
+            writeBoolean(false);
+
+            writeObject0(dflts);
+        }
+
+        Set<String> names = props.stringPropertyNames();
+
+        writeInt(names.size());
+
+        for (String name : names) {
+            writeUTF(name);
+            writeUTF(props.getProperty(name));
+        }
+    }
+
+    /**
+     * Writes externalizable object.
+     *
+     * @param obj Object.
+     * @throws IOException In case of error.
+     */
+    void writeExternalizable(Object obj) throws IOException {
+        Externalizable extObj = (Externalizable)obj;
+
+        extObj.writeExternal(this);
+    }
+
+    /**
+     * Writes serializable object.
+     *
+     * @param obj Object.
+     * @param mtds {@code writeObject} methods.
+     * @param fields class fields details.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    void writeSerializable(Object obj, List<Method> mtds, GridOptimizedClassDescriptor.Fields fields)
+        throws IOException {
+        for (int i = 0; i < mtds.size(); i++) {
+            Method mtd = mtds.get(i);
+
+            if (mtd != null) {
+                curObj = obj;
+                curFields = fields.fieldOffs(i);
+                curFieldInfoMap = fields.fieldInfoMap(i);
+
+                try {
+                    mtd.invoke(obj, this);
+                }
+                catch (IllegalAccessException e) {
+                    throw new IOException(e);
+                }
+                catch (InvocationTargetException e) {
+                    throw new IOException(e.getCause());
+                }
+            }
+            else
+                writeFields(obj, fields.fieldOffs(i));
+        }
+    }
+
+    /**
+     * Writes {@link ArrayList}.
+     *
+     * @param list List.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings({"ForLoopReplaceableByForEach", "TypeMayBeWeakened"})
+    void writeArrayList(ArrayList<?> list) throws IOException {
+        int size = list.size();
+
+        writeInt(size);
+
+        for (int i = 0; i < size; i++)
+            writeObject0(list.get(i));
+    }
+
+    /**
+     * Writes {@link HashMap}.
+     *
+     * @param map Map.
+     * @param loadFactorFieldOff Load factor field offset.
+     * @param set Whether writing underlying map from {@link HashSet}.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    void writeHashMap(HashMap<?, ?> map, long loadFactorFieldOff, boolean set) throws IOException {
+        int size = map.size();
+
+        writeInt(size);
+        writeFloat(getFloat(map, loadFactorFieldOff));
+
+        for (Map.Entry<?, ?> e : map.entrySet()) {
+            writeObject0(e.getKey());
+
+            if (!set)
+                writeObject0(e.getValue());
+        }
+    }
+
+    /**
+     * Writes {@link HashSet}.
+     *
+     * @param set Set.
+     * @param mapFieldOff Map field offset.
+     * @param loadFactorFieldOff Load factor field offset.
+     * @throws IOException In case of error.
+     */
+    void writeHashSet(HashSet<?> set, long mapFieldOff, long loadFactorFieldOff) throws IOException {
+        writeHashMap((HashMap<?, ?>)getObject(set, mapFieldOff), loadFactorFieldOff, true);
+    }
+
+    /**
+     * Writes {@link LinkedList}.
+     *
+     * @param list List.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    void writeLinkedList(LinkedList<?> list) throws IOException {
+        int size = list.size();
+
+        writeInt(size);
+
+        for (Object obj : list)
+            writeObject0(obj);
+    }
+
+    /**
+     * Writes {@link LinkedHashMap}.
+     *
+     * @param map Map.
+     * @param loadFactorFieldOff Load factor field offset.
+     * @param accessOrderFieldOff access order field offset.
+     * @param set Whether writing underlying map from {@link LinkedHashSet}.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    void writeLinkedHashMap(LinkedHashMap<?, ?> map, long loadFactorFieldOff, long accessOrderFieldOff, boolean set)
+        throws IOException {
+        int size = map.size();
+
+        writeInt(size);
+        writeFloat(getFloat(map, loadFactorFieldOff));
+
+        if (accessOrderFieldOff >= 0)
+            writeBoolean(getBoolean(map, accessOrderFieldOff));
+        else
+            writeBoolean(false);
+
+        for (Map.Entry<?, ?> e : map.entrySet()) {
+            writeObject0(e.getKey());
+
+            if (!set)
+                writeObject0(e.getValue());
+        }
+    }
+
+    /**
+     * Writes {@link LinkedHashSet}.
+     *
+     * @param set Set.
+     * @param mapFieldOff Map field offset.
+     * @param loadFactorFieldOff Load factor field offset.
+     * @throws IOException In case of error.
+     */
+    void writeLinkedHashSet(LinkedHashSet<?> set, long mapFieldOff, long loadFactorFieldOff) throws IOException {
+        LinkedHashMap<?, ?> map = (LinkedHashMap<?, ?>)getObject(set, mapFieldOff);
+
+        writeLinkedHashMap(map, loadFactorFieldOff, -1, true);
+    }
+
+    /**
+     * Writes {@link Date}.
+     *
+     * @param date Date.
+     * @throws IOException In case of error.
+     */
+    void writeDate(Date date) throws IOException {
+        writeLong(date.getTime());
+    }
+
+    /**
+     * Writes all non-static and non-transient field values to this stream.
+     *
+     * @param obj Object.
+     * @param fieldOffs Field offsets.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    private void writeFields(Object obj, List<T2<GridOptimizedFieldType, Long>> fieldOffs) throws IOException {
+        for (int i = 0; i < fieldOffs.size(); i++) {
+            T2<GridOptimizedFieldType, Long> t = fieldOffs.get(i);
+
+            switch (t.get1()) {
+                case BYTE:
+                    writeByte(getByte(obj, t.get2()));
+
+                    break;
+
+                case SHORT:
+                    writeShort(getShort(obj, t.get2()));
+
+                    break;
+
+                case INT:
+                    writeInt(getInt(obj, t.get2()));
+
+                    break;
+
+                case LONG:
+                    writeLong(getLong(obj, t.get2()));
+
+                    break;
+
+                case FLOAT:
+                    writeFloat(getFloat(obj, t.get2()));
+
+                    break;
+
+                case DOUBLE:
+                    writeDouble(getDouble(obj, t.get2()));
+
+                    break;
+
+                case CHAR:
+                    writeChar(getChar(obj, t.get2()));
+
+                    break;
+
+                case BOOLEAN:
+                    writeBoolean(getBoolean(obj, t.get2()));
+
+                    break;
+
+                case OTHER:
+                    writeObject0(getObject(obj, t.get2()));
+            }
+        }
+    }
+
+    /**
+     * Writes array of {@code byte}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeByteArray(byte[] arr) throws IOException {
+        out.writeByteArray(arr);
+    }
+
+    /**
+     * Writes array of {@code short}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeShortArray(short[] arr) throws IOException {
+        out.writeShortArray(arr);
+    }
+
+    /**
+     * Writes array of {@code int}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeIntArray(int[] arr) throws IOException {
+        out.writeIntArray(arr);
+    }
+
+    /**
+     * Writes array of {@code long}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeLongArray(long[] arr) throws IOException {
+        out.writeLongArray(arr);
+    }
+
+    /**
+     * Writes array of {@code float}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeFloatArray(float[] arr) throws IOException {
+        out.writeFloatArray(arr);
+    }
+
+    /**
+     * Writes array of {@code double}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeDoubleArray(double[] arr) throws IOException {
+        out.writeDoubleArray(arr);
+    }
+
+    /**
+     * Writes array of {@code char}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeCharArray(char[] arr) throws IOException {
+        out.writeCharArray(arr);
+    }
+
+    /**
+     * Writes array of {@code boolean}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeBooleanArray(boolean[] arr) throws IOException {
+        out.writeBooleanArray(arr);
+    }
+
+    /**
+     * Writes {@link String}.
+     *
+     * @param str String.
+     * @throws IOException In case of error.
+     */
+    void writeString(String str) throws IOException {
+        out.writeUTF(str);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeBoolean(boolean v) throws IOException {
+        out.writeBoolean(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeByte(int v) throws IOException {
+        out.writeByte(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeShort(int v) throws IOException {
+        out.writeShort(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeChar(int v) throws IOException {
+        out.writeChar(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeInt(int v) throws IOException {
+        out.writeInt(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeLong(long v) throws IOException {
+        out.writeLong(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeFloat(float v) throws IOException {
+        out.writeFloat(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeDouble(double v) throws IOException {
+        out.writeDouble(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(int b) throws IOException {
+        writeByte(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeBytes(String s) throws IOException {
+        out.writeBytes(s);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeChars(String s) throws IOException {
+        out.writeChars(s);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeUTF(String s) throws IOException {
+        out.writeUTF(s);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void useProtocolVersion(int ver) throws IOException {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeUnshared(Object obj) throws IOException {
+        writeObject0(obj);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void defaultWriteObject() throws IOException {
+        if (curObj == null)
+            throw new NotActiveException("Not in writeObject() call.");
+
+        writeFields(curObj, curFields);
+    }
+
+    /** {@inheritDoc} */
+    @Override public ObjectOutputStream.PutField putFields() throws IOException {
+        if (curObj == null)
+            throw new NotActiveException("Not in writeObject() call or fields already written.");
+
+        if (curPut == null)
+            curPut = new PutFieldImpl(this);
+
+        return curPut;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeFields() throws IOException {
+        if (curObj == null)
+            throw new NotActiveException("Not in writeObject() call.");
+
+        if (curPut == null)
+            throw new NotActiveException("putFields() was not called.");
+
+        for (IgniteBiTuple<GridOptimizedFieldType, Object> t : curPut.objs) {
+            switch (t.get1()) {
+                case BYTE:
+                    writeByte((Byte)t.get2());
+
+                    break;
+
+                case SHORT:
+                    writeShort((Short)t.get2());
+
+                    break;
+
+                case INT:
+                    writeInt((Integer)t.get2());
+
+                    break;
+
+                case LONG:
+                    writeLong((Long)t.get2());
+
+                    break;
+
+                case FLOAT:
+                    writeFloat((Float)t.get2());
+
+                    break;
+
+                case DOUBLE:
+                    writeDouble((Double)t.get2());
+
+                    break;
+
+                case CHAR:
+                    writeChar((Character)t.get2());
+
+                    break;
+
+                case BOOLEAN:
+                    writeBoolean((Boolean)t.get2());
+
+                    break;
+
+                case OTHER:
+                    writeObject0(t.get2());
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void reset() throws IOException {
+        out.reset();
+        handles.clear();
+
+        curObj = null;
+        curFields = null;
+        curPut = null;
+        curFieldInfoMap = null;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void flush() throws IOException {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void drain() throws IOException {
+        // No-op.
+    }
+
+    /**
+     * Returns objects that were added to handles table.
+     * Used ONLY for test purposes.
+     *
+     * @return Handled objects.
+     */
+    Object[] handledObjects() {
+        return handles.objects();
+    }
+
+    /**
+     * {@link PutField} implementation.
+     */
+    private static class PutFieldImpl extends PutField {
+        /** Stream. */
+        private final GridOptimizedObjectOutputStream out;
+
+        /** Field info map. */
+        private final Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap;
+
+        /** Values. */
+        private final IgniteBiTuple<GridOptimizedFieldType, Object>[] objs;
+
+        /**
+         * @param out Output stream.
+         * @throws IOException In case of error.
+         */
+        @SuppressWarnings("unchecked")
+        private PutFieldImpl(GridOptimizedObjectOutputStream out) {
+            this.out = out;
+
+            fieldInfoMap = out.curFieldInfoMap;
+
+            objs = new IgniteBiTuple[fieldInfoMap.size()];
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, boolean val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, byte val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, char val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, short val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, int val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, long val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, float val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, double val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, Object val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void write(ObjectOutput out) throws IOException {
+            if (out != this.out)
+                throw new IllegalArgumentException("Wrong stream.");
+
+            this.out.writeFields();
+        }
+
+        /**
+         * @param name Field name.
+         * @param val Value.
+         */
+        private void value(String name, Object val) {
+            IgniteBiTuple<Integer, GridOptimizedFieldType> info = fieldInfoMap.get(name);
+
+            objs[info.get1()] = F.t(info.get2(), val);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamRegistry.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
new file mode 100644
index 0000000..bc7a586
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
@@ -0,0 +1,215 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.gridgain.grid.util.io.*;
+
+import java.io.*;
+import java.util.concurrent.*;
+
+/**
+ * Storage for object streams.
+ */
+class GridOptimizedObjectStreamRegistry {
+    /** Holders. */
+    private static final ThreadLocal<StreamHolder> holders = new ThreadLocal<>();
+
+    /** Holders pool. */
+    private static BlockingQueue<StreamHolder> pool;
+
+    /**
+     * Ensures singleton.
+     */
+    private GridOptimizedObjectStreamRegistry() {
+        // No-op.
+    }
+
+    /**
+     * Sets streams pool size.
+     *
+     * @param size Streams pool size.
+     */
+    static void poolSize(int size) {
+        if (size > 0) {
+            pool = new LinkedBlockingQueue<>(size);
+
+            for (int i = 0; i < size; i++) {
+                boolean b = pool.offer(new StreamHolder());
+
+                assert b;
+            }
+        }
+        else
+            pool = null;
+    }
+
+    /**
+     * Gets output stream.
+     *
+     * @return Object output stream.
+     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     */
+    static GridOptimizedObjectOutputStream out() throws GridInterruptedException {
+        return holder().acquireOut();
+    }
+
+    /**
+     * Gets input stream.
+     *
+     * @return Object input stream.
+     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     */
+    static GridOptimizedObjectInputStream in() throws GridInterruptedException {
+        return holder().acquireIn();
+    }
+
+    /**
+     * Closes and releases output stream.
+     *
+     * @param out Object output stream.
+     */
+    static void closeOut(GridOptimizedObjectOutputStream out) {
+        U.close(out, null);
+
+        StreamHolder holder = holders.get();
+
+        holder.releaseOut();
+
+        if (pool != null) {
+            holders.remove();
+
+            boolean b = pool.offer(holder);
+
+            assert b;
+        }
+    }
+
+    /**
+     * Closes and releases input stream.
+     *
+     * @param in Object input stream.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    static void closeIn(GridOptimizedObjectInputStream in) {
+        U.close(in, null);
+
+        StreamHolder holder = holders.get();
+
+        holder.releaseIn();
+
+        if (pool != null) {
+            holders.remove();
+
+            boolean b = pool.offer(holder);
+
+            assert b;
+        }
+    }
+
+    /**
+     * Gets holder from pool or thread local.
+     *
+     * @return Stream holder.
+     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     */
+    private static StreamHolder holder() throws GridInterruptedException {
+        StreamHolder holder = holders.get();
+
+        if (holder == null) {
+            try {
+                holders.set(holder = pool != null ? pool.take() : new StreamHolder());
+            }
+            catch (InterruptedException e) {
+                throw new GridInterruptedException("Failed to take object stream from pool (thread interrupted).", e);
+            }
+        }
+
+        return holder;
+    }
+
+    /**
+     * Streams holder.
+     */
+    private static class StreamHolder {
+        /** Output stream. */
+        private final GridOptimizedObjectOutputStream out = createOut();
+
+        /** Input stream. */
+        private final GridOptimizedObjectInputStream in = createIn();
+
+        /** Output streams counter. */
+        private int outAcquireCnt;
+
+        /** Input streams counter. */
+        private int inAcquireCnt;
+
+        /**
+         * Gets output stream.
+         *
+         * @return Object output stream.
+         */
+        GridOptimizedObjectOutputStream acquireOut() {
+            return outAcquireCnt++ > 0 ? createOut() : out;
+        }
+
+        /**
+         * Gets input stream.
+         *
+         * @return Object input stream.
+         */
+        GridOptimizedObjectInputStream acquireIn() {
+            return inAcquireCnt++ > 0 ? createIn() : in;
+        }
+
+        /**
+         * Releases output stream.
+         */
+        void releaseOut() {
+            outAcquireCnt--;
+        }
+
+        /**
+         * Releases input stream.
+         */
+        void releaseIn() {
+            inAcquireCnt--;
+        }
+
+        /**
+         * Creates output stream.
+         *
+         * @return Object output stream.
+         */
+        private GridOptimizedObjectOutputStream createOut() {
+            try {
+                return new GridOptimizedObjectOutputStream(new GridUnsafeDataOutput(4 * 1024));
+            }
+            catch (IOException e) {
+                throw new GridRuntimeException("Failed to create object output stream.", e);
+            }
+        }
+
+        /**
+         * Creates input stream.
+         *
+         * @return Object input stream.
+         */
+        private GridOptimizedObjectInputStream createIn() {
+            try {
+                return new GridOptimizedObjectInputStream(new GridUnsafeDataInput());
+            }
+            catch (IOException e) {
+                throw new GridRuntimeException("Failed to create object input stream.", e);
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java
index a60c3a4..f7d48a5 100644
--- a/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@ -9,17 +9,17 @@
 
 package org.gridgain.client.marshaller.optimized;
 
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.marshaller.optimized.*;
 
 import java.io.*;
 import java.nio.*;
 import java.util.*;
 
 /**
- * Wrapper, that adapts {@link GridOptimizedMarshaller} to
+ * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} to
  * {@link GridClientMarshaller} interface.
  */
 public class GridClientOptimizedMarshaller implements GridClientMarshaller {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
index a7f195f..7ebc4dc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
@@ -12,11 +12,11 @@ package org.gridgain.grid.cache.affinity.rendezvous;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index b662845..8888f9b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -16,6 +16,7 @@ import org.apache.ignite.logger.*;
 import org.apache.ignite.logger.java.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.mbean.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -24,7 +25,6 @@ import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.kernal.processors.interop.*;
 import org.gridgain.grid.kernal.processors.resource.*;
 import org.gridgain.grid.kernal.processors.spring.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.segmentation.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.authentication.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 965c526..8525afe 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -15,6 +15,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.mbean.*;
 import org.apache.ignite.plugin.*;
 import org.gridgain.grid.*;
@@ -58,7 +59,6 @@ import org.gridgain.grid.kernal.processors.session.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java
index d0dacbc..8213d7e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.marshaller.optimized.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java
index d59736e..e176e45 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java
@@ -12,9 +12,9 @@ package org.gridgain.grid.kernal.managers.deployment;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.deployment.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
index 514653e..86ec14e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -12,11 +12,11 @@ package org.gridgain.grid.kernal.managers.deployment;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.deployment.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
index 4517759..7aa7096 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -11,11 +11,11 @@ package org.gridgain.grid.kernal.managers.deployment;
 
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.deployment.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java
index 0362be9..4b7df4f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal.processors.affinity;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java
index 8487bd8..b2fa13a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
-import org.gridgain.grid.marshaller.optimized.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java
index 02ec20d..45941d4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java
index 5581760..1ed7f93 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.marshaller.optimized.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index fa8801a..4ffed4a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -14,12 +14,12 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 00064a6..03fa113 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -14,13 +14,13 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.indexing.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java
index 9e56270..3004e85 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal.processors.streamer;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;
 import org.jetbrains.annotations.*;


[45/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 779ddfa56ee290d9ab688612f198dc282aa6e2cc
Parents: e04165b
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:41:14 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:41:14 2014 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |   4 +-
 .../org/apache/ignite/cluster/ClusterNode.java  |   2 +-
 .../org/apache/ignite/product/GridProduct.java  |  58 ++++
 .../ignite/product/GridProductLicense.java      | 175 ++++++++++++
 .../product/GridProductLicenseException.java    |  62 ++++
 .../ignite/product/GridProductVersion.java      | 283 +++++++++++++++++++
 .../java/org/apache/ignite/product/package.html |  15 +
 .../org/gridgain/grid/kernal/GridKernal.java    |   2 +-
 .../gridgain/grid/kernal/GridKernalContext.java |   2 +-
 .../grid/kernal/GridKernalContextImpl.java      |   2 +-
 .../gridgain/grid/kernal/GridProductImpl.java   |   4 +-
 .../grid/kernal/GridUpdateNotifier.java         |   2 +-
 .../discovery/GridDiscoveryManager.java         |   2 +-
 .../dataload/IgniteDataLoaderImpl.java          |   2 +-
 .../kernal/processors/job/GridJobProcessor.java |   2 +-
 .../license/GridLicenseProcessor.java           |   2 +-
 .../license/os/GridOsLicenseProcessor.java      |   2 +-
 .../org/gridgain/grid/product/GridProduct.java  |  58 ----
 .../grid/product/GridProductLicense.java        | 175 ------------
 .../product/GridProductLicenseException.java    |  62 ----
 .../grid/product/GridProductVersion.java        | 283 -------------------
 .../java/org/gridgain/grid/product/package.html |  15 -
 .../tcp/GridTcpCommunicationSpi.java            |   2 +-
 .../grid/spi/discovery/GridDiscoverySpi.java    |   2 +-
 .../tcp/GridTcpDiscoverySpiAdapter.java         |   2 +-
 .../tcp/internal/GridTcpDiscoveryNode.java      |   2 +-
 .../java/org/gridgain/grid/util/GridUtils.java  |   2 +-
 .../grid/kernal/GridDiscoverySelfTest.java      |   4 +-
 .../grid/kernal/GridReleaseTypeSelfTest.java    |   2 +-
 .../GridTopologyBuildVersionSelfTest.java       |   2 +-
 .../grid/kernal/GridVersionSelfTest.java        |   2 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |   2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |   2 +-
 .../grid/p2p/GridP2PClassLoadingSelfTest.java   |   4 +-
 .../product/GridProductVersionSelfTest.java     |   1 +
 .../GridAbstractDiscoverySelfTest.java          |   2 +-
 .../gridgain/testframework/GridTestNode.java    |   4 +-
 .../junits/spi/GridSpiAbstractTest.java         |   4 +-
 .../java/org/gridgain/grid/GridSpringBean.java  |   2 +-
 39 files changed, 628 insertions(+), 627 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index d98c532..f0e4fa4 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -12,13 +12,13 @@ package org.apache.ignite;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.plugin.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.dr.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.portables.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;
@@ -44,7 +44,7 @@ import java.util.concurrent.*;
  * <li>{@link IgniteFs} - functionality for distributed Hadoop-compliant in-memory file system and map-reduce.</li>
  * <li>{@link IgniteStreamer} - functionality for streaming events workflow with queries and indexes into rolling windows.</li>
  * <li>{@link IgniteScheduler} - functionality for scheduling jobs using UNIX Cron syntax.</li>
- * <li>{@link GridProduct} - functionality for licence management and update and product related information.</li>
+ * <li>{@link org.apache.ignite.product.GridProduct} - functionality for licence management and update and product related information.</li>
  * <li>{@link IgniteCompute} - functionality for executing tasks and closures on all grid nodes (inherited form {@link org.apache.ignite.cluster.ClusterGroup}).</li>
  * <li>{@link IgniteMessaging} - functionality for topic-based message exchange on all grid nodes (inherited form {@link org.apache.ignite.cluster.ClusterGroup}).</li>
  * <li>{@link IgniteEvents} - functionality for querying and listening to events on all grid nodes  (inherited form {@link org.apache.ignite.cluster.ClusterGroup}).</li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index e66fb74..9ec1962 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -10,9 +10,9 @@
 package org.apache.ignite.cluster;
 
 import org.apache.ignite.IgniteCluster;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/apache/ignite/product/GridProduct.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/GridProduct.java b/modules/core/src/main/java/org/apache/ignite/product/GridProduct.java
new file mode 100644
index 0000000..51aac73
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/GridProduct.java
@@ -0,0 +1,58 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.product;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Provides information about current release. Note that enterprise users are also
+ * able to renew license. Instance of {@code GridProduct} is obtained from grid as follows:
+ * <pre name="code" class="java">
+ * GridProduct p = GridGain.grid().product();
+ * </pre>
+ */
+public interface GridProduct {
+    /**
+     * Gets license descriptor for enterprise edition or {@code null} for open source edition.
+     *
+     * @return License descriptor.
+     */
+    @Nullable public GridProductLicense license();
+
+    /**
+     * Updates to a new license in enterprise edition. This method is no-op in open source edition.
+     *
+     * @param lic The content of the license.
+     * @throws GridProductLicenseException If license could not be updated.
+     */
+    public void updateLicense(String lic) throws GridProductLicenseException;
+
+    /**
+     * Gets product version for this release.
+     *
+     * @return Product version for this release.
+     */
+    public GridProductVersion version();
+
+    /**
+     * Copyright statement for GridGain code.
+     *
+     * @return Legal copyright statement for GridGain code.
+     */
+    public String copyright();
+
+    /**
+     * Gets latest version available for download or
+     * {@code null} if information is not available.
+     *
+     * @return Latest version string or {@code null} if information is not available.
+     */
+    @Nullable public String latestVersion();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/apache/ignite/product/GridProductLicense.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/GridProductLicense.java b/modules/core/src/main/java/org/apache/ignite/product/GridProductLicense.java
new file mode 100644
index 0000000..a505a54
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/GridProductLicense.java
@@ -0,0 +1,175 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.product;
+
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * GridGain license descriptor. GridGain license is available for
+ * information purposes and is checked automatically by GridGain software.
+ * License descriptor can be obtains by calling {@link GridProduct#license()} method.
+ * @see GridProduct#license()
+ */
+public interface GridProductLicense extends Serializable {
+    /**
+     * Gets a comma separated list of disabled subsystems.
+     *
+     * @return Comma separated list of disabled subsystems or {@code null}.
+     */
+    public String disabledSubsystems();
+
+    /**
+     * Gets license version.
+     *
+     * @return License version.
+     */
+    public String version();
+
+    /**
+     * Gets license ID.
+     *
+     * @return License ID.
+     */
+    public UUID id();
+
+    /**
+     * Version regular expression.
+     *
+     * @return Version regular expression.
+     */
+    public String versionRegexp();
+
+    /**
+     * Gets issue date.
+     *
+     * @return Issue date.
+     */
+    public Date issueDate();
+
+    /**
+     * Gets maintenance time in months. If zero - no restriction.
+     *
+     * @return Maintenance time.
+     */
+    public int maintenanceTime();
+
+    /**
+     * Gets issue organization.
+     *
+     * @return Issue organization.
+     */
+    public String issueOrganization();
+
+    /**
+     * Gets user organization.
+     *
+     * @return User organization.
+     */
+    public String userOrganization();
+
+    /**
+     * Gets license note. It may include textual description of license limitations such
+     * as as "Development Only" or "Load-Testing and Staging Only".
+     *
+     * @return License note.
+     */
+    public String licenseNote();
+
+    /**
+     * Gets user organization URL.
+     *
+     * @return User organization URL.
+     */
+    public String userWww();
+
+    /**
+     * Gets user organization e-mail.
+     *
+     * @return User organization e-mail.
+     */
+    public String userEmail();
+
+    /**
+     * Gets user organization contact name.
+     *
+     * @return User organization contact name.
+     */
+    public String userName();
+
+    /**
+     * Gets expire date.
+     *
+     * @return Expire date.
+     */
+    public Date expireDate();
+
+    /**
+     * Gets maximum number of nodes. If zero - no restriction.
+     *
+     * @return Maximum number of nodes.
+     */
+    public int maxNodes();
+
+    /**
+     * Gets maximum number of physical computers or virtual instances. If zero - no restriction.
+     * Note that individual physical computer or virtual instance is determined by number of enabled
+     * MACs on each computer or instance.
+     *
+     * @return Maximum number of computers or virtual instances.
+     */
+    public int maxComputers();
+
+    /**
+     * Gets maximum number of CPUs. If zero - no restriction.
+     *
+     * @return Maximum number of CPUs.
+     */
+    public int maxCpus();
+
+    /**
+     * Gets maximum up time in minutes. If zero - no restriction.
+     *
+     * @return Maximum up time in minutes.
+     */
+    public long maxUpTime();
+
+    /**
+     * Gets license violation grace period in minutes. If zero - no grace period.
+     *
+     * @return License violation grace period in minutes.
+     */
+    public long gracePeriod();
+
+    /**
+     * Gets license attribute name if any. Attributes in license will have to match
+     * attributes in the grid node.
+     *
+     * @return Attribute name.
+     */
+    @Nullable public String attributeName();
+
+    /**
+     * Gets value for the license attribute if any. Attributes in license will have to match
+     * attributes in the grid node.
+     *
+     * @return Attribute value.
+     */
+    @Nullable public String attributeValue();
+
+    /**
+     * Gets a comma separated list of allowed cache distribution modes.
+     *
+     * @return Allowed cache distribution modes or {@code null}.
+     */
+    @Nullable public String getCacheDistributionModes();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/apache/ignite/product/GridProductLicenseException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/GridProductLicenseException.java b/modules/core/src/main/java/org/apache/ignite/product/GridProductLicenseException.java
new file mode 100644
index 0000000..887106e
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/GridProductLicenseException.java
@@ -0,0 +1,62 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.product;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * This exception is thrown when license violation is detected.
+ */
+public class GridProductLicenseException extends GridException {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Short message. */
+    private final String shortMsg;
+
+    /**
+     * Creates new license exception with given error message.
+     *
+     * @param msg Error message.
+     * @param shortMsg Short error message presentable to the user. Note it should contain just letter and dot.
+     */
+    public GridProductLicenseException(String msg, @Nullable String shortMsg) {
+        super(msg);
+
+        this.shortMsg = shortMsg;
+    }
+
+    /**
+     * Creates new license exception with given error message and optional nested exception.
+     *
+     * @param msg Error message.
+     * @param shortMsg Short error message presentable to the user. Note it should contain just letter and dot.
+     * @param cause Optional nested exception (can be {@code null}).
+     */
+    public GridProductLicenseException(String msg, @Nullable String shortMsg, @Nullable Throwable cause) {
+        super(msg, cause);
+
+        this.shortMsg = shortMsg;
+    }
+
+    /**
+     * @return shortMessage Short error message presentable to the user. Note it should contain just letter and dot.
+     */
+    public final String shortMessage() {
+        return shortMsg;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(GridProductLicenseException.class, this, "msg", getMessage(), "shortMsg", shortMsg);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/apache/ignite/product/GridProductVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/GridProductVersion.java b/modules/core/src/main/java/org/apache/ignite/product/GridProductVersion.java
new file mode 100644
index 0000000..64d68c2
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/GridProductVersion.java
@@ -0,0 +1,283 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.product;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.text.*;
+import java.util.*;
+import java.util.regex.*;
+
+/**
+ * Represents node version.
+ * <p>
+ * Node version can be acquired via {@link org.apache.ignite.cluster.ClusterNode#version()} method.
+ * <p>
+ * Two versions are compared in the following order: major number,
+ * minor number, maintenance number, revision timestamp.
+ */
+public class GridProductVersion implements Comparable<GridProductVersion>, Externalizable {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Regexp parse pattern. */
+    private static final Pattern VER_PATTERN =
+        Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)((?!-(os|ent))-([^-]+))?(-(os|ent))?(-(\\d+))?(-([\\da-f]+))?");
+
+    /** Major version number. */
+    private byte major;
+
+    /** Minor version number. */
+    private byte minor;
+
+    /** Maintenance version number. */
+    private byte maintenance;
+
+    /** Stage of development. */
+    private String stage;
+
+    /** Revision timestamp. */
+    private long revTs;
+
+    /** Revision hash. */
+    private byte[] revHash;
+
+    /**
+     * Empty constructor required by {@link Externalizable}.
+     */
+    public GridProductVersion() {
+        // No-op.
+    }
+
+    /**
+     * @param major Major version number.
+     * @param minor Minor version number.
+     * @param maintenance Maintenance version number.
+     * @param revTs Revision timestamp.
+     * @param revHash Revision hash.
+     */
+    public GridProductVersion(byte major, byte minor, byte maintenance, long revTs, byte[] revHash) {
+        this(major, minor, maintenance, "", revTs, revHash);
+    }
+
+    /**
+     * @param major Major version number.
+     * @param minor Minor version number.
+     * @param maintenance Maintenance version number.
+     * @param stage Stage of development.
+     * @param revTs Revision timestamp.
+     * @param revHash Revision hash.
+     */
+    public GridProductVersion(byte major, byte minor, byte maintenance, String stage, long revTs, byte[] revHash) {
+        if (revHash != null && revHash.length != 20)
+            throw new IllegalArgumentException("Invalid length for SHA1 hash (must be 20): " + revHash.length);
+
+        this.major = major;
+        this.minor = minor;
+        this.maintenance = maintenance;
+        this.stage = stage;
+        this.revTs = revTs;
+        this.revHash = revHash != null ? revHash : new byte[20];
+    }
+
+    /**
+     * Gets major version number.
+     *
+     * @return Major version number.
+     */
+    public byte major() {
+        return major;
+    }
+
+    /**
+     * Gets minor version number.
+     *
+     * @return Minor version number.
+     */
+    public byte minor() {
+        return minor;
+    }
+
+    /**
+     * Gets maintenance version number.
+     *
+     * @return Maintenance version number.
+     */
+    public byte maintenance() {
+        return maintenance;
+    }
+
+    /**
+     * @return Stage of development.
+     */
+    public String stage() {
+        return stage;
+    }
+
+    /**
+     * Gets revision timestamp.
+     *
+     * @return Revision timestamp.
+     */
+    public long revisionTimestamp() {
+        return revTs;
+    }
+
+    /**
+     * Gets revision hash.
+     *
+     * @return Revision hash.
+     */
+    public byte[] revisionHash() {
+        return revHash;
+    }
+
+    /**
+     * Gets release date.
+     *
+     * @return Release date.
+     */
+    public Date releaseDate() {
+        return new Date(revTs);
+    }
+
+    /**
+     * @param major Major version number.
+     * @param minor Minor version number.
+     * @param maintenance Maintenance version number.
+     * @return {@code True} if this version is greater or equal than the one passed in.
+     */
+    public boolean greaterThanEqual(int major, int minor, int maintenance) {
+        // NOTE: Unknown version is less than any other version.
+        if (major == this.major)
+            return minor == this.minor ? this.maintenance >= maintenance : this.minor > minor;
+        else
+            return this.major > major;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int compareTo(@NotNull GridProductVersion o) {
+        // NOTE: Unknown version is less than any other version.
+        if (major == o.major) {
+            if (minor == o.minor) {
+                if (maintenance == o.maintenance)
+                    return revTs != o.revTs ? revTs < o.revTs ? -1 : 1 : 0;
+                else
+                    return maintenance < o.maintenance ? -1 : 1;
+            }
+            else
+                return minor < o.minor ? -1 : 1;
+        }
+        else
+            return major < o.major ? -1 : 1;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof GridProductVersion))
+            return false;
+
+        GridProductVersion that = (GridProductVersion)o;
+
+        return revTs == that.revTs && maintenance == that.maintenance && minor == that.minor && major == that.major;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        int res = major;
+
+        res = 31 * res + minor;
+        res = 31 * res + maintenance;
+        res = 31 * res + (int)(revTs ^ (revTs >>> 32));
+
+        return res;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeExternal(ObjectOutput out) throws IOException {
+        out.writeByte(major);
+        out.writeByte(minor);
+        out.writeByte(maintenance);
+        out.writeLong(revTs);
+        U.writeByteArray(out, revHash);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        major = in.readByte();
+        minor = in.readByte();
+        maintenance = in.readByte();
+        revTs = in.readLong();
+        revHash = U.readByteArray(in);
+    }
+
+    /** {@inheritDoc} */
+    public String toString() {
+        String revTsStr = new SimpleDateFormat("yyyyMMdd").format(new Date(revTs * 1000));
+
+        String hash = U.byteArray2HexString(revHash).toLowerCase();
+
+        hash = hash.length() > 8 ? hash.substring(0, 8) : hash;
+
+        return major + "." + minor + "." + maintenance + "#" + revTsStr + "-sha1:" + hash;
+    }
+
+    /**
+     * Tries to parse product version from it's string representation.
+     *
+     * @param verStr String representation of version.
+     * @return Product version.
+     */
+    @SuppressWarnings({"MagicConstant", "TypeMayBeWeakened"})
+    public static GridProductVersion fromString(String verStr) {
+        assert verStr != null;
+
+        if (verStr.endsWith("-DEV")) // Development version, just cut it out.
+            verStr = verStr.substring(0, verStr.length() - 4);
+
+        Matcher match = VER_PATTERN.matcher(verStr);
+
+        if (match.matches()) {
+            try {
+                byte major = Byte.parseByte(match.group(1));
+                byte minor = Byte.parseByte(match.group(2));
+                byte maintenance = Byte.parseByte(match.group(3));
+
+                String stage = "";
+
+                if (match.group(4) != null)
+                    stage = match.group(6);
+
+                long revTs = 0;
+
+                if (match.group(9) != null)
+                    revTs = Long.parseLong(match.group(10));
+
+                byte[] revHash = null;
+
+                if (match.group(11) != null)
+                    revHash = U.decodeHex(match.group(12).toCharArray());
+
+                return new GridProductVersion(major, minor, maintenance, stage, revTs, revHash);
+            }
+            catch (IllegalStateException | IndexOutOfBoundsException | NumberFormatException | GridException e) {
+                throw new IllegalStateException("Failed to parse version: " + verStr, e);
+            }
+        }
+        else
+            throw new IllegalStateException("Failed to parse version: " + verStr);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/apache/ignite/product/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/package.html b/modules/core/src/main/java/org/apache/ignite/product/package.html
new file mode 100644
index 0000000..691561c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains <b>Product</b> and <b>License</b> related functionality.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 7846a4e..544255e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -18,6 +18,7 @@ import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.mbean.*;
 import org.apache.ignite.plugin.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.dr.*;
@@ -60,7 +61,6 @@ import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
 import org.gridgain.grid.portables.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.authentication.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
index a3bc773..4ba5fe7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
@@ -12,6 +12,7 @@ package org.gridgain.grid.kernal;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.plugin.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.security.*;
 import org.gridgain.grid.kernal.managers.checkpoint.*;
@@ -51,7 +52,6 @@ import org.gridgain.grid.kernal.processors.session.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.tostring.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
index 3cb3336..1111866 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
@@ -12,6 +12,7 @@ package org.gridgain.grid.kernal;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.plugin.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.checkpoint.*;
 import org.gridgain.grid.kernal.managers.collision.*;
@@ -54,7 +55,6 @@ import org.gridgain.grid.kernal.processors.spring.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java
index ff7c2ac..0504e5a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal;
 
-import org.gridgain.grid.product.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
@@ -18,7 +18,7 @@ import java.text.*;
 import java.util.*;
 
 /**
- * {@link GridProduct} implementation.
+ * {@link org.apache.ignite.product.GridProduct} implementation.
  */
 public class GridProductImpl implements GridProduct, Externalizable {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
index 51f2e59..ebde564 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.license.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.worker.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
index 86be35b..d964e90 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
@@ -13,6 +13,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.plugin.extensions.discovery.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
@@ -22,7 +23,6 @@ import org.gridgain.grid.kernal.managers.security.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.jobmetrics.*;
 import org.gridgain.grid.kernal.processors.service.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.segmentation.*;
 import org.gridgain.grid.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
index 4742476..1c5ab8e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
@@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.dataload.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
@@ -22,7 +23,6 @@ import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.portable.*;
-import org.gridgain.grid.product.*;
 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/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
index a6914d7..55ebefd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
@@ -14,6 +14,7 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.collision.*;
@@ -22,7 +23,6 @@ import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.*;
 import org.gridgain.grid.kernal.processors.jobmetrics.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.collision.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java
index cf9fba9..da76424 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.license;
 
+import org.apache.ignite.product.*;
 import org.gridgain.grid.kernal.processors.*;
-import org.gridgain.grid.product.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java
index 8632c77..c06aca0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.license.os;
 
+import org.apache.ignite.product.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.*;
 import org.gridgain.grid.kernal.processors.license.*;
-import org.gridgain.grid.product.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/product/GridProduct.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/product/GridProduct.java b/modules/core/src/main/java/org/gridgain/grid/product/GridProduct.java
deleted file mode 100644
index 47d7f5e..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/product/GridProduct.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.product;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Provides information about current release. Note that enterprise users are also
- * able to renew license. Instance of {@code GridProduct} is obtained from grid as follows:
- * <pre name="code" class="java">
- * GridProduct p = GridGain.grid().product();
- * </pre>
- */
-public interface GridProduct {
-    /**
-     * Gets license descriptor for enterprise edition or {@code null} for open source edition.
-     *
-     * @return License descriptor.
-     */
-    @Nullable public GridProductLicense license();
-
-    /**
-     * Updates to a new license in enterprise edition. This method is no-op in open source edition.
-     *
-     * @param lic The content of the license.
-     * @throws GridProductLicenseException If license could not be updated.
-     */
-    public void updateLicense(String lic) throws GridProductLicenseException;
-
-    /**
-     * Gets product version for this release.
-     *
-     * @return Product version for this release.
-     */
-    public GridProductVersion version();
-
-    /**
-     * Copyright statement for GridGain code.
-     *
-     * @return Legal copyright statement for GridGain code.
-     */
-    public String copyright();
-
-    /**
-     * Gets latest version available for download or
-     * {@code null} if information is not available.
-     *
-     * @return Latest version string or {@code null} if information is not available.
-     */
-    @Nullable public String latestVersion();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/product/GridProductLicense.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/product/GridProductLicense.java b/modules/core/src/main/java/org/gridgain/grid/product/GridProductLicense.java
deleted file mode 100644
index e9aa72d..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/product/GridProductLicense.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.product;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * GridGain license descriptor. GridGain license is available for
- * information purposes and is checked automatically by GridGain software.
- * License descriptor can be obtains by calling {@link GridProduct#license()} method.
- * @see GridProduct#license()
- */
-public interface GridProductLicense extends Serializable {
-    /**
-     * Gets a comma separated list of disabled subsystems.
-     *
-     * @return Comma separated list of disabled subsystems or {@code null}.
-     */
-    public String disabledSubsystems();
-
-    /**
-     * Gets license version.
-     *
-     * @return License version.
-     */
-    public String version();
-
-    /**
-     * Gets license ID.
-     *
-     * @return License ID.
-     */
-    public UUID id();
-
-    /**
-     * Version regular expression.
-     *
-     * @return Version regular expression.
-     */
-    public String versionRegexp();
-
-    /**
-     * Gets issue date.
-     *
-     * @return Issue date.
-     */
-    public Date issueDate();
-
-    /**
-     * Gets maintenance time in months. If zero - no restriction.
-     *
-     * @return Maintenance time.
-     */
-    public int maintenanceTime();
-
-    /**
-     * Gets issue organization.
-     *
-     * @return Issue organization.
-     */
-    public String issueOrganization();
-
-    /**
-     * Gets user organization.
-     *
-     * @return User organization.
-     */
-    public String userOrganization();
-
-    /**
-     * Gets license note. It may include textual description of license limitations such
-     * as as "Development Only" or "Load-Testing and Staging Only".
-     *
-     * @return License note.
-     */
-    public String licenseNote();
-
-    /**
-     * Gets user organization URL.
-     *
-     * @return User organization URL.
-     */
-    public String userWww();
-
-    /**
-     * Gets user organization e-mail.
-     *
-     * @return User organization e-mail.
-     */
-    public String userEmail();
-
-    /**
-     * Gets user organization contact name.
-     *
-     * @return User organization contact name.
-     */
-    public String userName();
-
-    /**
-     * Gets expire date.
-     *
-     * @return Expire date.
-     */
-    public Date expireDate();
-
-    /**
-     * Gets maximum number of nodes. If zero - no restriction.
-     *
-     * @return Maximum number of nodes.
-     */
-    public int maxNodes();
-
-    /**
-     * Gets maximum number of physical computers or virtual instances. If zero - no restriction.
-     * Note that individual physical computer or virtual instance is determined by number of enabled
-     * MACs on each computer or instance.
-     *
-     * @return Maximum number of computers or virtual instances.
-     */
-    public int maxComputers();
-
-    /**
-     * Gets maximum number of CPUs. If zero - no restriction.
-     *
-     * @return Maximum number of CPUs.
-     */
-    public int maxCpus();
-
-    /**
-     * Gets maximum up time in minutes. If zero - no restriction.
-     *
-     * @return Maximum up time in minutes.
-     */
-    public long maxUpTime();
-
-    /**
-     * Gets license violation grace period in minutes. If zero - no grace period.
-     *
-     * @return License violation grace period in minutes.
-     */
-    public long gracePeriod();
-
-    /**
-     * Gets license attribute name if any. Attributes in license will have to match
-     * attributes in the grid node.
-     *
-     * @return Attribute name.
-     */
-    @Nullable public String attributeName();
-
-    /**
-     * Gets value for the license attribute if any. Attributes in license will have to match
-     * attributes in the grid node.
-     *
-     * @return Attribute value.
-     */
-    @Nullable public String attributeValue();
-
-    /**
-     * Gets a comma separated list of allowed cache distribution modes.
-     *
-     * @return Allowed cache distribution modes or {@code null}.
-     */
-    @Nullable public String getCacheDistributionModes();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/product/GridProductLicenseException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/product/GridProductLicenseException.java b/modules/core/src/main/java/org/gridgain/grid/product/GridProductLicenseException.java
deleted file mode 100644
index 281ec6b..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/product/GridProductLicenseException.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.product;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This exception is thrown when license violation is detected.
- */
-public class GridProductLicenseException extends GridException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Short message. */
-    private final String shortMsg;
-
-    /**
-     * Creates new license exception with given error message.
-     *
-     * @param msg Error message.
-     * @param shortMsg Short error message presentable to the user. Note it should contain just letter and dot.
-     */
-    public GridProductLicenseException(String msg, @Nullable String shortMsg) {
-        super(msg);
-
-        this.shortMsg = shortMsg;
-    }
-
-    /**
-     * Creates new license exception with given error message and optional nested exception.
-     *
-     * @param msg Error message.
-     * @param shortMsg Short error message presentable to the user. Note it should contain just letter and dot.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public GridProductLicenseException(String msg, @Nullable String shortMsg, @Nullable Throwable cause) {
-        super(msg, cause);
-
-        this.shortMsg = shortMsg;
-    }
-
-    /**
-     * @return shortMessage Short error message presentable to the user. Note it should contain just letter and dot.
-     */
-    public final String shortMessage() {
-        return shortMsg;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridProductLicenseException.class, this, "msg", getMessage(), "shortMsg", shortMsg);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/product/GridProductVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/product/GridProductVersion.java b/modules/core/src/main/java/org/gridgain/grid/product/GridProductVersion.java
deleted file mode 100644
index 1f328d4..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/product/GridProductVersion.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.product;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import java.util.regex.*;
-
-/**
- * Represents node version.
- * <p>
- * Node version can be acquired via {@link org.apache.ignite.cluster.ClusterNode#version()} method.
- * <p>
- * Two versions are compared in the following order: major number,
- * minor number, maintenance number, revision timestamp.
- */
-public class GridProductVersion implements Comparable<GridProductVersion>, Externalizable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Regexp parse pattern. */
-    private static final Pattern VER_PATTERN =
-        Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)((?!-(os|ent))-([^-]+))?(-(os|ent))?(-(\\d+))?(-([\\da-f]+))?");
-
-    /** Major version number. */
-    private byte major;
-
-    /** Minor version number. */
-    private byte minor;
-
-    /** Maintenance version number. */
-    private byte maintenance;
-
-    /** Stage of development. */
-    private String stage;
-
-    /** Revision timestamp. */
-    private long revTs;
-
-    /** Revision hash. */
-    private byte[] revHash;
-
-    /**
-     * Empty constructor required by {@link Externalizable}.
-     */
-    public GridProductVersion() {
-        // No-op.
-    }
-
-    /**
-     * @param major Major version number.
-     * @param minor Minor version number.
-     * @param maintenance Maintenance version number.
-     * @param revTs Revision timestamp.
-     * @param revHash Revision hash.
-     */
-    public GridProductVersion(byte major, byte minor, byte maintenance, long revTs, byte[] revHash) {
-        this(major, minor, maintenance, "", revTs, revHash);
-    }
-
-    /**
-     * @param major Major version number.
-     * @param minor Minor version number.
-     * @param maintenance Maintenance version number.
-     * @param stage Stage of development.
-     * @param revTs Revision timestamp.
-     * @param revHash Revision hash.
-     */
-    public GridProductVersion(byte major, byte minor, byte maintenance, String stage, long revTs, byte[] revHash) {
-        if (revHash != null && revHash.length != 20)
-            throw new IllegalArgumentException("Invalid length for SHA1 hash (must be 20): " + revHash.length);
-
-        this.major = major;
-        this.minor = minor;
-        this.maintenance = maintenance;
-        this.stage = stage;
-        this.revTs = revTs;
-        this.revHash = revHash != null ? revHash : new byte[20];
-    }
-
-    /**
-     * Gets major version number.
-     *
-     * @return Major version number.
-     */
-    public byte major() {
-        return major;
-    }
-
-    /**
-     * Gets minor version number.
-     *
-     * @return Minor version number.
-     */
-    public byte minor() {
-        return minor;
-    }
-
-    /**
-     * Gets maintenance version number.
-     *
-     * @return Maintenance version number.
-     */
-    public byte maintenance() {
-        return maintenance;
-    }
-
-    /**
-     * @return Stage of development.
-     */
-    public String stage() {
-        return stage;
-    }
-
-    /**
-     * Gets revision timestamp.
-     *
-     * @return Revision timestamp.
-     */
-    public long revisionTimestamp() {
-        return revTs;
-    }
-
-    /**
-     * Gets revision hash.
-     *
-     * @return Revision hash.
-     */
-    public byte[] revisionHash() {
-        return revHash;
-    }
-
-    /**
-     * Gets release date.
-     *
-     * @return Release date.
-     */
-    public Date releaseDate() {
-        return new Date(revTs);
-    }
-
-    /**
-     * @param major Major version number.
-     * @param minor Minor version number.
-     * @param maintenance Maintenance version number.
-     * @return {@code True} if this version is greater or equal than the one passed in.
-     */
-    public boolean greaterThanEqual(int major, int minor, int maintenance) {
-        // NOTE: Unknown version is less than any other version.
-        if (major == this.major)
-            return minor == this.minor ? this.maintenance >= maintenance : this.minor > minor;
-        else
-            return this.major > major;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int compareTo(@NotNull GridProductVersion o) {
-        // NOTE: Unknown version is less than any other version.
-        if (major == o.major) {
-            if (minor == o.minor) {
-                if (maintenance == o.maintenance)
-                    return revTs != o.revTs ? revTs < o.revTs ? -1 : 1 : 0;
-                else
-                    return maintenance < o.maintenance ? -1 : 1;
-            }
-            else
-                return minor < o.minor ? -1 : 1;
-        }
-        else
-            return major < o.major ? -1 : 1;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean equals(Object o) {
-        if (this == o)
-            return true;
-
-        if (!(o instanceof GridProductVersion))
-            return false;
-
-        GridProductVersion that = (GridProductVersion)o;
-
-        return revTs == that.revTs && maintenance == that.maintenance && minor == that.minor && major == that.major;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int hashCode() {
-        int res = major;
-
-        res = 31 * res + minor;
-        res = 31 * res + maintenance;
-        res = 31 * res + (int)(revTs ^ (revTs >>> 32));
-
-        return res;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeByte(major);
-        out.writeByte(minor);
-        out.writeByte(maintenance);
-        out.writeLong(revTs);
-        U.writeByteArray(out, revHash);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        major = in.readByte();
-        minor = in.readByte();
-        maintenance = in.readByte();
-        revTs = in.readLong();
-        revHash = U.readByteArray(in);
-    }
-
-    /** {@inheritDoc} */
-    public String toString() {
-        String revTsStr = new SimpleDateFormat("yyyyMMdd").format(new Date(revTs * 1000));
-
-        String hash = U.byteArray2HexString(revHash).toLowerCase();
-
-        hash = hash.length() > 8 ? hash.substring(0, 8) : hash;
-
-        return major + "." + minor + "." + maintenance + "#" + revTsStr + "-sha1:" + hash;
-    }
-
-    /**
-     * Tries to parse product version from it's string representation.
-     *
-     * @param verStr String representation of version.
-     * @return Product version.
-     */
-    @SuppressWarnings({"MagicConstant", "TypeMayBeWeakened"})
-    public static GridProductVersion fromString(String verStr) {
-        assert verStr != null;
-
-        if (verStr.endsWith("-DEV")) // Development version, just cut it out.
-            verStr = verStr.substring(0, verStr.length() - 4);
-
-        Matcher match = VER_PATTERN.matcher(verStr);
-
-        if (match.matches()) {
-            try {
-                byte major = Byte.parseByte(match.group(1));
-                byte minor = Byte.parseByte(match.group(2));
-                byte maintenance = Byte.parseByte(match.group(3));
-
-                String stage = "";
-
-                if (match.group(4) != null)
-                    stage = match.group(6);
-
-                long revTs = 0;
-
-                if (match.group(9) != null)
-                    revTs = Long.parseLong(match.group(10));
-
-                byte[] revHash = null;
-
-                if (match.group(11) != null)
-                    revHash = U.decodeHex(match.group(12).toCharArray());
-
-                return new GridProductVersion(major, minor, maintenance, stage, revTs, revHash);
-            }
-            catch (IllegalStateException | IndexOutOfBoundsException | NumberFormatException | GridException e) {
-                throw new IllegalStateException("Failed to parse version: " + verStr, e);
-            }
-        }
-        else
-            throw new IllegalStateException("Failed to parse version: " + verStr);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/product/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/product/package.html b/modules/core/src/main/java/org/gridgain/grid/product/package.html
deleted file mode 100644
index 691561c..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/product/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains <b>Product</b> and <b>License</b> related functionality.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index 12ea6c0..20e7569 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -14,10 +14,10 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.product.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.communication.*;
 import org.gridgain.grid.thread.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java
index a2e9278..3fc5e2f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.spi.discovery;
 
 import org.apache.ignite.cluster.*;
-import org.gridgain.grid.product.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
index 89dfa0e..70d5d89 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
@@ -13,9 +13,9 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
+import org.apache.ignite.product.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.*;
 import org.gridgain.grid.spi.discovery.tcp.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java
index 4969b97..14973cf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.spi.discovery.tcp.internal;
 
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.discovery.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index 47d115d..37642c4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -18,13 +18,13 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.mbean.*;
 import org.apache.ignite.portables.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.*;
 import org.gridgain.grid.util.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
index 5e299db..a2381e6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
@@ -14,9 +14,9 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.managers.discovery.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.gridgain.grid.product.GridProductVersion.*;
+import static org.apache.ignite.product.GridProductVersion.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
index d43ed4e..dbbf2d8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.product.*;
 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/779ddfa5/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
index 606f85c..de0de36 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
@@ -11,7 +11,7 @@ package org.gridgain.grid.kernal;
 
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.product.*;
+import org.apache.ignite.product.*;
 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/779ddfa5/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
index 06a29bb..60ce11f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.product.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
index 6020c79..6189598 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -12,10 +12,10 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.internal.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/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 e6fb1b4..d638c91 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
@@ -17,6 +17,7 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.optimized.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
@@ -29,7 +30,6 @@ 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.p2p.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.streamer.*;
 import org.gridgain.grid.streamer.window.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java
index e31c0ca..455067e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.p2p;
 
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.testframework.*;
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import static org.gridgain.grid.product.GridProductVersion.*;
+import static org.apache.ignite.product.GridProductVersion.*;
 
 /**
  * P2P test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
index 26305ab..0fd1ff6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.product;
 
+import org.apache.ignite.product.*;
 import org.gridgain.testframework.junits.common.*;
 
 import static org.junit.Assert.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
index dde721c..7e34b08 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
@@ -26,7 +26,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.gridgain.grid.product.GridProductVersion.*;
+import static org.apache.ignite.product.GridProductVersion.*;
 
 /**
  * Base discovery self-test class.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java
index 20de5dc..55a0106 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java
@@ -10,14 +10,14 @@
 package org.gridgain.testframework;
 
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.util.lang.*;
 
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import static org.gridgain.grid.product.GridProductVersion.*;
+import static org.apache.ignite.product.GridProductVersion.*;
 
 /**
  * Test node.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java
index 51540cf..4255f3e 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java
@@ -10,9 +10,9 @@
 package org.gridgain.testframework.junits.spi;
 
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.security.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.communication.*;
@@ -33,7 +33,7 @@ import java.lang.reflect.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.gridgain.grid.product.GridProductVersion.*;
+import static org.apache.ignite.product.GridProductVersion.*;
 
 /**
  * Base SPI test class.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/779ddfa5/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
index bf5e245..c164c03 100644
--- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
+++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
@@ -13,11 +13,11 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.plugin.*;
+import org.apache.ignite.product.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.dr.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.portables.*;
-import org.gridgain.grid.product.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;


[02/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
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.*;
 
 /**


[28/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 40cf54f6819e381aa16a30b9dfe11bc1d14ccaf2
Parents: 3edf39e
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:59:54 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:59:54 2014 +0300

----------------------------------------------------------------------
 .../GridOptimizedMarshallerEnumSelfTest.java    |   55 +
 .../GridOptimizedMarshallerSelfTest.java        |  437 ++++
 .../optimized/GridOptimizedMarshallerTest.java  |  815 +++++++
 .../GridOptimizedObjectStreamSelfTest.java      | 2086 ++++++++++++++++++
 .../GridTestTcpDiscoveryIpFinderAdapter.java    |   36 +
 .../ignite/marshaller/optimized/package.html    |   15 +
 .../GridOptimizedMarshallerEnumSelfTest.java    |   55 -
 .../GridOptimizedMarshallerSelfTest.java        |  437 ----
 .../optimized/GridOptimizedMarshallerTest.java  |  816 -------
 .../GridOptimizedObjectStreamSelfTest.java      | 2086 ------------------
 .../GridTestTcpDiscoveryIpFinderAdapter.java    |   36 -
 .../grid/marshaller/optimized/package.html      |   15 -
 .../testsuites/GridMarshallerSelfTestSuite.java |    2 +-
 13 files changed, 3445 insertions(+), 3446 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
new file mode 100644
index 0000000..4bf911e
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
@@ -0,0 +1,55 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import junit.framework.*;
+import org.apache.ignite.marshaller.optimized.*;
+
+/**
+ *
+ */
+public class GridOptimizedMarshallerEnumSelfTest extends TestCase {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testEnumSerialisation() throws Exception {
+        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+
+        byte[] bytes = marsh.marshal(TestEnum.Bond);
+
+        TestEnum unmarshalled = marsh.unmarshal(bytes, Thread.currentThread().getContextClassLoader());
+
+        assertEquals(TestEnum.Bond, unmarshalled);
+        assertEquals(TestEnum.Bond.desc, unmarshalled.desc);
+    }
+
+    private enum TestEnum {
+        Equity("Equity") {
+            @Override public String getTestString() {
+                return "eee";
+            }
+        },
+
+        Bond("Bond") {
+            @Override public String getTestString() {
+                return "qqq";
+            }
+        };
+
+        public final String desc;
+
+        TestEnum(String desc) {
+            this.desc = desc;
+        }
+
+        public abstract String getTestString();
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
new file mode 100644
index 0000000..aa018b4
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
@@ -0,0 +1,437 @@
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.marshaller.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.testframework.*;
+import org.gridgain.testframework.junits.common.*;
+
+import java.io.*;
+import java.util.concurrent.*;
+
+/**
+ * Optimized marshaller self test.
+ */
+@GridCommonTest(group = "Marshaller")
+public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
+    /** {@inheritDoc} */
+    @Override protected GridMarshaller createMarshaller() {
+        GridOptimizedMarshaller m = new GridOptimizedMarshaller();
+
+        m.setRequireSerializable(false);
+        m.setClassNames(F.asList(GoodMarshallable.class.getName(), NoMarshallable.class.getName()));
+
+        return m;
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testTestMarshalling() throws Exception {
+        final String msg = "PASSED";
+
+        assert msg != null;
+
+        byte[] buf = marshal(new IgniteRunnable() {
+            @Override public void run() {
+                c1.apply(msg);
+                c2.apply(msg);
+
+                c3.apply();
+                c4.reduce();
+
+                System.out.println("Test message: " + msg);
+            }
+        });
+
+        Runnable r = unmarshal(buf);
+
+        assertNotNull(r);
+
+        r.run();
+    }
+
+    /**
+     * Tests marshal self-linked object.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testMarshallingSelfLink() throws GridException {
+        SelfLink sl = new SelfLink("a string 1");
+
+        sl.link(sl);
+
+        SelfLink sl1 = unmarshal(marshal(sl));
+
+        assert sl1.link() == sl1;
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testInvalid() throws Exception {
+        GridTestUtils.assertThrows(
+            log,
+            new Callable<Object>() {
+                @Override public Object call() throws Exception {
+                    unmarshal(new byte[10]);
+
+                    return null;
+                }
+            },
+            GridException.class,
+            null
+        );
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testNested() throws Exception {
+        NestedTestObject obj = new NestedTestObject("String", 100);
+
+        NestedTestObject newObj = unmarshal(marshal(obj));
+
+        assertEquals("String", newObj.str);
+        assertEquals(100, newObj.val);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGoodMarshallable() throws Exception {
+        GoodMarshallable obj = new GoodMarshallable("String", 100);
+
+        GoodMarshallable newObj = unmarshal(marshal(obj));
+
+        assertEquals("String", newObj.getString());
+        assertEquals(100, newObj.getInt());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testBadMarshallable() throws Exception {
+        BadMarshallable obj = new BadMarshallable("String", 100);
+
+        try {
+            System.out.println(unmarshal(marshal(obj)));
+
+            assert false;
+        }
+        catch (GridException e) {
+            assert e.getCause() instanceof IOException;
+            assert e.getCause().getMessage().contains("must return the value of the field");
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void checkPerformance() throws Exception {
+        final int cnt = 5_000_000;
+
+        for (int j = 0; j < 5; j++) {
+            long start = System.nanoTime();
+
+            for (int i = 0; i < cnt; i++) {
+                String s = "string-" + i;
+
+                NoMarshallable obj = new NoMarshallable(s, i);
+
+                NoMarshallable newObj = unmarshal(marshal(obj));
+
+                assertEquals(s, newObj.getString());
+            }
+
+            X.println("Marshalling NoMarshallable duration: " + ((System.nanoTime() - start) / 1_000_000) + "ms");
+        }
+
+
+        for (int j = 0; j < 5; j++) {
+            long start = System.nanoTime();
+
+            for (int i = 0; i < cnt; i++) {
+                String s = "string-" + i;
+
+                GoodMarshallable obj = new GoodMarshallable(s, i);
+
+                GoodMarshallable newObj = unmarshal(marshal(obj));
+
+                assertEquals(s, newObj.getString());
+            }
+
+            X.println("Marshalling Marshallable duration: " + ((System.nanoTime() - start) / 1_000_000) + "ms");
+        }
+    }
+
+    /**
+     * Class for nested execution test.
+     */
+    private static class NestedTestObject implements Serializable {
+        /** */
+        private String str;
+
+        /** */
+        private int val;
+
+        /**
+         * @param str String.
+         * @param val Value.
+         */
+        private NestedTestObject(String str, int val) {
+            this.str = str;
+            this.val = val;
+        }
+
+        /** {@inheritDoc} */
+        private void writeObject(ObjectOutputStream out) throws IOException {
+            try {
+                byte[] arr = marshal(str);
+
+                out.writeInt(arr.length);
+                out.write(arr);
+
+                out.writeInt(val);
+            }
+            catch (GridException e) {
+                throw new IOException(e);
+            }
+        }
+
+        /** {@inheritDoc} */
+        @SuppressWarnings("UnusedParameters")
+        private void readObject(ObjectInputStream in) throws IOException {
+            try {
+                byte[] arr = new byte[in.readInt()];
+
+                in.read(arr);
+
+                str = unmarshal(arr);
+
+                val = in.readInt();
+            }
+            catch (GridException e) {
+                throw new IOException(e);
+            }
+        }
+    }
+
+    /** */
+    private static class TestObject2 {
+        /** */
+        private final int i;
+
+        /**
+         * Constructor for TestObject2 instances.
+         *
+         * @param i Integer value to hold.
+         */
+        private TestObject2(int i) {
+            this.i = i;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            return i == ((TestObject2)o).i;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return i;
+        }
+    }
+
+    /**
+     * Static nested class.
+     */
+    private static class TestObject {
+        /** */
+        private final TestObject2 o2;
+
+        /** The only meaningful field in the class, used for {@link #equals(Object o)} and {@link #hashCode()}. */
+        private final String str;
+
+        /**
+         * @param str String to hold.
+         * @param i Integer.
+         */
+        TestObject(String str, int i) {
+            this.str = str;
+
+            o2 = new TestObject2(i);
+        }
+
+        /**
+         * Method for accessing value of the hold string after the object is created.
+         *
+         * @return Wrapped string.
+         */
+        public String string() {
+            return str;
+        }
+
+        /**
+         * @return Object held in this wrapped.
+         */
+        public TestObject2 obj() {
+            return o2;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return 31 * o2.hashCode() + str.hashCode();
+        }
+
+        /** {@inheritDoc} */
+        @SuppressWarnings("RedundantIfStatement")
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            TestObject obj = (TestObject)o;
+
+            if (o2 != null ? !o2.equals(obj.o2) : obj.o2 != null)
+                return false;
+
+            if (str != null ? !str.equals(obj.str) : obj.str != null)
+                return false;
+
+            return true;
+        }
+    }
+
+    /**
+     * Static nested class.
+     */
+    private static class SelfLink extends TestObject {
+        /** */
+        private SelfLink link;
+
+        /**
+         * @param str String to hold.
+         */
+        SelfLink(String str) {
+            super(str, 1);
+        }
+
+        /**
+         * @return The object this link points to,.
+         */
+        public SelfLink link() {
+            return link;
+        }
+
+        /**
+         * @param link The object this link should points to,
+         */
+        public void link(SelfLink link) {
+            this.link = link;
+        }
+    }
+
+    /**
+     *
+     */
+    public static class GoodMarshallable implements GridOptimizedMarshallable, Serializable {
+        /** Class ID required by {@link GridOptimizedMarshallable}. */
+        @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
+        private static Object GG_CLASS_ID;
+
+        /** */
+        private String str;
+
+        /** */
+        private int i;
+
+        /**
+         * @param str String.
+         * @param i Integer.
+         */
+        public GoodMarshallable(String str, int i) {
+            this.str = str;
+            this.i = i;
+        }
+
+        /**
+         * @return Int value.
+         */
+        private int getInt() {
+            return i;
+        }
+
+        /**
+         * @return String value
+         */
+        private String getString() {
+            return str;
+        }
+
+        /** {@inheritDoc} */
+        @Override public Object ggClassId() {
+            return GG_CLASS_ID;
+        }
+    }
+
+    /**
+     *
+     */
+    public static class NoMarshallable implements Serializable {
+        /** */
+        private String str;
+
+        /** */
+        private int i;
+
+        /**
+         * @param str String.
+         * @param i Integer.
+         */
+        public NoMarshallable(String str, int i) {
+            this.str = str;
+            this.i = i;
+        }
+
+        /**
+         * @return Int value.
+         */
+        private int getInt() {
+            return i;
+        }
+
+        /**
+         * @return String value
+         */
+        private String getString() {
+            return str;
+        }
+    }
+
+    /**
+     *
+     */
+    private static class BadMarshallable extends TestObject implements GridOptimizedMarshallable {
+        /** Class ID required by {@link GridOptimizedMarshallable}. */
+        @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
+        private static Object GG_CLASS_ID;
+
+        /**
+         * @param str String.
+         * @param i Integer.
+         */
+        private BadMarshallable(String str, int i) {
+            super(str, i);
+        }
+
+        /** {@inheritDoc} */
+        @Override public Object ggClassId() {
+            return new Object();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
new file mode 100644
index 0000000..d394039
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -0,0 +1,815 @@
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.marshaller.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.marshaller.*;
+import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
+import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.gridgain.testframework.junits.common.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.lang.reflect.Proxy;
+import java.net.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ *
+ */
+public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
+    /**
+     * Tests ability to marshal non-serializable objects.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testNonSerializable() throws GridException {
+        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+
+        marsh.setRequireSerializable(false);
+
+        NonSerializable outObj = marsh.unmarshal(marsh.marshal(new NonSerializable(null)), null);
+
+        outObj.checkAfterUnmarshalled();
+    }
+
+    /**
+     * Tests ability to marshal non-serializable objects.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testNonSerializable1() throws GridException {
+        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+
+        marsh.setRequireSerializable(false);
+
+        byte[] bytes = marsh.marshal(new GridTcpDiscoveryVmIpFinder());
+
+        GridTcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null);
+
+        assertFalse(ipFinder.isShared());
+
+        ipFinder = marsh.unmarshal(marsh.marshal(new GridTcpDiscoveryVmIpFinder(true)), null);
+
+        assertTrue(ipFinder.isShared());
+    }
+
+    /**
+     * Tests ability to marshal non-serializable objects.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testNonSerializable2() throws GridException {
+        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+
+        marsh.setRequireSerializable(false);
+
+        GridTcpDiscoveryIpFinderAdapter ipFinder = new GridTcpDiscoveryIpFinderAdapter() {
+            @Override public Collection<InetSocketAddress> getRegisteredAddresses() {
+                return null;
+            }
+
+            @Override public void registerAddresses(Collection<InetSocketAddress> addrs) {
+                //No-op.
+            }
+
+            @Override public void unregisterAddresses(Collection<InetSocketAddress> addrs) {
+                //No-op.
+            }
+        };
+
+        ipFinder.setShared(false);
+
+        byte[] bytes = marsh.marshal(ipFinder);
+
+        ipFinder = marsh.unmarshal(bytes, null);
+
+        assertFalse(ipFinder.isShared());
+    }
+
+    /**
+     * Tests ability to marshal non-serializable objects.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testNonSerializable3() throws GridException {
+        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+
+        marsh.setRequireSerializable(false);
+
+        byte[] bytes = marsh.marshal(new GridTestTcpDiscoveryIpFinderAdapter());
+
+        GridTcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null);
+
+        assertFalse(ipFinder.isShared());
+    }
+
+     /**
+     * Tests ability to marshal non-serializable objects.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testNonSerializable4() throws GridException {
+        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+
+        marsh.setRequireSerializable(false);
+
+        byte[] bytes = marsh.marshal(new GridMarshallerTestInheritedBean());
+
+        info(Arrays.toString(bytes));
+
+        GridMarshallerTestInheritedBean bean = marsh.unmarshal(bytes, null);
+
+        assertTrue(bean.isFlag());
+    }
+
+     /**
+     * Tests ability to marshal non-serializable objects.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testNonSerializable5() throws GridException {
+        GridMarshaller marsh = new GridOptimizedMarshaller();
+
+        byte[] bytes = marsh.marshal(true);
+
+        Boolean val = marsh.unmarshal(bytes, null);
+
+        assertTrue(val);
+    }
+
+    /**
+     * Tests ability to marshal serializable objects.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testSerializable() throws GridException {
+        GridMarshaller marsh = new GridOptimizedMarshaller();
+
+        SomeSerializable outObj = marsh.unmarshal(marsh.marshal(new SomeSerializable(null)), null);
+
+        outObj.checkAfterUnmarshalled();
+    }
+
+    /**
+     * @throws GridException If failed.
+     */
+    public void testSerializableAfterChangingValue() throws GridException {
+        GridMarshaller marsh = new GridOptimizedMarshaller();
+
+        SomeSimpleSerializable newObj = new SomeSimpleSerializable();
+
+        assert(newObj.flag);
+
+        newObj.setFlagValue(false);
+
+        assert(! newObj.flag);
+
+        SomeSimpleSerializable outObj = marsh.unmarshal(marsh.marshal(newObj), null);
+
+        assert (! outObj.flag);
+    }
+
+    /**
+     * Tests ability to marshal externalizable objects.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testExternalizable() throws GridException {
+        GridMarshaller marsh = new GridOptimizedMarshaller();
+
+        ExternalizableA outObj = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, true)), null);
+        ExternalizableA outObj1 = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, false)), null);
+
+        assertNotNull(outObj);
+        assertNotNull(outObj1);
+    }
+
+    /**
+     * Tests {@link GridOptimizedMarshaller#setRequireSerializable(boolean)}.
+     */
+    public void testRequireSerializable() {
+        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+
+        marsh.setRequireSerializable(true);
+
+        try {
+            marsh.marshal(new NonSerializable(null));
+
+            fail();
+        }
+        catch (GridException ignore) {
+            // No-op.
+        }
+    }
+
+    /**
+     * Tests {@link GridOptimizedMarshaller#setClassNames(List)}.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testUserPreregisteredNames() throws GridException {
+        Object obj = new SomeSerializable(null);
+
+        // Clear caches.
+        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
+        GridOptimizedClassResolver.userClasses(null, null);
+
+        GridMarshaller marsh = new GridOptimizedMarshaller();
+
+        int size1 = marsh.marshal(obj).length;
+
+        // Clear caches.
+        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
+        GridOptimizedClassResolver.userClasses(null, null);
+
+        GridOptimizedMarshaller marshPreregistered = new GridOptimizedMarshaller();
+
+        marshPreregistered.setClassNames(Arrays.asList(SomeSerializable.class.getName()));
+
+        int size2 = marshPreregistered.marshal(obj).length;
+
+        assertTrue(size1 > size2);
+    }
+
+    /**
+     * Tests {@link GridOptimizedMarshaller#setClassNames(List)}.
+     *
+     * @throws GridException If marshalling failed.
+     * @throws IOException If an I/O error occurs.
+     */
+    public void testUserPreregisteredNamesPath() throws GridException, IOException {
+        Object obj = new SomeSerializable(null);
+
+        // Clear caches.
+        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
+        GridOptimizedClassResolver.userClasses(null, null);
+
+        GridMarshaller marsh = new GridOptimizedMarshaller();
+
+        int size1 = marsh.marshal(obj).length;
+
+        // Clear caches.
+        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
+        GridOptimizedClassResolver.userClasses(null, null);
+
+        GridOptimizedMarshaller marshPreregistered = new GridOptimizedMarshaller();
+
+        File namesFile = File.createTempFile("gg-", null);
+
+        U.writeStringToFile(namesFile, SomeSerializable.class.getName(), "UTF-8");
+
+        marshPreregistered.setClassNamesPath(namesFile.getAbsolutePath());
+
+        int size2 = marshPreregistered.marshal(obj).length;
+
+        assertTrue(size1 > size2);
+    }
+
+    /**
+     * Tests {@link Proxy}.
+     *
+     * @throws GridException If marshalling failed.
+     */
+    public void testProxy() throws GridException {
+        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+
+        marsh.setRequireSerializable(false);
+
+        SomeItf inItf = (SomeItf)Proxy.newProxyInstance(
+            GridOptimizedMarshallerTest.class.getClassLoader(), new Class[] {SomeItf.class},
+            new InvocationHandler() {
+                private NonSerializable obj = new NonSerializable(null);
+
+                @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
+                    obj.checkAfterUnmarshalled();
+
+                    return 17;
+                }
+            }
+        );
+
+        SomeItf outItf = marsh.unmarshal(marsh.marshal(inItf), null);
+
+        assertEquals(outItf.checkAfterUnmarshalled(), 17);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testDescriptorCache() throws Exception {
+        try {
+            Ignite ignite = startGridsMultiThreaded(2);
+
+            String taskClsName = "org.gridgain.grid.tests.p2p.GridSingleSplitTestTask";
+            String jobClsName = "org.gridgain.grid.tests.p2p.GridSingleSplitTestTask$GridSingleSplitTestJob";
+
+            ClassLoader ldr = getExternalClassLoader();
+
+            Class<? extends ComputeTask<?, ?>> taskCls = (Class<? extends ComputeTask<?, ?>>)ldr.loadClass(taskClsName);
+            Class<? extends ComputeTask<?, ?>> jobCls = (Class<? extends ComputeTask<?, ?>>)ldr.loadClass(jobClsName);
+
+            ignite.compute().localDeployTask(taskCls, ldr);
+
+            ignite.compute().execute(taskClsName, 2);
+
+            ConcurrentMap<Class<?>, GridOptimizedClassDescriptor> cache =
+                U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE");
+
+            assertTrue(cache.containsKey(jobCls));
+
+            ignite.compute().undeployTask(taskClsName);
+
+            // Wait for undeploy.
+            Thread.sleep(1000);
+
+            assertFalse(cache.containsKey(jobCls));
+        }
+        finally {
+            stopAllGrids();
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testPerformance() throws Exception {
+        System.gc();
+
+        checkPerformance(10000, 4);
+    }
+
+    /**
+     * @param cnt Number of marshalling attempts.
+     * @param tries Number of retries.
+     * @throws Exception If failed.
+     */
+    private void checkPerformance(int cnt, int tries) throws Exception {
+        GridMarshaller marsh = new GridOptimizedMarshaller();
+
+        for (int j = 0; j < tries; j++) {
+            System.gc();
+
+            long start = System.currentTimeMillis();
+
+            for (int i = 0; i < cnt; i++) {
+                TestCacheKey key = new TestCacheKey("key", "id");
+
+                TestCacheKey outKey = marsh.unmarshal(marsh.marshal(key), null);
+
+                assert key.equals(outKey);
+                assert key.hashCode() == outKey.hashCode();
+            }
+
+            info("Time non-serializable: " + (System.currentTimeMillis() - start));
+
+            System.gc();
+
+            start = System.currentTimeMillis();
+
+            for (int i = 0; i < cnt; i++) {
+                TestCacheKeySerializable key1 = new TestCacheKeySerializable("key", "id");
+
+                TestCacheKeySerializable outKey = marsh.unmarshal(marsh.marshal(key1), null);
+
+                assert key1.equals(outKey);
+                assert key1.hashCode() == outKey.hashCode();
+            }
+
+            info("Time serializable: " + (System.currentTimeMillis() - start));
+
+            System.gc();
+
+            start = System.currentTimeMillis();
+
+            for (int i = 0; i < cnt; i++) {
+                TestCacheKeyExternalizable key2 = new TestCacheKeyExternalizable("key", "id");
+
+                TestCacheKeyExternalizable outKey = marsh.unmarshal(marsh.marshal(key2), null);
+
+                assert key2.equals(outKey);
+                assert key2.hashCode() == outKey.hashCode();
+            }
+
+            info("Time externalizable: " + (System.currentTimeMillis() - start));
+
+            info(">>>");
+        }
+
+        info(">>> Finished performance check <<<");
+    }
+
+    /**
+     * Some non-serializable class.
+     */
+    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","FieldMayBeStatic"})
+    private static class NonSerializableA {
+        /** */
+        private final long longVal = 0x33445566778899AAL;
+
+        /** */
+        protected Short shortVal = (short)0xAABB;
+
+        /** */
+        public String[] strArr = {"AA","BB"};
+
+        /** */
+        public boolean flag1 = true;
+
+        /** */
+        public boolean flag2;
+
+        /** */
+        public Boolean flag3;
+
+        /** */
+        public Boolean flag4 = true;
+
+        /** */
+        public Boolean flag5 = false;
+
+        /** */
+        private transient int intVal = 0xAABBCCDD;
+
+        /**
+         * @param strArr Array.
+         * @param shortVal Short value.
+         */
+        @SuppressWarnings( {"UnusedDeclaration"})
+        private NonSerializableA(@Nullable String[] strArr, @Nullable Short shortVal) {
+            // No-op.
+        }
+
+        /**
+         * Checks correctness of the state after unmarshalling.
+         */
+        void checkAfterUnmarshalled() {
+            assertEquals(longVal, 0x33445566778899AAL);
+
+            assertEquals(shortVal.shortValue(), (short)0xAABB);
+
+            assertTrue(Arrays.equals(strArr, new String[] {"AA","BB"}));
+
+            assertEquals(intVal, 0);
+
+            assertTrue(flag1);
+            assertFalse(flag2);
+            assertNull(flag3);
+            assertTrue(flag4);
+            assertFalse(flag5);
+        }
+    }
+
+    /**
+     * Some non-serializable class.
+     */
+    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","PackageVisibleInnerClass"})
+    static class NonSerializableB extends NonSerializableA {
+        /** */
+        public Short shortVal = 0x1122;
+
+        /** */
+        public long longVal = 0x8877665544332211L;
+
+        /** */
+        private transient NonSerializableA[] aArr = {
+            new NonSerializableA(null, null),
+            new NonSerializableA(null, null),
+            new NonSerializableA(null, null)
+        };
+
+        /** */
+        protected Double doubleVal = 123.456;
+
+        /**
+         * Just to eliminate the default constructor.
+         */
+        private NonSerializableB() {
+            super(null, null);
+        }
+
+        /**
+         * Checks correctness of the state after unmarshalling.
+         */
+        @Override void checkAfterUnmarshalled() {
+            super.checkAfterUnmarshalled();
+
+            assertEquals(shortVal.shortValue(), 0x1122);
+
+            assertEquals(longVal, 0x8877665544332211L);
+
+            assertNull(aArr);
+
+            assertEquals(doubleVal, 123.456);
+        }
+    }
+
+    /**
+     * Some non-serializable class.
+     */
+    @SuppressWarnings( {"TransientFieldInNonSerializableClass","PublicField"})
+    private static class NonSerializable extends NonSerializableB {
+        /** */
+        private int idVal = -17;
+
+        /** */
+        private final NonSerializableA aVal = new NonSerializableB();
+
+        /** */
+        private transient NonSerializableB bVal = new NonSerializableB();
+
+        /** */
+        private NonSerializableA[] bArr = new NonSerializableA[] {
+            new NonSerializableB(),
+            new NonSerializableA(null, null)
+        };
+
+        /** */
+        public float floatVal = 567.89F;
+
+        /**
+         * Just to eliminate the default constructor.
+         *
+         * @param aVal Unused.
+         */
+        @SuppressWarnings( {"UnusedDeclaration"})
+        private NonSerializable(NonSerializableA aVal) {
+        }
+
+        /**
+         * Checks correctness of the state after unmarshalling.
+         */
+        @Override void checkAfterUnmarshalled() {
+            super.checkAfterUnmarshalled();
+
+            assertEquals(idVal, -17);
+
+            aVal.checkAfterUnmarshalled();
+
+            assertNull(bVal);
+
+            for (NonSerializableA a : bArr) {
+                a.checkAfterUnmarshalled();
+            }
+
+            assertEquals(floatVal, 567.89F);
+        }
+    }
+
+    /**
+     * Some serializable class.
+     */
+    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","PackageVisibleInnerClass"})
+    static class ForSerializableB {
+        /** */
+        public Short shortVal = 0x1122;
+
+        /** */
+        public long longVal = 0x8877665544332211L;
+
+        /** */
+        private transient NonSerializableA[] aArr;
+
+        /** */
+        private transient String strVal = "abc";
+
+        /** */
+        protected Double doubleVal = 123.456;
+
+        /**
+         */
+        protected void init() {
+            shortVal = 0x1122;
+
+            longVal = 0x8877665544332211L;
+
+            aArr = new NonSerializableA[] {
+                new NonSerializableA(null, null),
+                new NonSerializableA(null, null),
+                new NonSerializableA(null, null)
+            };
+        }
+
+        /**
+         * Checks correctness of the state after unmarshalling.
+         */
+        void checkAfterUnmarshalled() {
+            assertEquals(shortVal.shortValue(), 0x1122);
+
+            assertEquals(longVal, 0x8877665544332211L);
+
+            assertNull(aArr);
+
+            assertNull(strVal);
+
+            assertEquals(doubleVal, 123.456);
+        }
+    }
+
+    /**
+     * Some serializable class.
+     */
+    private static class SomeSimpleSerializable extends ComputeJobAdapter {
+        /** */
+        private boolean flag = true;
+
+        /**
+         * @param newFlagVal - The new value of flag field.
+         */
+        public void setFlagValue(boolean newFlagVal) {
+            flag = newFlagVal;
+        }
+
+        /** {@inheritDoc} */
+        @Override public Object execute() throws GridException {
+            assert false;
+
+            return null;
+        }
+    }
+    /**
+     * Some serializable class.
+     */
+    private static class SomeSerializable extends ForSerializableB implements Serializable {
+        /**
+         * Just to eliminate the default constructor.
+         *
+         * @param id Unused.
+         */
+        @SuppressWarnings( {"UnusedDeclaration"})
+        private SomeSerializable(Long id) {
+            init();
+        }
+    }
+
+    /**
+     */
+    private static interface SomeItf {
+        /**
+         * @return Check result.
+         */
+        int checkAfterUnmarshalled();
+    }
+
+    /**
+     * Some externalizable class.
+     */
+    @SuppressWarnings( {"UnusedDeclaration", "PublicField"})
+    private static class ExternalizableA implements Externalizable {
+        /** */
+        private boolean boolVal;
+
+        /** */
+        public String[] strArr;
+
+        /** No-arg constructor is required by externalization.  */
+        public ExternalizableA() {
+            // No-op.
+        }
+
+        /**
+         *
+         * @param strArr String array.
+         * @param boolVal Boolean value.
+         */
+        private ExternalizableA(String[] strArr, boolean boolVal) {
+            this.strArr = strArr;
+            this.boolVal = boolVal;
+        }
+
+        /** {@inheritDoc} */
+        @Override public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeBoolean(false);
+            out.writeBoolean(false);
+            out.writeBoolean(false);
+            out.writeBoolean(false);
+            out.writeBoolean(false);
+            out.writeBoolean(false);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            boolVal = in.readBoolean();
+            in.readBoolean();
+            in.readBoolean();
+            in.readBoolean();
+            in.readBoolean();
+            in.readBoolean();
+        }
+    }
+
+    /**
+     *
+     */
+    private static class TestCacheKey implements Serializable {
+        /** */
+        private String key;
+
+        /** */
+        @SuppressWarnings({"UnusedDeclaration"})
+        private String terminalId;
+
+        /**
+         * @param key Key.
+         * @param terminalId Some ID.
+         */
+        TestCacheKey(String key, String terminalId) {
+            this.key = key;
+            this.terminalId = terminalId;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return key.hashCode();
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object obj) {
+            return obj instanceof TestCacheKey && key.equals(((TestCacheKey)obj).key);
+        }
+    }
+
+    /**
+     *
+     */
+    private static class TestCacheKeySerializable implements Serializable {
+        /** */
+        private String key;
+
+        /** */
+        @SuppressWarnings({"UnusedDeclaration"})
+        private String terminalId;
+
+        /**
+         * @param key Key.
+         * @param terminalId Some ID.
+         */
+        TestCacheKeySerializable(String key, String terminalId) {
+            this.key = key;
+            this.terminalId = terminalId;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return key.hashCode();
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object obj) {
+            return obj instanceof TestCacheKeySerializable && key.equals(((TestCacheKeySerializable)obj).key);
+        }
+    }
+
+    /**
+     *
+     */
+    private static class TestCacheKeyExternalizable implements Externalizable {
+        /** */
+        private String key;
+
+        /** */
+        private String terminalId;
+
+        /**
+         *
+         */
+        public TestCacheKeyExternalizable() {
+            // No-op.
+        }
+
+        /**
+         * @param key Key.
+         * @param terminalId Some ID.
+         */
+        TestCacheKeyExternalizable(String key, String terminalId) {
+            this.key = key;
+            this.terminalId = terminalId;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return key.hashCode();
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object obj) {
+            return obj instanceof TestCacheKeyExternalizable && key.equals(((TestCacheKeyExternalizable)obj).key);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void writeExternal(ObjectOutput out) throws IOException {
+            U.writeString(out, key);
+            U.writeString(out, terminalId);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            key = U.readString(in);
+            terminalId = U.readString(in);
+        }
+    }
+}


[18/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: a50fccdda8e1c9fb8831182e097a1a917058c8b9
Parents: 580b2aa
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:53:27 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:53:32 2014 +0300

----------------------------------------------------------------------
 examples/config/example-cache.xml               |    2 +-
 examples/config/example-compute.xml             |    2 +-
 examples/config/example-streamer.xml            |    2 +-
 examples/config/filesystem/example-ggfs.xml     |    2 +-
 .../MemcacheRestExampleNodeStartup.java         |    2 +-
 .../examples/misc/springbean/spring-bean.xml    |    2 +-
 .../GridOptimizedMarshallerAopTest.java         |    1 +
 .../java/org/apache/ignite/IgniteCompute.java   |    3 +-
 .../configuration/IgniteConfiguration.java      |    3 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |    2 +-
 .../ignite/marshaller/GridMarshaller.java       |    3 +-
 .../marshaller/jdk/GridJdkMarshaller.java       |    3 +-
 .../optimized/GridOptimizedClassDescriptor.java | 1032 +++++++++++++++++
 .../optimized/GridOptimizedClassResolver.java   |  469 ++++++++
 .../optimized/GridOptimizedFieldType.java       |   42 +
 .../optimized/GridOptimizedMarshallable.java    |   57 +
 .../optimized/GridOptimizedMarshaller.java      |  408 +++++++
 .../optimized/GridOptimizedMarshallerUtils.java |  450 ++++++++
 .../GridOptimizedObjectInputStream.java         | 1008 +++++++++++++++++
 .../GridOptimizedObjectOutputStream.java        |  831 ++++++++++++++
 .../GridOptimizedObjectStreamRegistry.java      |  215 ++++
 .../GridClientOptimizedMarshaller.java          |    4 +-
 .../GridCacheRendezvousAffinityFunction.java    |    2 +-
 .../org/gridgain/grid/kernal/GridGainEx.java    |    2 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |    2 +-
 .../org/gridgain/grid/kernal/GridTopic.java     |    2 +-
 .../deployment/GridDeploymentLocalStore.java    |    2 +-
 .../GridDeploymentPerLoaderStore.java           |    2 +-
 .../GridDeploymentPerVersionStore.java          |    2 +-
 .../affinity/GridAffinityMessage.java           |    2 +-
 .../processors/cache/GridCacheReturn.java       |    2 +-
 .../processors/cache/GridCacheTxEntry.java      |    2 +-
 .../processors/cache/GridCacheVersion.java      |    2 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |    2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |    2 +-
 .../streamer/GridStreamerExecutionBatch.java    |    2 +-
 .../optimized/GridOptimizedClassDescriptor.java | 1035 ------------------
 .../optimized/GridOptimizedClassResolver.java   |  471 --------
 .../optimized/GridOptimizedFieldType.java       |   42 -
 .../optimized/GridOptimizedMarshallable.java    |   57 -
 .../optimized/GridOptimizedMarshaller.java      |  410 -------
 .../optimized/GridOptimizedMarshallerUtils.java |  450 --------
 .../GridOptimizedObjectInputStream.java         | 1008 -----------------
 .../GridOptimizedObjectOutputStream.java        |  831 --------------
 .../GridOptimizedObjectStreamRegistry.java      |  215 ----
 modules/core/src/test/config/example-cache.xml  |    2 +-
 modules/core/src/test/config/ggfs-loopback.xml  |    2 +-
 .../core/src/test/config/ggfs-no-endpoint.xml   |    2 +-
 modules/core/src/test/config/ggfs-shmem.xml     |    2 +-
 .../src/test/config/io-manager-benchmark.xml    |    2 +-
 modules/core/src/test/config/jobs-load-base.xml |    2 +-
 .../core/src/test/config/load/dsi-load-base.xml |    2 +-
 .../src/test/config/spring-start-nodes-attr.xml |    2 +-
 .../core/src/test/config/spring-start-nodes.xml |    2 +-
 .../grid/GridExternalizableAbstractTest.java    |    2 +-
 .../grid/ggfs/GridGgfsPathSelfTest.java         |    2 +-
 .../GridFailoverTaskWithPredicateSelfTest.java  |    2 +-
 .../kernal/GridJobMasterLeaveAwareSelfTest.java |    2 +-
 .../grid/kernal/GridJobStealingSelfTest.java    |    2 +-
 .../grid/kernal/GridLifecycleAwareSelfTest.java |    2 +-
 ...ectionLocalJobMultipleArgumentsSelfTest.java |    2 +-
 .../GridTaskExecutionContextSelfTest.java       |    2 +-
 .../managers/GridManagerStopSelfTest.java       |    2 +-
 .../cache/GridCacheAbstractSelfTest.java        |    2 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |    2 +-
 .../cache/GridCacheDeploymentSelfTest.java      |    2 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |    2 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |    2 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    2 +-
 .../GridCacheReferenceCleanupSelfTest.java      |    2 +-
 .../GridCacheAbstractJobExecutionTest.java      |    2 +-
 .../GridCachePreloadLifecycleAbstractTest.java  |    2 +-
 .../near/GridCacheNearEvictionSelfTest.java     |    2 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |    2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    2 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |    2 +-
 .../closure/GridClosureProcessorSelfTest.java   |    2 +-
 .../continuous/GridEventConsumeSelfTest.java    |    2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |    2 +-
 .../GridDataLoaderProcessorSelfTest.java        |    2 +-
 .../ggfs/GridGgfsFileInfoSelfTest.java          |    2 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |    2 +-
 .../streamer/GridStreamerSelfTest.java          |    2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    2 +-
 .../GridMarshallerPerformanceTest.java          |    2 +-
 .../GridOptimizedMarshallerEnumSelfTest.java    |    1 +
 .../GridOptimizedMarshallerSelfTest.java        |    1 +
 .../optimized/GridOptimizedMarshallerTest.java  |    1 +
 .../GridOptimizedObjectStreamSelfTest.java      |    1 +
 .../grid/messaging/GridMessagingSelfTest.java   |    2 +-
 .../grid/spi/GridTcpSpiForwardingSelfTest.java  |    2 +-
 ...GridTcpDiscoveryMarshallerCheckSelfTest.java |    2 +-
 .../util/future/GridFinishedFutureSelfTest.java |    2 +-
 .../testframework/junits/GridAbstractTest.java  |    2 +-
 .../testframework/junits/GridTestResources.java |    2 +-
 .../core/src/test/webapp/META-INF/gg-config.xml |    2 +-
 .../child/GridHadoopExternalProcessStarter.java |    2 +-
 ...GridHadoopExternalCommunicationSelfTest.java |    2 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |    2 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |    2 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    2 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |    2 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |    2 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    2 +-
 .../h2/opt/GridLuceneIndexLoadTest.java         |    2 +-
 .../h2indexing/GridH2IndexingSpiLoadTest.java   |    2 +-
 .../test/resources/spring-ping-pong-partner.xml |    2 +-
 .../GridSpringBeanSerializationSelfTest.java    |    2 +-
 108 files changed, 4603 insertions(+), 4609 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index b9e95e2..f7024c0 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -36,7 +36,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/examples/config/example-compute.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-compute.xml b/examples/config/example-compute.xml
index 6173a46..ffd6b04 100644
--- a/examples/config/example-compute.xml
+++ b/examples/config/example-compute.xml
@@ -30,7 +30,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/examples/config/example-streamer.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml
index eb86834..1c01e14 100644
--- a/examples/config/example-streamer.xml
+++ b/examples/config/example-streamer.xml
@@ -44,7 +44,7 @@
         <property name="localHost" value="127.0.0.1"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/examples/config/filesystem/example-ggfs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml
index a709b9a..c33c806 100644
--- a/examples/config/filesystem/example-ggfs.xml
+++ b/examples/config/filesystem/example-ggfs.xml
@@ -54,7 +54,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index ac3842a..8322759 100644
--- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@ -11,9 +11,9 @@ package org.gridgain.examples.misc.client.memcache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.spi.indexing.h2.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml
index eba9308..23c562e 100644
--- a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml
+++ b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml
@@ -33,7 +33,7 @@
                 <property name="peerClassLoadingEnabled" value="true"/>
 
                 <property name="marshaller">
-                    <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+                    <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                         <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                         <property name="requireSerializable" value="false"/>
                     </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java
index e63a929..80c596f 100644
--- a/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java
+++ b/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java
@@ -13,6 +13,7 @@ import org.apache.ignite.compute.gridify.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
index 01d3800..4ea1d8a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@ -13,7 +13,6 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.failover.*;
 import org.gridgain.grid.spi.loadbalancing.*;
 import org.jetbrains.annotations.*;
@@ -47,7 +46,7 @@ import java.util.concurrent.*;
  * not have any alive nodes), then {@link GridEmptyProjectionException} will be thrown out of result future.
  * <h1 class="header">Serializable</h1>
  * Also note that {@link Runnable} and {@link Callable} implementations must support serialization as required
- * by the configured marshaller. For example, {@link GridOptimizedMarshaller} requires {@link Serializable}
+ * by the configured marshaller. For example, {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} requires {@link Serializable}
  * objects by default, but can be configured not to. Generally speaking objects that implement {@link Serializable}
  * or {@link Externalizable} will perform better. For {@link Runnable} and {@link Callable} interfaces
  * GridGain provides analogous {@link org.apache.ignite.lang.IgniteRunnable} and {@link org.apache.ignite.lang.IgniteCallable} classes which are

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index d7dc2c1..2254ffb 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -25,7 +25,6 @@ import org.gridgain.grid.dr.hub.sender.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.segmentation.*;
@@ -1455,7 +1454,7 @@ public class IgniteConfiguration {
 
     /**
      * Should return an instance of marshaller to use in grid. If not provided,
-     * {@link GridOptimizedMarshaller} will be used on Java HotSpot VM, and
+     * {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} will be used on Java HotSpot VM, and
      * {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller} will be used on other VMs.
      *
      * @return Marshaller to use in grid.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
index 604ad36..5f02da9 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
@@ -9,7 +9,7 @@
 
 package org.apache.ignite.lang;
 
-import org.gridgain.grid.marshaller.optimized.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
index 9c8685f..d0b8826 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
@@ -10,7 +10,6 @@
 package org.apache.ignite.marshaller;
 
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
@@ -22,7 +21,7 @@ import java.io.*;
  * <p>
  * Gridgain provides the following {@code GridMarshaller} implementations:
  * <ul>
- * <li>{@link GridOptimizedMarshaller} - default</li>
+ * <li>{@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} - default</li>
  * <li>{@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller}</li>
  * </ul>
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
index da75a2e..d0c3246 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
@@ -11,7 +11,6 @@ package org.apache.ignite.marshaller.jdk;
 
 import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 
@@ -24,7 +23,7 @@ import java.io.*;
  * <h2 class="header">Mandatory</h2>
  * This marshaller has no mandatory configuration parameters.
  * <h2 class="header">Java Example</h2>
- * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link GridOptimizedMarshaller}.
+ * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller}.
  * <pre name="code" class="java">
  * GridJdkMarshaller marshaller = new GridJdkMarshaller();
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassDescriptor.java
new file mode 100644
index 0000000..6384e3b
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassDescriptor.java
@@ -0,0 +1,1032 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.*;
+import sun.misc.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import static java.lang.reflect.Modifier.*;
+
+/**
+ * Class descriptor.
+ */
+class GridOptimizedClassDescriptor {
+    /** Unsafe. */
+    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
+
+    /** */
+    private static final int TYPE_BYTE = 1;
+
+    /** */
+    private static final int TYPE_SHORT = 2;
+
+    /** */
+    private static final int TYPE_INT = 3;
+
+    /** */
+    private static final int TYPE_LONG = 4;
+
+    /** */
+    private static final int TYPE_FLOAT = 5;
+
+    /** */
+    private static final int TYPE_DOUBLE = 6;
+
+    /** */
+    private static final int TYPE_CHAR = 7;
+
+    /** */
+    private static final int TYPE_BOOLEAN = 8;
+
+    /** */
+    private static final int TYPE_BYTE_ARR = 9;
+
+    /** */
+    private static final int TYPE_SHORT_ARR = 10;
+
+    /** */
+    private static final int TYPE_INT_ARR = 11;
+
+    /** */
+    private static final int TYPE_LONG_ARR = 12;
+
+    /** */
+    private static final int TYPE_FLOAT_ARR = 13;
+
+    /** */
+    private static final int TYPE_DOUBLE_ARR = 14;
+
+    /** */
+    private static final int TYPE_CHAR_ARR = 15;
+
+    /** */
+    private static final int TYPE_BOOLEAN_ARR = 16;
+
+    /** */
+    private static final int TYPE_OBJ_ARR = 17;
+
+    /** */
+    private static final int TYPE_STR = 18;
+
+    /** */
+    private static final int TYPE_ENUM = 19;
+
+    /** */
+    private static final int TYPE_UUID = 20;
+
+    /** */
+    private static final int TYPE_PROPS = 21;
+
+    /** */
+    private static final int TYPE_ARRAY_LIST = 22;
+
+    /** */
+    private static final int TYPE_HASH_MAP = 23;
+
+    /** */
+    private static final int TYPE_HASH_SET = 24;
+
+    /** */
+    private static final int TYPE_LINKED_LIST = 25;
+
+    /** */
+    private static final int TYPE_LINKED_HASH_MAP = 26;
+
+    /** */
+    private static final int TYPE_LINKED_HASH_SET = 27;
+
+    /** */
+    private static final int TYPE_DATE = 28;
+
+    /** */
+    private static final int TYPE_CLS = 29;
+
+    /** */
+    private static final int TYPE_EXTERNALIZABLE = 50;
+
+    /** */
+    private static final int TYPE_SERIALIZABLE = 51;
+
+    /** Class. */
+    private Class<?> cls;
+
+    /** Header. */
+    private Integer hdr;
+
+    /** ID. */
+    private Integer id;
+
+    /** Short ID. */
+    private Short shortId;
+
+    /** Class name. */
+    private String name;
+
+    /** Class type. */
+    private int type;
+
+    /** Primitive flag. */
+    private boolean isPrimitive;
+
+    /** Enum flag. */
+    private boolean isEnum;
+
+    /** Serializable flag. */
+    private boolean isSerial;
+
+    /** Excluded flag. */
+    private final boolean excluded;
+
+    /** {@code True} if descriptor is for {@link Class}. */
+    private boolean isCls;
+
+    /** Array component type. */
+    private Class<?> arrCompType;
+
+    /** Enumeration values. */
+    private Object[] enumVals;
+
+    /** Constructor. */
+    private Constructor<?> constructor;
+
+    /** Fields. */
+    private Fields fields;
+
+    /** {@code writeObject} methods. */
+    private List<Method> writeObjMtds;
+
+    /** {@code writeReplace} method. */
+    private Method writeReplaceMtd;
+
+    /** {@code readObject} methods. */
+    private List<Method> readObjMtds;
+
+    /** {@code readResolve} method. */
+    private Method readResolveMtd;
+
+    /** Defaults field offset. */
+    private long dfltsFieldOff;
+
+    /** Load factor field offset. */
+    private long loadFactorFieldOff;
+
+    /** Map field offset. */
+    private long mapFieldOff;
+
+    /** Access order field offset. */
+    private long accessOrderFieldOff;
+
+    /**
+     * Creates descriptor for class.
+     *
+     * @param cls Class.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings({"ForLoopReplaceableByForEach", "MapReplaceableByEnumMap"})
+    GridOptimizedClassDescriptor(Class<?> cls) throws IOException {
+        this.cls = cls;
+
+        excluded = GridMarshallerExclusions.isExcluded(cls);
+
+        T2<Integer, Integer> t = GridOptimizedClassResolver.writeClassData(cls);
+
+        hdr = t.get1();
+        id = t.get2();
+        name = cls.getName();
+
+        if (!excluded) {
+            Class<?> parent;
+
+            if (cls == byte.class || cls == Byte.class) {
+                type = TYPE_BYTE;
+
+                isPrimitive = true;
+            }
+            else if (cls == short.class || cls == Short.class) {
+                type = TYPE_SHORT;
+
+                isPrimitive = true;
+            }
+            else if (cls == int.class || cls == Integer.class) {
+                type = TYPE_INT;
+
+                isPrimitive = true;
+            }
+            else if (cls == long.class || cls == Long.class) {
+                type = TYPE_LONG;
+
+                isPrimitive = true;
+            }
+            else if (cls == float.class || cls == Float.class) {
+                type = TYPE_FLOAT;
+
+                isPrimitive = true;
+            }
+            else if (cls == double.class || cls == Double.class) {
+                type = TYPE_DOUBLE;
+
+                isPrimitive = true;
+            }
+            else if (cls == char.class || cls == Character.class) {
+                type = TYPE_CHAR;
+
+                isPrimitive = true;
+            }
+            else if (cls == boolean.class || cls == Boolean.class) {
+                type = TYPE_BOOLEAN;
+
+                isPrimitive = true;
+            }
+            else if (cls == byte[].class)
+                type = TYPE_BYTE_ARR;
+            else if (cls == short[].class)
+                type = TYPE_SHORT_ARR;
+            else if (cls == int[].class)
+                type = TYPE_INT_ARR;
+            else if (cls == long[].class)
+                type = TYPE_LONG_ARR;
+            else if (cls == float[].class)
+                type = TYPE_FLOAT_ARR;
+            else if (cls == double[].class)
+                type = TYPE_DOUBLE_ARR;
+            else if (cls == char[].class)
+                type = TYPE_CHAR_ARR;
+            else if (cls == boolean[].class)
+                type = TYPE_BOOLEAN_ARR;
+            else if (cls.isArray()) {
+                type = TYPE_OBJ_ARR;
+
+                arrCompType = cls.getComponentType();
+            }
+            else if (cls == String.class)
+                type = TYPE_STR;
+            else if (cls.isEnum()) {
+                type = TYPE_ENUM;
+
+                isEnum = true;
+                enumVals = cls.getEnumConstants();
+            }
+            // Support for enum constants, based on anonymous children classes.
+            else if ((parent = cls.getSuperclass()) != null && parent.isEnum()) {
+                type = TYPE_ENUM;
+
+                isEnum = true;
+                enumVals = parent.getEnumConstants();
+            }
+            else if (cls == UUID.class)
+                type = TYPE_UUID;
+            else if (cls == Properties.class) {
+                type = TYPE_PROPS;
+
+                try {
+                    dfltsFieldOff = UNSAFE.objectFieldOffset(Properties.class.getDeclaredField("defaults"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == ArrayList.class)
+                type = TYPE_ARRAY_LIST;
+            else if (cls == HashMap.class) {
+                type = TYPE_HASH_MAP;
+
+                try {
+                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == HashSet.class) {
+                type = TYPE_HASH_SET;
+
+                try {
+                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+                    mapFieldOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == LinkedList.class)
+                type = TYPE_LINKED_LIST;
+            else if (cls == LinkedHashMap.class) {
+                type = TYPE_LINKED_HASH_MAP;
+
+                try {
+                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+                    accessOrderFieldOff = UNSAFE.objectFieldOffset(LinkedHashMap.class.getDeclaredField("accessOrder"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == LinkedHashSet.class) {
+                type = TYPE_LINKED_HASH_SET;
+
+                try {
+                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+                    mapFieldOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == Date.class)
+                type = TYPE_DATE;
+            else if (cls == Class.class) {
+                type = TYPE_CLS;
+
+                isCls = true;
+            }
+            else {
+                Class<?> c = cls;
+
+                while ((writeReplaceMtd == null || readResolveMtd == null) && c != null && !c.equals(Object.class)) {
+                    if (writeReplaceMtd == null) {
+                        try {
+                            writeReplaceMtd = c.getDeclaredMethod("writeReplace");
+
+                            if (!isStatic(writeReplaceMtd.getModifiers()) &&
+                                !(isPrivate(writeReplaceMtd.getModifiers()) && c != cls) &&
+                                writeReplaceMtd.getReturnType().equals(Object.class))
+                                writeReplaceMtd.setAccessible(true);
+                            else
+                                // Set method back to null if it has incorrect signature.
+                                writeReplaceMtd = null;
+                        }
+                        catch (NoSuchMethodException ignored) {
+                            // No-op.
+                        }
+                    }
+
+                    if (readResolveMtd == null) {
+                        try {
+                            readResolveMtd = c.getDeclaredMethod("readResolve");
+
+                            if (!isStatic(readResolveMtd.getModifiers()) &&
+                                !(isPrivate(readResolveMtd.getModifiers()) && c != cls) &&
+                                readResolveMtd.getReturnType().equals(Object.class))
+                                readResolveMtd.setAccessible(true);
+                            else
+                                // Set method back to null if it has incorrect signature.
+                                readResolveMtd = null;
+                        }
+                        catch (NoSuchMethodException ignored) {
+                            // No-op.
+                        }
+                    }
+
+                    c = c.getSuperclass();
+                }
+
+                if (Externalizable.class.isAssignableFrom(cls)) {
+                    type = TYPE_EXTERNALIZABLE;
+
+                    try {
+                        constructor = cls.getDeclaredConstructor();
+
+                        constructor.setAccessible(true);
+                    }
+                    catch (NoSuchMethodException e) {
+                        throw new IOException("Externalizable class doesn't have default constructor: " + cls, e);
+                    }
+                }
+                else {
+                    type = TYPE_SERIALIZABLE;
+
+                    isSerial = Serializable.class.isAssignableFrom(cls);
+
+                    writeObjMtds = new ArrayList<>();
+                    readObjMtds = new ArrayList<>();
+                    List<List<Field>> fields = new ArrayList<>();
+                    List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs = new ArrayList<>();
+                    List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps = new ArrayList<>();
+                    List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists = new ArrayList<>();
+
+                    for (c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
+                        Method mtd;
+
+                        try {
+                            mtd = c.getDeclaredMethod("writeObject", ObjectOutputStream.class);
+
+                            int mod = mtd.getModifiers();
+
+                            if (!isStatic(mod) && isPrivate(mod) && mtd.getReturnType() == Void.TYPE)
+                                mtd.setAccessible(true);
+                            else
+                                // Set method back to null if it has incorrect signature.
+                                mtd = null;
+                        }
+                        catch (NoSuchMethodException ignored) {
+                            mtd = null;
+                        }
+
+                        writeObjMtds.add(mtd);
+
+                        try {
+                            mtd = c.getDeclaredMethod("readObject", ObjectInputStream.class);
+
+                            int mod = mtd.getModifiers();
+
+                            if (!isStatic(mod) && isPrivate(mod) && mtd.getReturnType() == Void.TYPE)
+                                mtd.setAccessible(true);
+                            else
+                                // Set method back to null if it has incorrect signature.
+                                mtd = null;
+                        }
+                        catch (NoSuchMethodException ignored) {
+                            mtd = null;
+                        }
+
+                        readObjMtds.add(mtd);
+
+                        Field[] clsFields0 = c.getDeclaredFields();
+
+                        Arrays.sort(clsFields0, new Comparator<Field>() {
+                            @Override public int compare(Field f1, Field f2) {
+                                return f1.getName().compareTo(f2.getName());
+                            }
+                        });
+
+                        List<Field> clsFields = new ArrayList<>(clsFields0.length);
+                        List<T2<GridOptimizedFieldType, Long>> clsFieldOffs =
+                            new ArrayList<>(clsFields0.length);
+
+                        for (int i = 0; i < clsFields0.length; i++) {
+                            Field f = clsFields0[i];
+
+                            int mod = f.getModifiers();
+
+                            if (!isStatic(mod) && !isTransient(mod)) {
+                                GridOptimizedFieldType type = fieldType(f.getType());
+
+                                clsFields.add(f);
+                                clsFieldOffs.add(new T2<>(type, UNSAFE.objectFieldOffset(f)));
+                            }
+                        }
+
+                        fields.add(clsFields);
+                        fieldOffs.add(clsFieldOffs);
+
+                        Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap = null;
+
+                        try {
+                            Field serFieldsDesc = c.getDeclaredField("serialPersistentFields");
+
+                            int mod = serFieldsDesc.getModifiers();
+
+                            if (serFieldsDesc.getType() == ObjectStreamField[].class &&
+                                isPrivate(mod) && isStatic(mod) && isFinal(mod)) {
+                                serFieldsDesc.setAccessible(true);
+
+                                ObjectStreamField[] serFields = (ObjectStreamField[])serFieldsDesc.get(null);
+
+                                fieldInfoMap = new HashMap<>();
+
+                                for (int i = 0; i < serFields.length; i++) {
+                                    ObjectStreamField serField = serFields[i];
+
+                                    fieldInfoMap.put(serField.getName(), F.t(i, fieldType(serField.getType())));
+                                }
+                            }
+                        }
+                        catch (NoSuchFieldException ignored) {
+                            // No-op.
+                        }
+                        catch (IllegalAccessException e) {
+                            throw new IOException("Failed to get value of 'serialPersistentFields' field in class: " +
+                                cls.getName(), e);
+                        }
+
+                        if (fieldInfoMap == null) {
+                            fieldInfoMap = new HashMap<>();
+
+                            for (int i = 0; i < clsFields.size(); i++) {
+                                Field f = clsFields.get(i);
+
+                                fieldInfoMap.put(f.getName(), F.t(i, fieldType(f.getType())));
+                            }
+                        }
+
+                        fieldInfoMaps.add(fieldInfoMap);
+
+                        List<IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoList =
+                            new ArrayList<>(fieldInfoMap.values());
+
+                        Collections.sort(fieldInfoList, new Comparator<IgniteBiTuple<Integer, GridOptimizedFieldType>>() {
+                            @Override public int compare(IgniteBiTuple<Integer, GridOptimizedFieldType> t1,
+                                IgniteBiTuple<Integer, GridOptimizedFieldType> t2) {
+                                return t1.get1().compareTo(t2.get1());
+                            }
+                        });
+
+                        fieldInfoLists.add(fieldInfoList);
+                    }
+
+                    Collections.reverse(writeObjMtds);
+                    Collections.reverse(readObjMtds);
+                    Collections.reverse(fields);
+                    Collections.reverse(fieldOffs);
+                    Collections.reverse(fieldInfoMaps);
+                    Collections.reverse(fieldInfoLists);
+
+                    this.fields = new Fields(fields, fieldOffs, fieldInfoLists, fieldInfoMaps);
+                }
+            }
+        }
+
+        shortId = GridOptimizedMarshallerUtils.computeSerialVersionUid(cls, fields != null ? fields.ownFields() : null).shortValue();
+    }
+
+    /**
+     * @return Excluded flag.
+     */
+    boolean excluded() {
+        return excluded;
+    }
+
+    /**
+     * @return Class.
+     */
+    Class<?> describedClass() {
+        return cls;
+    }
+
+    /**
+     * @return Header.
+     */
+    Integer header() {
+        return hdr;
+    }
+
+    /**
+     * @return ID.
+     */
+    Integer id() {
+        return id;
+    }
+
+    /**
+     * @return Short ID.
+     */
+    Short shortId() {
+        return shortId;
+    }
+
+    /**
+     * @return Class name.
+     */
+    String name() {
+        return name;
+    }
+
+    /**
+     * @return Array component type.
+     */
+    Class<?> componentType() {
+        return arrCompType;
+    }
+
+    /**
+     * @return Primitive flag.
+     */
+    boolean isPrimitive() {
+        return isPrimitive;
+    }
+
+    /**
+     * @return Enum flag.
+     */
+    boolean isEnum() {
+        return isEnum;
+    }
+
+    /**
+     * @return {@code True} if descriptor is for {@link Class}.
+     */
+    boolean isClass() {
+        return isCls;
+    }
+
+    /**
+     * Replaces object.
+     *
+     * @param obj Object.
+     * @return Replaced object or {@code null} if there is no {@code writeReplace} method.
+     * @throws IOException In case of error.
+     */
+    Object replace(Object obj) throws IOException {
+        if (writeReplaceMtd != null) {
+            try {
+                return writeReplaceMtd.invoke(obj);
+            }
+            catch (IllegalAccessException | InvocationTargetException e) {
+                throw new IOException(e);
+            }
+        }
+
+        return obj;
+    }
+
+    /**
+     * Writes object to stream.
+     *
+     * @param out Output stream.
+     * @param obj Object.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    void write(GridOptimizedObjectOutputStream out, Object obj) throws IOException {
+        switch (type) {
+            case TYPE_BYTE:
+                out.writeByte((Byte)obj);
+
+                break;
+
+            case TYPE_SHORT:
+                out.writeShort((Short)obj);
+
+                break;
+
+            case TYPE_INT:
+                out.writeInt((Integer)obj);
+
+                break;
+
+            case TYPE_LONG:
+                out.writeLong((Long)obj);
+
+                break;
+
+            case TYPE_FLOAT:
+                out.writeFloat((Float)obj);
+
+                break;
+
+            case TYPE_DOUBLE:
+                out.writeDouble((Double)obj);
+
+                break;
+
+            case TYPE_CHAR:
+                out.writeChar((Character)obj);
+
+                break;
+
+            case TYPE_BOOLEAN:
+                out.writeBoolean((Boolean)obj);
+
+                break;
+
+            case TYPE_BYTE_ARR:
+                out.writeByteArray((byte[])obj);
+
+                break;
+
+            case TYPE_SHORT_ARR:
+                out.writeShortArray((short[])obj);
+
+                break;
+
+            case TYPE_INT_ARR:
+                out.writeIntArray((int[])obj);
+
+                break;
+
+            case TYPE_LONG_ARR:
+                out.writeLongArray((long[])obj);
+
+                break;
+
+            case TYPE_FLOAT_ARR:
+                out.writeFloatArray((float[])obj);
+
+                break;
+
+            case TYPE_DOUBLE_ARR:
+                out.writeDoubleArray((double[])obj);
+
+                break;
+
+            case TYPE_CHAR_ARR:
+                out.writeCharArray((char[])obj);
+
+                break;
+
+            case TYPE_BOOLEAN_ARR:
+                out.writeBooleanArray((boolean[])obj);
+
+                break;
+
+            case TYPE_OBJ_ARR:
+                out.writeArray((Object[])obj);
+
+                break;
+
+            case TYPE_STR:
+                out.writeString((String)obj);
+
+                break;
+
+            case TYPE_ENUM:
+                out.writeInt(((Enum)obj).ordinal());
+
+                break;
+
+            case TYPE_UUID:
+                out.writeUuid((UUID)obj);
+
+                break;
+
+            case TYPE_PROPS:
+                out.writeProperties((Properties)obj, dfltsFieldOff);
+
+                break;
+
+            case TYPE_ARRAY_LIST:
+                out.writeArrayList((ArrayList<?>)obj);
+
+                break;
+
+            case TYPE_HASH_MAP:
+                out.writeHashMap((HashMap<?, ?>)obj, loadFactorFieldOff, false);
+
+                break;
+
+            case TYPE_HASH_SET:
+                out.writeHashSet((HashSet<?>)obj, mapFieldOff, loadFactorFieldOff);
+
+                break;
+
+            case TYPE_LINKED_LIST:
+                out.writeLinkedList((LinkedList<?>)obj);
+
+                break;
+
+            case TYPE_LINKED_HASH_MAP:
+                out.writeLinkedHashMap((LinkedHashMap<?, ?>)obj, loadFactorFieldOff, accessOrderFieldOff, false);
+
+                break;
+
+            case TYPE_LINKED_HASH_SET:
+                out.writeLinkedHashSet((LinkedHashSet<?>)obj, mapFieldOff, loadFactorFieldOff);
+
+                break;
+
+            case TYPE_DATE:
+                out.writeDate((Date)obj);
+
+                break;
+
+            case TYPE_CLS:
+                GridOptimizedClassResolver.writeClass(out, GridOptimizedMarshallerUtils.classDescriptor((Class<?>) obj, obj));
+
+                break;
+
+            case TYPE_EXTERNALIZABLE:
+                out.writeExternalizable(obj);
+
+                break;
+
+            case TYPE_SERIALIZABLE:
+                if (out.requireSerializable() && !isSerial)
+                    throw new NotSerializableException("Must implement java.io.Serializable or " +
+                        "set GridOptimizedMarshaller.setRequireSerializable() to false " +
+                        "(note that performance may degrade if object is not Serializable): " + name);
+
+                out.writeSerializable(obj, writeObjMtds, fields);
+
+                break;
+
+            default:
+                throw new IllegalStateException("Invalid class type: " + type);
+        }
+    }
+
+    /**
+     * Reads object from stream.
+     *
+     * @param in Input stream.
+     * @return Object.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    Object read(GridOptimizedObjectInputStream in) throws ClassNotFoundException, IOException {
+        switch (type) {
+            case TYPE_BYTE:
+                return in.readByte();
+
+            case TYPE_SHORT:
+                return in.readShort();
+
+            case TYPE_INT:
+                return in.readInt();
+
+            case TYPE_LONG:
+                return in.readLong();
+
+            case TYPE_FLOAT:
+                return in.readFloat();
+
+            case TYPE_DOUBLE:
+                return in.readDouble();
+
+            case TYPE_CHAR:
+                return in.readChar();
+
+            case TYPE_BOOLEAN:
+                return in.readBoolean();
+
+            case TYPE_BYTE_ARR:
+                return in.readByteArray();
+
+            case TYPE_SHORT_ARR:
+                return in.readShortArray();
+
+            case TYPE_INT_ARR:
+                return in.readIntArray();
+
+            case TYPE_LONG_ARR:
+                return in.readLongArray();
+
+            case TYPE_FLOAT_ARR:
+                return in.readFloatArray();
+
+            case TYPE_DOUBLE_ARR:
+                return in.readDoubleArray();
+
+            case TYPE_CHAR_ARR:
+                return in.readCharArray();
+
+            case TYPE_BOOLEAN_ARR:
+                return in.readBooleanArray();
+
+            case TYPE_OBJ_ARR:
+                return in.readArray(arrCompType);
+
+            case TYPE_STR:
+                return in.readString();
+
+            case TYPE_ENUM:
+                return enumVals[in.readInt()];
+
+            case TYPE_UUID:
+                return in.readUuid();
+
+            case TYPE_PROPS:
+                return in.readProperties();
+
+            case TYPE_ARRAY_LIST:
+                return in.readArrayList();
+
+            case TYPE_HASH_MAP:
+                return in.readHashMap(false);
+
+            case TYPE_HASH_SET:
+                return in.readHashSet(mapFieldOff);
+
+            case TYPE_LINKED_LIST:
+                return in.readLinkedList();
+
+            case TYPE_LINKED_HASH_MAP:
+                return in.readLinkedHashMap(false);
+
+            case TYPE_LINKED_HASH_SET:
+                return in.readLinkedHashSet(mapFieldOff);
+
+            case TYPE_DATE:
+                return in.readDate();
+
+            case TYPE_CLS:
+                return GridOptimizedClassResolver.readClass(in, in.classLoader()).describedClass();
+
+            case TYPE_EXTERNALIZABLE:
+                return in.readExternalizable(constructor, readResolveMtd);
+
+            case TYPE_SERIALIZABLE:
+                return in.readSerializable(cls, readObjMtds, readResolveMtd, fields);
+
+            default:
+                throw new IllegalStateException("Invalid class type: " + type);
+        }
+    }
+
+    /**
+     * @param cls Class.
+     * @return Type.
+     */
+    @SuppressWarnings("IfMayBeConditional")
+    private GridOptimizedFieldType fieldType(Class<?> cls) {
+        GridOptimizedFieldType type;
+
+        if (cls == byte.class)
+            type = GridOptimizedFieldType.BYTE;
+        else if (cls == short.class)
+            type = GridOptimizedFieldType.SHORT;
+        else if (cls == int.class)
+            type = GridOptimizedFieldType.INT;
+        else if (cls == long.class)
+            type = GridOptimizedFieldType.LONG;
+        else if (cls == float.class)
+            type = GridOptimizedFieldType.FLOAT;
+        else if (cls == double.class)
+            type = GridOptimizedFieldType.DOUBLE;
+        else if (cls == char.class)
+            type = GridOptimizedFieldType.CHAR;
+        else if (cls == boolean.class)
+            type = GridOptimizedFieldType.BOOLEAN;
+        else
+            type = GridOptimizedFieldType.OTHER;
+
+        return type;
+    }
+
+    /**
+     * Encapsulates data about class fields.
+     */
+    @SuppressWarnings("PackageVisibleInnerClass")
+    static class Fields {
+        /** Fields. */
+        private final List<List<Field>> fields;
+
+        /** Fields offsets. */
+        private final List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs;
+
+        /** Fields details lists. */
+        private final List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists;
+
+        /** Fields details maps. */
+        private final List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps;
+
+        /**
+         * Creates new instance.
+         *
+         * @param fields Fields.
+         * @param fieldOffs Field offsets.
+         * @param fieldInfoLists List of field details sequences for each type in the object's class hierarchy.
+         * @param fieldInfoMaps List of field details maps for each type in the object's class hierarchy.
+         */
+        Fields(List<List<Field>> fields, List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs,
+            List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists,
+            List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps) {
+            this.fields = fields;
+            this.fieldOffs = fieldOffs;
+            this.fieldInfoLists = fieldInfoLists;
+            this.fieldInfoMaps = fieldInfoMaps;
+        }
+
+        /**
+         * Returns class's own fields (excluding inherited).
+         *
+         * @return List of fields or {@code null} if fields list is empty.
+         */
+        List<Field> ownFields() {
+            return fields.isEmpty() ? null : fields.get(fields.size() - 1);
+        }
+
+        /**
+         * Returns field types and their offsets.
+         *
+         * @param i hierarchy level where 0 corresponds to top level.
+         * @return list of pairs where first value is field type and second value is its offset.
+         */
+        List<T2<GridOptimizedFieldType, Long>> fieldOffs(int i) {
+            return fieldOffs.get(i);
+        }
+
+        /**
+         * Returns field sequence numbers and their types as list.
+         *
+         * @param i hierarchy level where 0 corresponds to top level.
+         * @return list of pairs (field number, field type) for the given hierarchy level.
+         */
+        List<IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoList(int i) {
+            return fieldInfoLists.get(i);
+        }
+
+        /**
+         * Returns field sequence numbers and their types as map where key is a field name,
+         *
+         * @param i hierarchy level where 0 corresponds to top level.
+         * @return map of field names and their details.
+         */
+        Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap(int i) {
+            return fieldInfoMaps.get(i);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassResolver.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassResolver.java
new file mode 100644
index 0000000..7b21ebe
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassResolver.java
@@ -0,0 +1,469 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.math.*;
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+import java.util.concurrent.locks.*;
+
+/**
+ * Resolves class names by serialVersionUID.
+ */
+@SuppressWarnings({"UnnecessaryFullyQualifiedName", "unchecked"})
+class GridOptimizedClassResolver {
+    /** File name to generate. */
+    private static final String FILE_NAME = "optimized-classnames.properties";
+
+    /** */
+    private static final Map<String, Integer> ggxName2id = new HashMap<>();
+
+    /** */
+    private static final T2<Class<?>, GridOptimizedClassDescriptor>[] ggxId2name;
+
+    /** */
+    private static final Map<String, Integer> ggName2id = new HashMap<>();
+
+    /** */
+    private static final T3<String, Class<?>, GridOptimizedClassDescriptor>[] ggId2name;
+
+    /** */
+    private static Map<String, Integer> usrName2Id;
+
+    /** */
+    private static T3<String, Class<?>, GridOptimizedClassDescriptor>[] usrId2Name;
+
+    /** */
+    private static final int HEADER_NAME = 255;
+
+    /** */
+    private static final int HEADER_GG_NAME = 254;
+
+    /** */
+    private static final int HEADER_USER_NAME = 253;
+
+    /** */
+    private static final int HEADER_ARRAY = 252;
+
+    /**
+     * Initialize predefined classes to optimize.
+     */
+    static {
+        Class[] superOptCls = new Class[] {
+            // Array types.
+            byte[].class,
+            short[].class,
+            int[].class,
+            long[].class,
+            float[].class,
+            double[].class,
+            boolean[].class,
+            char[].class,
+
+            // Boxed types.
+            Byte.class,
+            Short.class,
+            Integer.class,
+            Long.class,
+            Float.class,
+            Double.class,
+            Boolean.class,
+            Character.class,
+            String.class,
+
+            // Atomic.
+            AtomicBoolean.class,AtomicInteger.class,
+            AtomicLong.class,AtomicReference.class,
+            AtomicMarkableReference.class,
+            AtomicStampedReference.class,
+            AtomicIntegerArray.class,
+            AtomicReferenceArray.class,
+
+            // Concurrent types.
+            ConcurrentHashMap.class,
+            ConcurrentLinkedQueue.class,
+            ConcurrentSkipListMap.class,
+            ConcurrentSkipListSet.class,
+            LinkedBlockingDeque.class,
+            LinkedBlockingQueue.class,
+            PriorityBlockingQueue.class,
+            CopyOnWriteArrayList.class,
+            CopyOnWriteArraySet.class,
+
+            // Locks.
+            ReentrantLock.class,
+            ReentrantReadWriteLock.class,
+            ReentrantReadWriteLock.ReadLock.class,
+            ReentrantReadWriteLock.WriteLock.class,
+
+            // Util types.
+            Date.class,
+            UUID.class,
+            Calendar.class,
+            Random.class,
+            Calendar.class,
+            Currency.class,
+            ArrayList.class,
+            LinkedList.class,
+            Stack.class,
+            Vector.class,
+            HashMap.class,
+            HashSet.class,
+            Hashtable.class,
+            TreeMap.class,
+            TreeSet.class,
+            IdentityHashMap.class,
+            LinkedHashMap.class,
+            LinkedHashSet.class,
+            ArrayDeque.class,
+            BitSet.class,
+            EnumMap.class,
+            EnumSet.class,
+
+            // SQL types.
+            java.sql.Date.class,
+            Time.class,
+            Timestamp.class,
+
+            // Math types.
+            BigDecimal.class,
+            BigInteger.class,
+
+            // GridGain types.
+            IgniteUuid.class,
+            GridBoundedConcurrentOrderedSet.class,
+            GridBoundedLinkedHashSet.class,
+            GridConcurrentHashSet.class,
+            ConcurrentLinkedDeque8.class,
+            GridConcurrentPhantomHashSet.class,
+            GridConcurrentSkipListSet.class,
+            GridConcurrentWeakHashSet.class,
+            GridIdentityHashSet.class,
+            GridLeanSet.class,
+            GridSetWrapper.class
+        };
+
+        // Have to leave a range for special purposes.
+        assert superOptCls.length < 230;
+
+        ggxId2name = new T2[superOptCls.length];
+
+        for (int i = 0; i < superOptCls.length; i++) {
+            Class cls = superOptCls[i];
+
+            ggxName2id.put(cls.getName(), i);
+            ggxId2name[i] = new T2<Class<?>, GridOptimizedClassDescriptor>(cls, null);
+        }
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(
+            GridOptimizedClassResolver.class.getResourceAsStream(FILE_NAME),
+            GridOptimizedMarshallerUtils.UTF_8));
+
+        List<T3<String, Class<?>, GridOptimizedClassDescriptor>> ggId2name0 =
+            new LinkedList<>();
+
+        try {
+            for (int i = 0; ; i++) {
+                String clsName = reader.readLine();
+
+                if (clsName == null)
+                    break;
+
+                ggName2id.put(clsName, i);
+                ggId2name0.add(new T3<String, Class<?>, GridOptimizedClassDescriptor>(clsName, null, null));
+            }
+
+            ggId2name = ggId2name0.toArray(new T3[ggId2name0.size()]);
+        }
+        catch (IOException e) {
+            throw new AssertionError(e);
+        }
+        finally {
+            U.close(reader, null);
+        }
+    }
+
+    /**
+     * Ensure singleton.
+     */
+    private GridOptimizedClassResolver() {
+        // No-op.
+    }
+
+    /**
+     * @param usrName2id0 From name to ID.
+     * @param usrId2Name0 From ID to name.
+     */
+    static void userClasses(@Nullable Map<String, Integer> usrName2id0,
+        @Nullable T3<String, Class<?>, GridOptimizedClassDescriptor>[] usrId2Name0) {
+        usrName2Id = usrName2id0;
+        usrId2Name = usrId2Name0;
+    }
+
+    /**
+     * @param in DataInput to read from.
+     * @param clsLdr ClassLoader.
+     * @return Class descriptor.
+     * @throws IOException If serial version UID failed.
+     * @throws ClassNotFoundException If the class cannot be located by the specified class loader.
+     */
+    static GridOptimizedClassDescriptor readClass(DataInput in, ClassLoader clsLdr)
+        throws IOException, ClassNotFoundException {
+        assert in != null;
+        assert clsLdr != null;
+
+        int hdr = in.readByte() & 0xff;
+
+        if (hdr < ggxId2name.length) {
+            T2<Class<?>, GridOptimizedClassDescriptor> ggxT = ggxId2name[hdr];
+
+            GridOptimizedClassDescriptor desc = ggxT.get2();
+
+            if (desc == null) {
+                desc = GridOptimizedMarshallerUtils.classDescriptor(ggxT.get1(), null);
+
+                ggxT.set2(desc);
+            }
+
+            return desc;
+        }
+
+        String name;
+        Class<?> cls;
+        GridOptimizedClassDescriptor desc;
+
+        switch (hdr) {
+            case HEADER_GG_NAME:
+                int ggId = in.readInt();
+
+                T3<String, Class<?>, GridOptimizedClassDescriptor> ggT;
+
+                try {
+                    ggT = ggId2name[ggId];
+                }
+                catch (ArrayIndexOutOfBoundsException e) {
+                    throw new ClassNotFoundException("Failed to find optimized class ID " +
+                        "(is same GridGain version running on all nodes?): " + ggId, e);
+                }
+
+                name = ggT.get1();
+                cls = ggT.get2();
+                desc = ggT.get3();
+
+                if (desc == null) {
+                    if (clsLdr == U.gridClassLoader()) {
+                        if (cls == null) {
+                            cls = forName(name, clsLdr);
+
+                            ggT.set2(cls);
+                        }
+
+                        desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+
+                        ggT.set3(desc);
+                    }
+                    else {
+                        cls = forName(name, clsLdr);
+
+                        desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+                    }
+                }
+
+                break;
+
+            case HEADER_USER_NAME:
+                int usrId = in.readInt();
+
+                T3<String, Class<?>, GridOptimizedClassDescriptor> usrT;
+
+                try {
+                    if (usrId2Name != null)
+                        usrT = usrId2Name[usrId];
+                    else
+                        throw new ClassNotFoundException("Failed to find user defined class ID " +
+                            "(make sure to register identical classes on all nodes for optimization): " + usrId);
+                }
+                catch (ArrayIndexOutOfBoundsException e) {
+                    throw new ClassNotFoundException("Failed to find user defined class ID " +
+                        "(make sure to register identical classes on all nodes for optimization): " + usrId, e);
+                }
+
+                name = usrT.get1();
+                cls = usrT.get2();
+                desc = usrT.get3();
+
+                if (desc == null) {
+                    if (cls == null) {
+                        cls = forName(name, clsLdr);
+
+                        usrT.set2(cls);
+                    }
+
+                    desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+
+                    usrT.set3(desc);
+                }
+
+                break;
+
+            case HEADER_ARRAY:
+                name = readClass(in, clsLdr).name();
+
+                name = name.charAt(0) == '[' ? "[" + name : "[L" + name + ';';
+
+                cls = forName(name, clsLdr);
+
+                return GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+
+            case HEADER_NAME:
+                name = in.readUTF();
+
+                cls = forName(name, clsLdr);
+
+                desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+
+                break;
+
+            default:
+                throw new IOException("Unexpected optimized stream header: " + hdr);
+        }
+
+        short actual = desc.shortId();
+
+        short exp = in.readShort();
+
+        if (actual != exp)
+            throw new ClassNotFoundException("Optimized stream class checksum mismatch " +
+                "(is same version of marshalled class present on all nodes?) " +
+                "[expected=" + exp + ", actual=" + actual + ", cls=" + cls + ']');
+
+        return desc;
+    }
+
+    /**
+     * @param out Output.
+     * @param desc Class descriptor.
+     * @throws IOException In case of error.
+     */
+    static void writeClass(DataOutput out, GridOptimizedClassDescriptor desc) throws IOException {
+        assert out != null;
+        assert desc != null;
+
+        int hdr = desc.header();
+
+        out.writeByte(hdr);
+
+        switch (hdr) {
+            case HEADER_GG_NAME:
+            case HEADER_USER_NAME:
+                out.writeInt(desc.id());
+                out.writeShort(desc.shortId());
+
+                return;
+
+            case HEADER_ARRAY:
+                writeClass(out, GridOptimizedMarshallerUtils.classDescriptor(desc.componentType(), null));
+
+                return;
+
+            case HEADER_NAME:
+                out.writeUTF(desc.name());
+                out.writeShort(desc.shortId());
+        }
+    }
+
+    /**
+     * @param cls Class to write.
+     * @return Data for {@code writeClass} method.
+     */
+    static T2<Integer, Integer> writeClassData(Class<?> cls) {
+        assert cls != null;
+
+        String name = cls.getName();
+
+        Integer superHdr = ggxName2id.get(name);
+
+        if (superHdr != null)
+            return new T2<>(superHdr, null);
+
+        Integer id;
+
+        if ((id = ggName2id.get(name)) != null)
+            return new T2<>(HEADER_GG_NAME, id);
+
+        if (usrName2Id != null && (id = usrName2Id.get(name)) != null)
+            return new T2<>(HEADER_USER_NAME, id);
+
+        if (cls.isArray())
+            return new T2<>(HEADER_ARRAY, null);
+
+        return new T2<>(HEADER_NAME, null);
+    }
+
+    /**
+     * @param name Class name.
+     * @param ldr Class loader.
+     * @return Class.
+     * @throws ClassNotFoundException If class not found.
+     */
+    private static Class<?> forName(String name, ClassLoader ldr) throws ClassNotFoundException {
+        Class<?> cls = primitive(name);
+
+        if (cls == null)
+            cls = GridOptimizedMarshallerUtils.forName(name, ldr);
+
+        return cls;
+    }
+
+    /**
+     * @param name Name of primitive class.
+     * @return Primitive type class or null.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    @Nullable private static Class<?> primitive(String name) {
+        if (name.length() > 7)
+            return null;
+
+        switch (name.charAt(0)) {
+            case 'b':
+                if ("boolean".equals(name))
+                    return boolean.class;
+
+                return "byte".equals(name) ? byte.class : null;
+            case 's':
+                return "short".equals(name) ? short.class : null;
+            case 'i':
+                return "int".equals(name) ? int.class : null;
+            case 'l':
+                return "long".equals(name) ? long.class : null;
+            case 'c':
+                return "char".equals(name) ? char.class : null;
+            case 'f':
+                return "float".equals(name) ? float.class : null;
+            case 'd':
+                return "double".equals(name) ? double.class : null;
+            case 'v':
+                return "void".equals(name) ? void.class : null;
+        }
+
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedFieldType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedFieldType.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedFieldType.java
new file mode 100644
index 0000000..f080a87
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedFieldType.java
@@ -0,0 +1,42 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+/**
+ * Field type used to calculate {@code Unsafe} offsets into objects.
+ */
+enum GridOptimizedFieldType {
+    /** */
+    BYTE,
+
+    /** */
+    SHORT,
+
+    /** */
+    INT,
+
+    /** */
+    LONG,
+
+    /** */
+    FLOAT,
+
+    /** */
+    DOUBLE,
+
+    /** */
+    CHAR,
+
+    /** */
+    BOOLEAN,
+
+    /** */
+    OTHER
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallable.java
new file mode 100644
index 0000000..2851316
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallable.java
@@ -0,0 +1,57 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import java.util.*;
+
+/**
+ * Optional interface which helps make serialization even faster by removing internal
+ * look-ups for classes.
+ * <p>
+ * All implementation must have the following:
+ * <ul>
+ * <li>
+ *     Must have static filed (private or public) declared of type {@link Object}
+ *     with name {@code GG_CLASS_ID}. GridGain will reflectively initialize this field with
+ *     proper class ID during system startup.
+ * </li>
+ * <li>
+ *     Must return the value of {@code GG_CLASS_ID} field from {@link #ggClassId} method.
+ * </li>
+ * </ul>
+ * Here is a sample implementation:
+ * <pre name="code" class="java">
+ * // For better performance consider implementing java.io.Externalizable interface.
+ * class ExampleMarshallable implements GridOptimizedMarshallable, Serializable {
+ *     // Class ID field required by 'GridOptimizedMarshallable'.
+ *     private static Object GG_CLASS_ID;
+ *
+ *     ...
+ *
+ *     &#64; public Object ggClassId() {
+ *         return GG_CLASS_ID;
+ *     }
+ * }
+ * </pre>
+ * <p>
+ * Note that for better performance you should also specify list of classes you
+ * plan to serialize via {@link GridOptimizedMarshaller#setClassNames(List)} method.
+ */
+public interface GridOptimizedMarshallable {
+    /** */
+    public static final String CLS_ID_FIELD_NAME = "GG_CLASS_ID";
+
+    /**
+     * Implementation of this method should simply return value of {@code GG_CLASS_ID} field.
+     *
+     * @return Class ID for optimized marshalling.
+     */
+    public Object ggClassId();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
new file mode 100644
index 0000000..3a94bb3
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
@@ -0,0 +1,408 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.marshaller.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+import sun.misc.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller},
+ * which is based on standard {@link ObjectOutputStream}, this marshaller does not
+ * enforce that all serialized objects implement {@link Serializable} interface. It is also
+ * about 20 times faster as it removes lots of serialization overhead that exists in
+ * default JDK implementation.
+ * <p>
+ * {@code GridOptimizedMarshaller} is tested only on Java HotSpot VM on other VMs
+ * it could yield unexpected results. It is the default marshaller on Java HotSpot VMs
+ * and will be used if no other marshaller was explicitly configured.
+ * <p>
+ * <h1 class="header">Configuration</h1>
+ * <h2 class="header">Mandatory</h2>
+ * This marshaller has no mandatory configuration parameters.
+ * <h2 class="header">Java Example</h2>
+ * <pre name="code" class="java">
+ * GridOptimizedMarshaller marshaller = new GridOptimizedMarshaller();
+ *
+ * // Enforce Serializable interface.
+ * marshaller.setRequireSerializable(true);
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Override marshaller.
+ * cfg.setMarshaller(marshaller);
+ *
+ * // Starts grid.
+ * G.start(cfg);
+ * </pre>
+ * <h2 class="header">Spring Example</h2>
+ * GridOptimizedMarshaller can be configured from Spring XML configuration file:
+ * <pre name="code" class="xml">
+ * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ *     ...
+ *     &lt;property name="marshaller"&gt;
+ *         &lt;bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller"&gt;
+ *             &lt;property name="requireSerializable"&gt;true&lt;/property&gt;
+ *         &lt;/bean&gt;
+ *     &lt;/property&gt;
+ *     ...
+ * &lt;/bean&gt;
+ * </pre>
+ * <p>
+ * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <br>
+ * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
+ * <h2 class="header">Injection Example</h2>
+ * GridMarshaller can be injected in users task, job or SPI as following:
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     private GridMarshaller marshaller;
+ *     ...
+ * }
+ * </pre>
+ * or
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     private GridMarshaller marshaller;
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     public void setMarshaller(GridMarshaller marshaller) {
+ *         this.marshaller = marshaller;
+ *     }
+ *     ...
+ * }
+ * </pre>
+ */
+public class GridOptimizedMarshaller extends GridAbstractMarshaller {
+    /** Whether or not to require an object to be serializable in order to be marshalled. */
+    private boolean requireSer = true;
+
+    /** Default class loader. */
+    private final ClassLoader dfltClsLdr = getClass().getClassLoader();
+
+    /**
+     * Initializes marshaller not to enforce {@link Serializable} interface.
+     *
+     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
+     */
+    public GridOptimizedMarshaller() {
+        if (!available())
+            throw new GridRuntimeException("Using GridOptimizedMarshaller on unsupported JVM version (some of " +
+                "JVM-private APIs required for the marshaller to work are missing).");
+    }
+
+    /**
+     * Initializes marshaller with given serialization flag. If {@code true},
+     * then objects will be required to implement {@link Serializable} in order
+     * to be serialize.
+     *
+     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
+     *      then objects will be required to implement {@link Serializable} in order to be
+     *      marshalled, if {@code false}, then such requirement will be relaxed.
+     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
+     */
+    public GridOptimizedMarshaller(boolean requireSer) {
+        this();
+
+        this.requireSer = requireSer;
+    }
+
+    /**
+     * Initializes marshaller with given serialization flag. If {@code true},
+     * then objects will be required to implement {@link Serializable} in order
+     * to be serialize.
+     *
+     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
+     *      then objects will be required to implement {@link Serializable} in order to be
+     *      marshalled, if {@code false}, then such requirement will be relaxed.
+     * @param clsNames User preregistered class names.
+     * @param clsNamesPath Path to a file with user preregistered class names.
+     * @param poolSize Object streams pool size.
+     * @throws GridException If an I/O error occurs while writing stream header.
+     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
+     */
+    public GridOptimizedMarshaller(boolean requireSer, @Nullable List<String> clsNames,
+        @Nullable String clsNamesPath, int poolSize) throws GridException {
+        this(requireSer);
+
+        setClassNames(clsNames);
+        setClassNamesPath(clsNamesPath);
+        setPoolSize(poolSize);
+    }
+
+    /**
+     * Adds provided class names for marshalling optimization.
+     * <p>
+     * <b>NOTE</b>: these collections of classes must be identical on all nodes and in the same order.
+     *
+     * @param clsNames User preregistered class names to add.
+     */
+    @SuppressWarnings("unchecked")
+    public void setClassNames(@Nullable List<String> clsNames) {
+        if (clsNames != null && !clsNames.isEmpty()) {
+            String[] clsNamesArr = clsNames.toArray(new String[clsNames.size()]);
+
+            Arrays.sort(clsNamesArr);
+
+            Map<String, Integer> name2id = U.newHashMap(clsNamesArr.length);
+            T3<String, Class<?>, GridOptimizedClassDescriptor>[] id2name = new T3[clsNamesArr.length];
+
+            int i = 0;
+
+            for (String name : clsNamesArr) {
+                name2id.put(name, i);
+                id2name[i++] = new T3<>(name, null, null);
+            }
+
+            GridOptimizedClassResolver.userClasses(name2id, id2name);
+        }
+    }
+
+    /**
+     * Specifies a name of the file which lists all class names to be optimized.
+     * The file path can either be absolute path, relative to {@code GRIDGAIN_HOME},
+     * or specify a resource file on the class path.
+     * <p>
+     * The format of the file is class name per line, like this:
+     * <pre>
+     * ...
+     * com.example.Class1
+     * com.example.Class2
+     * ...
+     * </pre>
+     * <p>
+     * <b>NOTE</b>: this class list must be identical on all nodes and in the same order.
+     *
+     * @param path Path to a file with user preregistered class names.
+     * @throws GridException If an error occurs while writing stream header.
+     */
+    public void setClassNamesPath(@Nullable String path) throws GridException {
+        if (path == null)
+            return;
+
+        URL url = GridUtils.resolveGridGainUrl(path, false);
+
+        if (url == null)
+            throw new GridException("Failed to find resource for name: " + path);
+
+        List<String> clsNames;
+
+        try {
+            clsNames = new LinkedList<>();
+
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), GridOptimizedMarshallerUtils.UTF_8))) {
+                String clsName;
+
+                while ((clsName = reader.readLine()) != null)
+                    clsNames.add(clsName);
+            }
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to read class names from path: " + path, e);
+        }
+
+        setClassNames(clsNames);
+    }
+
+    /**
+     * Specifies size of cached object streams used by marshaller. Object streams are cached for
+     * performance reason to avoid costly recreation for every serialization routine. If {@code 0} (default),
+     * pool is not used and each thread has its own cached object stream which it keeps reusing.
+     * <p>
+     * Since each stream has an internal buffer, creating a stream for each thread can lead to
+     * high memory consumption if many large messages are marshalled or unmarshalled concurrently.
+     * Consider using pool in this case. This will limit number of streams that can be created and,
+     * therefore, decrease memory consumption.
+     * <p>
+     * NOTE: Using streams pool can decrease performance since streams will be shared between
+     * different threads which will lead to more frequent context switching.
+     *
+     * @param poolSize Streams pool size. If {@code 0}, pool is not used.
+     */
+    public void setPoolSize(int poolSize) {
+        GridOptimizedObjectStreamRegistry.poolSize(poolSize);
+    }
+
+    /**
+     * @return Whether to enforce {@link Serializable} interface.
+     */
+    public boolean isRequireSerializable() {
+        return requireSer;
+    }
+
+    /**
+     * Sets flag to enforce {@link Serializable} interface or not.
+     *
+     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
+     *      then objects will be required to implement {@link Serializable} in order to be
+     *      marshalled, if {@code false}, then such requirement will be relaxed.
+     */
+    public void setRequireSerializable(boolean requireSer) {
+        this.requireSer = requireSer;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
+        assert out != null;
+
+        GridOptimizedObjectOutputStream objOut = null;
+
+        try {
+            objOut = GridOptimizedObjectStreamRegistry.out();
+
+            objOut.requireSerializable(requireSer);
+
+            objOut.out().outputStream(out);
+
+            objOut.writeObject(obj);
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to serialize object: " + obj, e);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeOut(objOut);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public byte[] marshal(@Nullable Object obj) throws GridException {
+        GridOptimizedObjectOutputStream objOut = null;
+
+        try {
+            objOut = GridOptimizedObjectStreamRegistry.out();
+
+            objOut.requireSerializable(requireSer);
+
+            objOut.writeObject(obj);
+
+            return objOut.out().array();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to serialize object: " + obj, e);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeOut(objOut);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
+        assert in != null;
+
+        GridOptimizedObjectInputStream objIn = null;
+
+        try {
+            objIn = GridOptimizedObjectStreamRegistry.in();
+
+            objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
+
+            objIn.in().inputStream(in);
+
+            return (T)objIn.readObject();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
+        }
+        catch (ClassNotFoundException e) {
+            throw new GridException("Failed to find class with given class loader for unmarshalling " +
+                "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " +
+                clsLdr, e);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeIn(objIn);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
+        assert arr != null;
+
+        GridOptimizedObjectInputStream objIn = null;
+
+        try {
+            objIn = GridOptimizedObjectStreamRegistry.in();
+
+            objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
+
+            objIn.in().bytes(arr, arr.length);
+
+            return (T)objIn.readObject();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
+        }
+        catch (ClassNotFoundException e) {
+            throw new GridException("Failed to find class with given class loader for unmarshalling " +
+                "(make sure same version of all classes are available on all nodes or enable peer-class-loading): " +
+                clsLdr, e);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeIn(objIn);
+        }
+    }
+
+    /**
+     * Checks whether {@code GridOptimizedMarshaller} is able to work on the current JVM.
+     * <p>
+     * As long as {@code GridOptimizedMarshaller} uses JVM-private API, which is not guaranteed
+     * to be available on all JVM, this method should be called to ensure marshaller could work properly.
+     * <p>
+     * Result of this method is automatically checked in constructor.
+     *
+     * @return {@code true} if {@code GridOptimizedMarshaller} can work on the current JVM or
+     *  {@code false} if it can't.
+     */
+    @SuppressWarnings({"TypeParameterExtendsFinalClass", "ErrorNotRethrown"})
+    public static boolean available() {
+        try {
+            Unsafe unsafe = GridUnsafe.unsafe();
+
+            Class<? extends Unsafe> unsafeCls = unsafe.getClass();
+
+            unsafeCls.getMethod("allocateInstance", Class.class);
+            unsafeCls.getMethod("copyMemory", Object.class, long.class, Object.class, long.class, long.class);
+
+            return true;
+        }
+        catch (Exception ignored) {
+            return false;
+        }
+        catch (NoClassDefFoundError ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * Undeployment callback invoked when class loader is being undeployed.
+     *
+     * @param ldr Class loader being undeployed.
+     */
+    public static void onUndeploy(ClassLoader ldr) {
+        GridOptimizedMarshallerUtils.onUndeploy(ldr);
+    }
+
+    /**
+     * Clears internal caches and frees memory. Usually called on system stop.
+     */
+    public static void clearCache() {
+        GridOptimizedMarshallerUtils.clearCache();
+    }
+}


[48/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8d0aa85..fe92363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,6 @@
 -->
 <!--
     POM file.
-
-    Note that GridGain also provides repository for its Maven artifacts.
-    Contact GridGain team at info@gridgain.com to obtain login credentials.
 -->
 <project
     xmlns="http://maven.apache.org/POM/4.0.0"
@@ -21,21 +18,57 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>gridgain</artifactId>
+    <properties>
+        <ignite.version>7.0.0</ignite.version>
+        <gridgain.edition>fabric</gridgain.edition>
+        <hadoop.version>2.4.1</hadoop.version>
+        <spring.version>4.1.0.RELEASE</spring.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format>
+        <doxygen.exec>doxygen</doxygen.exec>
+        <git.exec>git</git.exec>
+    </properties>
+
+    <groupId>org.apache.ignite</groupId>
+    <artifactId>ignite</artifactId>
+    <version>${ignite.version}</version>
     <packaging>pom</packaging>
 
-    <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain-ent</artifactId>
-        <version>${gridgain.version}</version>
-    </parent>
+    <url>http://www.gridgain.com</url>
+
+    <description>Java-based middleware for in-memory processing of big data in a distributed environment.</description>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <scm>
+        <url>https://github.com/gridgain/gridgain</url>
+        <connection>scm:git:git://github.com/gridgain/gridgain.git</connection>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>gridgain</id>
+            <name>GridGain</name>
+            <email>mvncentral@gridgain.com</email>
+        </developer>
+    </developers>
 
     <modules>
-        <module>modules/extdata/p2p</module>
-        <module>modules/extdata/uri</module>
         <module>modules/core</module>
         <module>modules/hadoop</module>
+        <module>modules/extdata/p2p</module>
+        <module>modules/extdata/uri</module>
         <module>modules/clients</module>
+        <module>examples</module>
+        <module>modules/scalar</module>
+        <module>modules/visor-console</module>
+        <module>modules/visor-plugins</module>
+        <!--<module>modules/visor-trial</module>-->
         <module>modules/jdk8-backport</module>
         <module>modules/tools</module>
         <module>modules/spring</module>
@@ -55,18 +88,188 @@
         <module>modules/jcl</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>log4j</groupId>
+                <artifactId>log4j</artifactId>
+                <version>1.2.17</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.jdmk</groupId>
+                        <artifactId>jmxtools</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.jmx</groupId>
+                        <artifactId>jmxri</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-io</artifactId>
+            <version>9.0.5.v20130815</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-http</artifactId>
+            <version>9.0.5.v20130815</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>9.0.5.v20130815</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>9.0.5.v20130815</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.beust</groupId>
+            <artifactId>jcommander</artifactId>
+            <version>1.30</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <build>
-        <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </testResource>
-        </testResources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>net.alchim31.maven</groupId>
+                    <artifactId>scala-maven-plugin</artifactId>
+                    <version>3.2.0</version>
+                    <configuration>
+                        <jvmArgs>
+                            <jvmArg>-Xms512m</jvmArg>
+                            <jvmArg>-Xmx1024m</jvmArg>
+                        </jvmArgs>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
 
         <plugins>
             <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.17</version>
+                <configuration>
+                    <forkCount>0</forkCount>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-libs</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <excludeGroupIds>org.apache.ignite</excludeGroupIds>
+                            <outputDirectory>target/libs</outputDirectory>
+                            <includeScope>runtime</includeScope>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.4</version>
@@ -74,7 +277,7 @@
                 <executions>
                     <execution>
                         <id>core-jar</id>
-                        <phase>package</phase>
+                        <phase>prepare-package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
@@ -83,35 +286,970 @@
                                 <descriptor>assembly/core-jar.xml</descriptor>
                             </descriptors>
                             <appendAssemblyId>false</appendAssemblyId>
-                            <finalName>gridgain-core-${gridgain.version}</finalName>
+                            <finalName>ignite-core-${ignite.version}</finalName>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly/dependencies-${gridgain.edition}.xml</descriptor>
+                            </descriptors>
+                            <outputDirectory>${basedir}</outputDirectory>
+                            <finalName>libs</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>dependencies-optional</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly/dependencies-optional-${gridgain.edition}.xml</descriptor>
+                            </descriptors>
+                            <outputDirectory>${basedir}/libs</outputDirectory>
+                            <finalName>optional</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>dependencies-visor-console</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly/dependencies-visor-console.xml</descriptor>
+                            </descriptors>
+                            <outputDirectory>${basedir}/bin</outputDirectory>
+                            <finalName>include</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                        </configuration>
+                    </execution>
+
+                    <!--
+                    <execution>
+                        <id>dependencies-visor-trial</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly/dependencies-visor-trial.xml</descriptor>
+                            </descriptors>
+                            <outputDirectory>${basedir}</outputDirectory>
+                            <finalName>bin</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                        </configuration>
+                    </execution>
+                    -->
+
+                    <execution>
+                        <id>release</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>assembly/release-${gridgain.edition}.xml</descriptor>
+                            </descriptors>
+                            <finalName>release-package</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>source</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <excludeResources>true</excludeResources>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.0.0-beta-3</version>
+
+                <configuration>
+                    <flattenMode>minimum</flattenMode>
+                    <flattenedPomFilename>pom-installed.xml</flattenedPomFilename>
+                </configuration>
+
+                <executions>
+                    <!-- enable flattening -->
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+
+                    <!-- ensure proper cleanup before start -->
+                    <execution>
+                        <id>flatten.clean.before</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- ensure proper cleanup after install -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>flatten.clean.after</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>${project.basedir}</directory>
+                                    <includes>
+                                        <include>**/pom-installed.xml</include>
+                                    </includes>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
     <profiles>
         <profile>
-            <id>scala</id>
+            <id>test</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.4</version>
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <id>test</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>assembly/test.xml</descriptor>
+                                    </descriptors>
+                                    <outputDirectory>${basedir}</outputDirectory>
+                                    <finalName>libs</finalName>
+                                    <appendAssemblyId>false</appendAssemblyId>
+                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>surefire-fork-count-1</id>
+            <activation>
+                <property>
+                    <!-- To activate this profile set the following property. -->
+                    <name>FORK_COUNT_SET_TO_1</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.17</version>
+                        <configuration>
+                            <forkCount>1</forkCount>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>clean-libs</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <modules>
-                <module>modules/scalar</module>
-                <module>modules/visor-console</module>
-                <module>modules/visor-plugins</module>
-            </modules>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>clean</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                                <configuration>
+                                    <filesets>
+                                        <fileset>
+                                            <directory>libs</directory>
+                                        </fileset>
+
+                                        <fileset>
+                                            <directory>bin/include/visor-common</directory>
+                                        </fileset>
+
+                                        <fileset>
+                                            <directory>bin/include/visorcmd</directory>
+                                        </fileset>
+
+                                        <fileset>
+                                            <directory>bin/include/visorui</directory>
+                                        </fileset>
+                                    </filesets>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
         <profile>
-            <id>examples</id>
+            <id>release</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <modules>
-                <module>examples</module>
-            </modules>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.9.1</version>
+                        <executions>
+                            <execution>
+                                <id>module-javadoc</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <configuration>
+                                    <taglets>
+                                        <taglet>
+                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
+                                            <tagletArtifact>
+                                                <groupId>org.apache.ignite</groupId>
+                                                <artifactId>ignite-tools</artifactId>
+                                                <version>${ignite.version}</version>
+                                            </tagletArtifact>
+                                        </taglet>
+                                    </taglets>
+                                    <doctitle>GridGain ${ignite.version}</doctitle>
+                                    <windowtitle>GridGain ${ignite.version}</windowtitle>
+                                    <breakiterator>true</breakiterator>
+                                    <verbose>true</verbose>
+                                    <show>protected</show>
+                                    <use>true</use>
+                                    <author>false</author>
+                                    <version>false</version>
+                                    <source>1.7</source>
+                                    <links>
+                                        <link>http://docs.oracle.com/javase/7/docs/api/</link>
+                                        <link>http://hadoop.apache.org/docs/current/api/</link>
+                                    </links>
+                                    <stylesheetfile>assembly/docfiles/javadoc.css</stylesheetfile>
+                                    <groups>
+                                        <group>
+                                            <title>Common Grid APIs</title>
+                                            <packages>org.gridgain.grid:org.gridgain.grid.spi:org.gridgain.grid.lang:org.gridgain.grid.resources:org.gridgain.grid.thread:org.gridgain.grid.product:org.gridgain.grid.scheduler</packages>
+                                        </group>
+                                        <group>
+                                            <title>Messaging APIs</title>
+                                            <packages>org.gridgain.grid.messaging</packages>
+                                        </group>
+                                        <group>
+                                            <title>Event Notification APIs</title>
+                                            <packages>org.gridgain.grid.events</packages>
+                                        </group>
+                                        <group>
+                                            <title>Compute Grid APIs</title>
+                                            <packages>org.gridgain.grid.compute:org.gridgain.grid.compute.gridify</packages>
+                                        </group>
+                                        <group>
+                                            <title>Data Grid APIs</title>
+                                            <packages>org.gridgain.grid.cache:org.gridgain.grid.cache.datastructures:org.gridgain.grid.cache.cloner:org.gridgain.grid.cache.store:org.gridgain.grid.cache.store.hibernate:org.gridgain.grid.cache.store.jdbc:org.gridgain.grid.cache.query:org.gridgain.grid.cache.affinity:org.gridgain.grid.cache.affinity.consistenthash:org.gridgain.grid.cache.affinity.rendezvous:org.gridgain.grid.cache.affinity.fair:org.gridgain.grid.cache.eviction:org.gridgain.grid.cache.eviction.fifo:org.gridgain.grid.cache.eviction.ggfs:org.gridgain.grid.cache.eviction.lru:org.gridgain.grid.cache.eviction.random:org.gridgain.grid.cache.jta:org.gridgain.grid.cache.jta.jndi:org.gridgain.grid.cache.jta.reflect:org.gridgain.grid.cache.websession:org.gridgain.grid.cache.hibernate:org.gridgain.grid.dataload</packages>
+                                        </group>
+                                        <group>
+                                            <title>Hadoop Accelerator APIs</title>
+                                            <packages>org.gridgain.grid.ggfs:org.gridgain.grid.ggfs.hadoop:org.gridgain.grid.ggfs.hadoop.v1:org.gridgain.grid.ggfs.hadoop.v2:org.gridgain.grid.ggfs.mapreduce:org.gridgain.grid.ggfs.mapreduce.records:org.gridgain.grid.hadoop</packages>
+                                        </group>
+                                        <group>
+                                            <title>Streaming APIs</title>
+                                            <packages>org.gridgain.grid.streamer:org.gridgain.grid.streamer.router:org.gridgain.grid.streamer.window:org.gridgain.grid.streamer.index:org.gridgain.grid.streamer.index.hash:org.gridgain.grid.streamer.index.tree</packages>
+                                        </group>
+                                        <group>
+                                            <title>Security APIs</title>
+                                            <packages>org.gridgain.grid.security</packages>
+                                        </group>
+                                        <group>
+                                            <title>Distributed Services APIs</title>
+                                            <packages>org.gridgain.grid.service</packages>
+                                        </group>
+                                        <group>
+                                            <title>JDBC Driver</title>
+                                            <packages>org.gridgain.jdbc</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: CheckPoint</title>
+                                            <packages>org.gridgain.grid.spi.checkpoint:org.gridgain.grid.spi.checkpoint.jdbc:org.gridgain.grid.spi.checkpoint.s3:org.gridgain.grid.spi.checkpoint.cache:org.gridgain.grid.spi.checkpoint.noop:org.gridgain.grid.spi.checkpoint.sharedfs</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Collision</title>
+                                            <packages>org.gridgain.grid.spi.collision:org.gridgain.grid.spi.collision.fifoqueue:org.gridgain.grid.spi.collision.jobstealing:org.gridgain.grid.spi.collision.noop:org.gridgain.grid.spi.collision.priorityqueue</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Indexing</title>
+                                            <packages>org.gridgain.grid.spi.indexing:org.gridgain.grid.spi.indexing.h2</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Load Balancing</title>
+                                            <packages>org.gridgain.grid.spi.loadbalancing:org.gridgain.grid.spi.loadbalancing.adaptive:org.gridgain.grid.spi.loadbalancing.weightedrandom:org.gridgain.grid.spi.loadbalancing.roundrobin</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Communication</title>
+                                            <packages>org.gridgain.grid.spi.communication:org.gridgain.grid.spi.communication.tcp</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Deployment</title>
+                                            <packages>org.gridgain.grid.spi.deployment:org.gridgain.grid.spi.deployment.local:org.gridgain.grid.spi.deployment.uri</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Swap Space</title>
+                                            <packages>org.gridgain.grid.spi.swapspace:org.gridgain.grid.spi.swapspace.file:org.gridgain.grid.spi.swapspace.noop</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Discovery</title>
+                                            <packages>org.gridgain.grid.spi.discovery:org.gridgain.grid.spi.discovery.tcp:org.gridgain.grid.spi.discovery.tcp.ipfinder:org.gridgain.grid.spi.discovery.tcp.ipfinder.s3:org.gridgain.grid.spi.discovery.tcp.ipfinder.jdbc:org.gridgain.grid.spi.discovery.tcp.ipfinder.sharedfs:org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast:org.gridgain.grid.spi.discovery.tcp.ipfinder.vm:org.gridgain.grid.spi.discovery.tcp.metricsstore:org.gridgain.grid.spi.discovery.tcp.metricsstore.s3:org.gridgain.grid.spi.discovery.tcp.metricsstore.jdbc:org.gridgain.grid.spi.discovery.tcp.metricsstore.sharedfs:org.gridgain.grid.spi.discovery.tcp.metricsstore.vm</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Failover</title>
+                                            <packages>org.gridgain.grid.spi.failover:org.gridgain.grid.spi.failover.never:org.gridgain.grid.spi.failover.jobstealing:org.gridgain.grid.spi.failover.always</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Event Storage</title>
+                                            <packages>org.gridgain.grid.spi.eventstorage:org.gridgain.grid.spi.eventstorage.memory</packages>
+                                        </group>
+                                        <group>
+                                            <title>Segmentation Detection</title>
+                                            <packages>org.gridgain.grid.segmentation</packages>
+                                        </group>
+                                        <group>
+                                            <title>Logging</title>
+                                            <packages>org.gridgain.grid.logger:org.gridgain.grid.logger.log4j:org.gridgain.grid.logger.java:org.gridgain.grid.logger.tomcat:org.gridgain.grid.logger.jcl:org.gridgain.grid.logger.slf4j:org.gridgain.grid.logger.jboss</packages>
+                                        </group>
+                                        <group>
+                                            <title>Loaders</title>
+                                            <packages>org.gridgain.grid.startup:org.gridgain.grid.startup.cmdline:org.gridgain.grid.startup.servlet:org.gridgain.grid.startup.tomcat</packages>
+                                        </group>
+                                        <group>
+                                            <title>Marshallers</title>
+                                            <packages>org.gridgain.grid.marshaller:org.gridgain.grid.marshaller.optimized:org.gridgain.grid.marshaller.jdk</packages>
+                                        </group>
+                                    </groups>
+                                    <header>
+                                        <![CDATA[
+                                    GridGain - In-Memory Data Fabric
+                                ]]>
+                                    </header>
+                                    <bottom>
+                                        <![CDATA[
+                                    <table width="100%" border="0" cellspacing=0 cellpadding=0 style="padding: 5px">
+                                    <tr>
+                                        <td>
+                                            <table style="padding-left: 0; margin: 0">
+                                                <tbody style="padding: 0; margin: 0">
+                                                    <tr style="padding: 0; margin: 0">
+                                                        <td>
+                                                            <a target=_blank href="http://www.gridgain.com/"><nobr>2014 Copyright &#169; GridGain Systems</nobr></a>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                        <td width="100%" align="right" valign="center">
+                                            <table border=0 cellspacing=0 cellpadding=0>
+                                            <tr>
+                                                <td>
+                                                    <nobr>Follow us:&nbsp;&nbsp;</nobr>
+                                                </td>
+                                                <td style="padding-right: 5px">
+                                                    <a class='img_link' target=twitter href='http://www.twitter.com/gridgain'>
+                                                        <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter_bw.png' alt='Follow GridGain on Twitter'/>
+                                                    </a>
+                                                </td>
+                                                <td style="padding-right: 5px">
+                                                    <a class='img_link' target=vimeo href='http://www.vimeo.com/gridgain'>
+                                                        <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo_bw.png' alt='Follow GridGain on Vimeo'/>
+                                                    </a>
+                                                </td>
+                                            </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="2" valign="top" align="left">
+                                            <table style="padding-left: 0; margin: 0">
+                                                <tbody style="padding: 0; margin: 0">
+                                                    <tr style="padding: 0; margin: 0">
+                                                        <td>
+                                                            <b>GridGain Fabric</b>
+                                                        </td>
+                                                        <td>:&nbsp;&nbsp;
+                                                            ver. <strong>${gridgain.version}</strong>
+                                                        </td>
+                                                    </tr>
+                                                    <tr style="padding: 0; margin: 0">
+                                                        <td>
+                                                            <b>Release Date</b>
+                                                        </td>
+                                                        <td>:&nbsp;&nbsp;
+                                                            ${maven.build.timestamp}
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    </table>
+                                ]]>
+                                    </bottom>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>core-javadoc</id>
+                                <goals>
+                                    <goal>aggregate</goal>
+                                </goals>
+                                <phase>prepare-package</phase>
+                                <configuration>
+                                    <taglets>
+                                        <taglet>
+                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
+                                            <tagletArtifact>
+                                                <groupId>org.apache.ignite</groupId>
+                                                <artifactId>ignite-tools</artifactId>
+                                                <version>${ignite.version}</version>
+                                            </tagletArtifact>
+                                        </taglet>
+                                    </taglets>
+                                    <reportOutputDirectory>target/javadoc</reportOutputDirectory>
+                                    <destDir>core</destDir>
+                                    <doctitle>GridGain ${ignite.version}</doctitle>
+                                    <windowtitle>GridGain ${ignite.version}</windowtitle>
+                                    <breakiterator>true</breakiterator>
+                                    <verbose>true</verbose>
+                                    <show>protected</show>
+                                    <use>true</use>
+                                    <author>false</author>
+                                    <version>false</version>
+                                    <source>1.7</source>
+                                    <links>
+                                        <link>http://docs.oracle.com/javase/7/docs/api/</link>
+                                        <link>http://hadoop.apache.org/docs/current/api/</link>
+                                    </links>
+                                    <stylesheetfile>assembly/docfiles/javadoc.css</stylesheetfile>
+                                    <excludePackageNames>com.*:org.jetbrains.*:org.pcollections:*.jdk8:*.tests:*.tools:*.typedef:*.examples:*.client:*.kernal:*.util:*.dr:*.compute.gridify.aop:*.spi.authentication:*.spi.securesession:*.spi.discovery.tcp.messages:*.spi.discovery.tcp.internal:*.spi.deployment.uri.scanners:*.spi.deployment.uri.tasks:*.spi.indexing.h2.opt:org.gridgain.grid.portables</excludePackageNames>
+                                    <groups>
+                                        <group>
+                                            <title>Common Grid APIs</title>
+                                            <packages>org.gridgain.grid:org.gridgain.grid.spi:org.gridgain.grid.lang:org.gridgain.grid.resources:org.gridgain.grid.thread:org.gridgain.grid.product:org.gridgain.grid.scheduler</packages>
+                                        </group>
+                                        <group>
+                                            <title>Messaging APIs</title>
+                                            <packages>org.gridgain.grid.messaging</packages>
+                                        </group>
+                                        <group>
+                                            <title>Event Notification APIs</title>
+                                            <packages>org.gridgain.grid.events</packages>
+                                        </group>
+                                        <group>
+                                            <title>Compute Grid APIs</title>
+                                            <packages>org.gridgain.grid.compute:org.gridgain.grid.compute.gridify</packages>
+                                        </group>
+                                        <group>
+                                            <title>Data Grid APIs</title>
+                                            <packages>org.gridgain.grid.cache:org.gridgain.grid.cache.datastructures:org.gridgain.grid.cache.cloner:org.gridgain.grid.cache.store:org.gridgain.grid.cache.store.hibernate:org.gridgain.grid.cache.store.jdbc:org.gridgain.grid.cache.query:org.gridgain.grid.cache.affinity:org.gridgain.grid.cache.affinity.consistenthash:org.gridgain.grid.cache.affinity.rendezvous:org.gridgain.grid.cache.affinity.fair:org.gridgain.grid.cache.eviction:org.gridgain.grid.cache.eviction.fifo:org.gridgain.grid.cache.eviction.ggfs:org.gridgain.grid.cache.eviction.lru:org.gridgain.grid.cache.eviction.random:org.gridgain.grid.cache.jta:org.gridgain.grid.cache.jta.jndi:org.gridgain.grid.cache.jta.reflect:org.gridgain.grid.cache.websession:org.gridgain.grid.cache.hibernate:org.gridgain.grid.dataload</packages>
+                                        </group>
+                                        <group>
+                                            <title>Hadoop Accelerator APIs</title>
+                                            <packages>org.gridgain.grid.ggfs:org.gridgain.grid.ggfs.hadoop:org.gridgain.grid.ggfs.hadoop.v1:org.gridgain.grid.ggfs.hadoop.v2:org.gridgain.grid.ggfs.mapreduce:org.gridgain.grid.ggfs.mapreduce.records:org.gridgain.grid.hadoop</packages>
+                                        </group>
+                                        <group>
+                                            <title>Streaming APIs</title>
+                                            <packages>org.gridgain.grid.streamer:org.gridgain.grid.streamer.router:org.gridgain.grid.streamer.window:org.gridgain.grid.streamer.index:org.gridgain.grid.streamer.index.hash:org.gridgain.grid.streamer.index.tree</packages>
+                                        </group>
+                                        <group>
+                                            <title>Security APIs</title>
+                                            <packages>org.gridgain.grid.security</packages>
+                                        </group>
+                                        <group>
+                                            <title>Distributed Services APIs</title>
+                                            <packages>org.gridgain.grid.service</packages>
+                                        </group>
+                                        <group>
+                                            <title>JDBC Driver</title>
+                                            <packages>org.gridgain.jdbc</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: CheckPoint</title>
+                                            <packages>org.gridgain.grid.spi.checkpoint:org.gridgain.grid.spi.checkpoint.jdbc:org.gridgain.grid.spi.checkpoint.s3:org.gridgain.grid.spi.checkpoint.cache:org.gridgain.grid.spi.checkpoint.noop:org.gridgain.grid.spi.checkpoint.sharedfs</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Collision</title>
+                                            <packages>org.gridgain.grid.spi.collision:org.gridgain.grid.spi.collision.fifoqueue:org.gridgain.grid.spi.collision.jobstealing:org.gridgain.grid.spi.collision.noop:org.gridgain.grid.spi.collision.priorityqueue</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Indexing</title>
+                                            <packages>org.gridgain.grid.spi.indexing:org.gridgain.grid.spi.indexing.h2</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Load Balancing</title>
+                                            <packages>org.gridgain.grid.spi.loadbalancing:org.gridgain.grid.spi.loadbalancing.adaptive:org.gridgain.grid.spi.loadbalancing.weightedrandom:org.gridgain.grid.spi.loadbalancing.roundrobin</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Communication</title>
+                                            <packages>org.gridgain.grid.spi.communication:org.gridgain.grid.spi.communication.tcp</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Deployment</title>
+                                            <packages>org.gridgain.grid.spi.deployment:org.gridgain.grid.spi.deployment.local:org.gridgain.grid.spi.deployment.uri</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Swap Space</title>
+                                            <packages>org.gridgain.grid.spi.swapspace:org.gridgain.grid.spi.swapspace.file:org.gridgain.grid.spi.swapspace.noop</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Discovery</title>
+                                            <packages>org.gridgain.grid.spi.discovery:org.gridgain.grid.spi.discovery.tcp:org.gridgain.grid.spi.discovery.tcp.ipfinder:org.gridgain.grid.spi.discovery.tcp.ipfinder.s3:org.gridgain.grid.spi.discovery.tcp.ipfinder.jdbc:org.gridgain.grid.spi.discovery.tcp.ipfinder.sharedfs:org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast:org.gridgain.grid.spi.discovery.tcp.ipfinder.vm:org.gridgain.grid.spi.discovery.tcp.metricsstore:org.gridgain.grid.spi.discovery.tcp.metricsstore.s3:org.gridgain.grid.spi.discovery.tcp.metricsstore.jdbc:org.gridgain.grid.spi.discovery.tcp.metricsstore.sharedfs:org.gridgain.grid.spi.discovery.tcp.metricsstore.vm</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Failover</title>
+                                            <packages>org.gridgain.grid.spi.failover:org.gridgain.grid.spi.failover.never:org.gridgain.grid.spi.failover.jobstealing:org.gridgain.grid.spi.failover.always</packages>
+                                        </group>
+                                        <group>
+                                            <title>SPI: Event Storage</title>
+                                            <packages>org.gridgain.grid.spi.eventstorage:org.gridgain.grid.spi.eventstorage.memory</packages>
+                                        </group>
+                                        <group>
+                                            <title>Segmentation Detection</title>
+                                            <packages>org.gridgain.grid.segmentation</packages>
+                                        </group>
+                                        <group>
+                                            <title>Logging</title>
+                                            <packages>org.gridgain.grid.logger:org.gridgain.grid.logger.log4j:org.gridgain.grid.logger.java:org.gridgain.grid.logger.tomcat:org.gridgain.grid.logger.jcl:org.gridgain.grid.logger.slf4j:org.gridgain.grid.logger.jboss</packages>
+                                        </group>
+                                        <group>
+                                            <title>Loaders</title>
+                                            <packages>org.gridgain.grid.startup:org.gridgain.grid.startup.cmdline:org.gridgain.grid.startup.servlet:org.gridgain.grid.startup.tomcat</packages>
+                                        </group>
+                                        <group>
+                                            <title>Marshallers</title>
+                                            <packages>org.gridgain.grid.marshaller:org.gridgain.grid.marshaller.optimized:org.gridgain.grid.marshaller.jdk</packages>
+                                        </group>
+                                        <group>
+                                            <title>Visor Plugins</title>
+                                            <packages>org.gridgain.visor.plugin</packages>
+                                        </group>
+                                        <group>
+                                            <title>Spring Caching</title>
+                                            <packages>org.gridgain.grid.cache.spring</packages>
+                                        </group>
+                                        <group>
+                                            <title>.Net Configuration</title>
+                                            <packages>org.gridgain.grid.dotnet</packages>
+                                        </group>
+                                    </groups>
+                                    <header>
+                                        <![CDATA[
+                                    GridGain - In-Memory Data Fabric
+                                ]]>
+                                    </header>
+                                    <bottom>
+                                        <![CDATA[
+                                    <table width="100%" border="0" cellspacing=0 cellpadding=0 style="padding: 5px">
+                                    <tr>
+                                        <td>
+                                            <table style="padding-left: 0; margin: 0">
+                                                <tbody style="padding: 0; margin: 0">
+                                                    <tr style="padding: 0; margin: 0">
+                                                        <td>
+                                                            <a target=_blank href="http://www.gridgain.com/"><nobr>2014 Copyright &#169; GridGain Systems</nobr></a>
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                        <td width="100%" align="right" valign="center">
+                                            <table border=0 cellspacing=0 cellpadding=0>
+                                            <tr>
+                                                <td>
+                                                    <nobr>Follow us:&nbsp;&nbsp;</nobr>
+                                                </td>
+                                                <td style="padding-right: 5px">
+                                                    <a class='img_link' target=twitter href='http://www.twitter.com/gridgain'>
+                                                        <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter_bw.png' alt='Follow GridGain on Twitter'/>
+                                                    </a>
+                                                </td>
+                                                <td style="padding-right: 5px">
+                                                    <a class='img_link' target=vimeo href='http://www.vimeo.com/gridgain'>
+                                                        <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo_bw.png' alt='Follow GridGain on Vimeo'/>
+                                                    </a>
+                                                </td>
+                                            </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td colspan="2" valign="top" align="left">
+                                            <table style="padding-left: 0; margin: 0">
+                                                <tbody style="padding: 0; margin: 0">
+                                                    <tr style="padding: 0; margin: 0">
+                                                        <td>
+                                                            <b>GridGain Fabric</b>
+                                                        </td>
+                                                        <td>:&nbsp;&nbsp;
+                                                            ver. <strong>${ignite.version}</strong>
+                                                        </td>
+                                                    </tr>
+                                                    <tr style="padding: 0; margin: 0">
+                                                        <td>
+                                                            <b>Release Date</b>
+                                                        </td>
+                                                        <td>:&nbsp;&nbsp;
+                                                            ${maven.build.timestamp}
+                                                        </td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                    </table>
+                                ]]>
+                                    </bottom>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>client-javadoc</id>
+                                <goals>
+                                    <goal>aggregate</goal>
+                                </goals>
+                                <phase>prepare-package</phase>
+                                <configuration>
+                                    <taglets>
+                                        <taglet>
+                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
+                                            <tagletArtifact>
+                                                <groupId>org.apache.ignite</groupId>
+                                                <artifactId>ignite-tools</artifactId>
+                                                <version>${ignite.version}</version>
+                                            </tagletArtifact>
+                                        </taglet>
+                                    </taglets>
+                                    <reportOutputDirectory>target/javadoc</reportOutputDirectory>
+                                    <destDir>client</destDir>
+                                    <doctitle>GridGain ${ignite.version} - Java Client</doctitle>
+                                    <windowtitle>GridGain ${ignite.version} - Java Client</windowtitle>
+                                    <breakiterator>true</breakiterator>
+                                    <verbose>true</verbose>
+                                    <show>protected</show>
+                                    <use>true</use>
+                                    <author>false</author>
+                                    <version>false</version>
+                                    <source>1.7</source>
+                                    <links>
+                                        <link>http://docs.oracle.com/javase/7/docs/api/</link>
+                                    </links>
+                                    <stylesheetfile>assembly/docfiles/javadoc.css</stylesheetfile>
+                                    <subpackages>org.gridgain.client</subpackages>
+                                    <additionalparam>-exclude org.gridgain.client.impl:org.gridgain.client.util:org.gridgain.client.router.impl</additionalparam>
+                                    <groups>
+                                        <group>
+                                            <title>Client APIs</title>
+                                            <packages>org.gridgain.client:org.gridgain.client.balancer:org.gridgain.client.ssl:org.gridgain.client.hadoop:org.gridgain.client.hadoop.counter</packages>
+                                        </group>
+                                        <group>
+                                            <title>Router APIs</title>
+                                            <packages>org.gridgain.client.router</packages>
+                                        </group>
+                                        <group>
+                                            <title>Marshallers</title>
+                                            <packages>org.gridgain.client.marshaller:org.gridgain.client.marshaller.jdk:org.gridgain.client.marshaller.optimized:org.gridgain.client.marshaller.portable</packages>
+                                        </group>
+                                    </groups>
+                                    <header>
+                                        <![CDATA[
+                                    Java Client
+                                    <br>
+                                    GridGain ver. <b>${ignite.version}</b>
+                                ]]>
+                                    </header>
+                                    <bottom>
+                                        <![CDATA[
+                                    <table width="100%" border="0">
+                                        <tr>
+                                            <td>
+                                                <nobr>GridGain&#153; - Java Client, ver. <strong>${gridgain.version}</strong></nobr>
+                                                <br>
+                                                <a target=_blank href="http://www.gridgain.com/"><nobr>2014 Copyright &#169; GridGain Systems</nobr></a>
+                                            </td>
+                                            <td width="100%" align="right" valign="center">
+                                                <table border=0>
+                                                <tr>
+                                                    <td>
+                                                        <nobr>Follow us:&nbsp;&nbsp;</nobr>
+                                                    </td>
+                                                    <td style="padding-right: 5px">
+                                                        <a class='img_link' target=twitter href='http://www.twitter.com/gridgain'>
+                                                            <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter_bw.png' alt='Follow GridGain on Twitter'/>
+                                                        </a>
+                                                    </td>
+                                                    <td style="padding-right: 5px">
+                                                        <a class='img_link' target=vimeo href='http://www.vimeo.com/gridgain'>
+                                                            <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo_bw.png' alt='Follow GridGain on Vimeo'/>
+                                                        </a>
+                                                    </td>
+                                                </tr>
+                                                </table>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                ]]>
+                                    </bottom>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.7</version>
+                        <inherited>false</inherited>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.ignite</groupId>
+                                <artifactId>ignite-tools</artifactId>
+                                <version>${ignite.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>javadoc-postprocessing</id>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <phase>prepare-package</phase>
+                                <configuration>
+                                    <target>
+                                        <copy todir="target/javadoc/core">
+                                            <fileset dir="assembly/docfiles">
+                                                <include name="img/**"/>
+                                                <include name="*.js"/>
+                                            </fileset>
+                                        </copy>
+
+                                        <copy todir="target/javadoc/client">
+                                            <fileset dir="assembly/docfiles">
+                                                <include name="img/**"/>
+                                                <include name="*.js"/>
+                                            </fileset>
+                                        </copy>
+
+                                        <taskdef name="doctask"
+                                                 classname="org.gridgain.grid.tools.ant.beautifier.GridJavadocAntTask"/>
+
+                                        <doctask css="dotted" dir="target/javadoc/core">
+                                            <include name="**/*.html"/>
+                                            <exclude name="overview-frame.html"/>
+                                            <exclude name="allclasses-frame.html"/>
+                                            <exclude name="**/class-use/*"/>
+                                        </doctask>
+
+                                        <doctask css="dotted" dir="target/javadoc/client">
+                                            <include name="**/*.html"/>
+                                            <exclude name="overview-frame.html"/>
+                                            <exclude name="allclasses-frame.html"/>
+                                            <exclude name="**/class-use/*"/>
+                                        </doctask>
+                                    </target>
+                                </configuration>
+                            </execution>
+
+                            <execution>
+                                <id>release-postprocessing</id>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <configuration>
+                                    <target>
+                                        <replaceregexp byline="true">
+                                            <regexp pattern='pushd "%~dp0"/\.\./\.\.(\s*&amp;::.+)?'/>
+                                            <substitution expression='pushd "%~dp0"/..'/>
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.bat"/>
+                                            </fileset>
+                                        </replaceregexp>
+
+                                        <replaceregexp byline="true">
+                                            <regexp pattern='GRIDGAIN_HOME_TMP="\$\(dirname "\$\{GRIDGAIN_HOME_TMP\}"\)"(\s*#.*)?'/>
+                                            <substitution expression=""/>
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.sh"/>
+                                            </fileset>
+                                        </replaceregexp>
+
+                                        <replaceregexp byline="true">
+                                            <regexp pattern='set SCRIPTS_HOME=%GRIDGAIN_HOME%\\os\\bin(\s*&amp;::.*)?'/>
+                                            <substitution expression='set SCRIPTS_HOME=%GRIDGAIN_HOME%\\\\bin'/>
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.bat"/>
+                                            </fileset>
+                                        </replaceregexp>
+
+                                        <replaceregexp byline="true">
+                                            <regexp pattern='SCRIPTS_HOME="\$\{GRIDGAIN_HOME_TMP\}/os/bin"(\s*#.*)?'/>
+                                            <substitution expression='SCRIPTS_HOME="$${GRIDGAIN_HOME_TMP}/bin"'/>
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.sh"/>
+                                            </fileset>
+                                        </replaceregexp>
+
+                                        <replaceregexp byline="true">
+                                            <regexp pattern='\. "\$\{SCRIPTS_HOME\}"/include/target-classpath.sh(\s*#.*)?'/>
+                                            <substitution expression=""/>
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.sh"/>
+                                            </fileset>
+                                        </replaceregexp>
+
+                                        <replaceregexp byline="true">
+                                            <regexp pattern='call "%SCRIPTS_HOME%\\include\\target-classpath.bat"(\s*&amp;::.*)?'/>
+                                            <substitution expression=""/>
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.bat"/>
+                                            </fileset>
+                                        </replaceregexp>
+
+                                        <replaceregexp byline="true">
+                                            <regexp pattern='ENABLE_ASSERTIONS=.*'/>
+                                            <substitution expression="ENABLE_ASSERTIONS=&quot;0&quot;"/>
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.sh"/>
+                                            </fileset>
+                                        </replaceregexp>
+
+                                        <replaceregexp byline="true">
+                                            <regexp pattern='ENABLE_ASSERTIONS=.*'/>
+                                            <substitution expression="ENABLE_ASSERTIONS=0"/>
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.bat"/>
+                                            </fileset>
+                                        </replaceregexp>
+
+                                        <replace token="@sh.file.version" value="${gridgain.version}">
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.sh"/>
+                                            </fileset>
+                                        </replace>
+
+                                        <replace token="@bat.file.version" value="${gridgain.version}">
+                                            <fileset dir="target/release-package/bin">
+                                                <include name="**/*.bat"/>
+                                            </fileset>
+                                        </replace>
+
+                                        <replace token="@xml.file.version" value="${gridgain.version}">
+                                            <fileset dir="target/release-package">
+                                                <include name="**/*.xml"/>
+                                            </fileset>
+                                        </replace>
+
+                                        <zip destfile="target/gridgain-${gridgain.edition}-os-${ignite.version}.zip"
+                                             encoding="UTF-8">
+                                            <zipfileset dir="target/release-package"
+                                                        prefix="gridgain-${gridgain.edition}-os-${ignite.version}"
+                                                        filemode="755">
+                                                <include name="**/*.sh"/>
+                                                <include name="**/configure"/>
+                                                <include name="**/install-sh"/>
+                                                <include name="**/compile"/>
+                                                <include name="**/missing"/>
+                                            </zipfileset>
+                                            <zipfileset dir="target/release-package"
+                                                        prefix="gridgain-${gridgain.edition}-os-${ignite.version}">
+                                                <exclude name="**/*.sh"/>
+                                                <exclude name="**/configure"/>
+                                                <exclude name="**/install-sh"/>
+                                                <exclude name="**/compile"/>
+                                                <exclude name="**/missing"/>
+                                            </zipfileset>
+                                        </zip>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 </project>


[06/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 8e1e281239d5758003957e48dfa86fdbbd1f9130
Parents: 0ea0d7c
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:40:10 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:40:10 2014 +0300

----------------------------------------------------------------------
 .../ignite/logger/GridLoggerNodeIdAware.java    | 31 ++++++++
 .../apache/ignite/logger/GridNullLogger.java    | 83 ++++++++++++++++++++
 .../java/org/apache/ignite/logger/package.html  | 15 ++++
 .../gridgain/grid/GridBasicWarmupClosure.java   |  2 +-
 .../org/gridgain/grid/kernal/GridGainEx.java    |  2 +-
 .../grid/logger/GridLoggerNodeIdAware.java      | 31 --------
 .../gridgain/grid/logger/GridNullLogger.java    | 83 --------------------
 .../grid/logger/java/GridJavaLogger.java        |  2 +-
 .../java/org/gridgain/grid/logger/package.html  | 15 ----
 .../grid/logger/java/GridJavaLoggerTest.java    |  2 +-
 .../logger/GridLog4jRollingFileAppender.java    |  2 +-
 .../junits/logger/GridTestLog4jLogger.java      |  2 +-
 .../grid/logger/log4j/GridLog4jLogger.java      |  2 +-
 13 files changed, 136 insertions(+), 136 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java b/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java
new file mode 100644
index 0000000..7ddcd64
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java
@@ -0,0 +1,31 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger;
+
+import java.util.*;
+
+/**
+ * Interface for GridGain file appenders to attach node ID to log file names.
+ */
+public interface GridLoggerNodeIdAware {
+    /**
+     * Sets node ID.
+     *
+     * @param nodeId Node ID.
+     */
+    public void setNodeId(UUID nodeId);
+
+    /**
+     * Gets node ID.
+     *
+     * @return Node ID.
+     */
+    public UUID getNodeId();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java
new file mode 100644
index 0000000..dfb7e31
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java
@@ -0,0 +1,83 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Logger which does not output anything.
+ */
+public class GridNullLogger implements IgniteLogger {
+    /** {@inheritDoc} */
+    @Override public IgniteLogger getLogger(Object ctgr) {
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void trace(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void debug(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void info(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg, @Nullable Throwable e) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg, @Nullable Throwable e) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isTraceEnabled() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isDebugEnabled() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isInfoEnabled() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isQuiet() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public String fileName() {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/apache/ignite/logger/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/package.html b/modules/core/src/main/java/org/apache/ignite/logger/package.html
new file mode 100644
index 0000000..6d6a80f
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains logging functionality used throughout the system.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
index f3d5eec..e89ce75 100644
--- a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
@@ -12,8 +12,8 @@ package org.gridgain.grid;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.logger.*;
 import org.gridgain.grid.cache.*;
-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/8e1e2812/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index 25474bc..d16e340 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -12,6 +12,7 @@ package org.gridgain.grid.kernal;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.logger.*;
 import org.apache.ignite.mbean.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -20,7 +21,6 @@ import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.kernal.processors.interop.*;
 import org.gridgain.grid.kernal.processors.resource.*;
 import org.gridgain.grid.kernal.processors.spring.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/logger/GridLoggerNodeIdAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/GridLoggerNodeIdAware.java b/modules/core/src/main/java/org/gridgain/grid/logger/GridLoggerNodeIdAware.java
deleted file mode 100644
index 1ee14f1..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/logger/GridLoggerNodeIdAware.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger;
-
-import java.util.*;
-
-/**
- * Interface for GridGain file appenders to attach node ID to log file names.
- */
-public interface GridLoggerNodeIdAware {
-    /**
-     * Sets node ID.
-     *
-     * @param nodeId Node ID.
-     */
-    public void setNodeId(UUID nodeId);
-
-    /**
-     * Gets node ID.
-     *
-     * @return Node ID.
-     */
-    public UUID getNodeId();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java
deleted file mode 100644
index a4ee985..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Logger which does not output anything.
- */
-public class GridNullLogger implements IgniteLogger {
-    /** {@inheritDoc} */
-    @Override public IgniteLogger getLogger(Object ctgr) {
-        return this;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void trace(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void debug(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void info(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg, @Nullable Throwable e) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg, @Nullable Throwable e) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isTraceEnabled() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isDebugEnabled() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isInfoEnabled() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isQuiet() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public String fileName() {
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
index c5da9cf..c22027e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
+++ b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.logger.java;
 
 import org.apache.ignite.*;
+import org.apache.ignite.logger.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/modules/core/src/main/java/org/gridgain/grid/logger/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/package.html b/modules/core/src/main/java/org/gridgain/grid/logger/package.html
deleted file mode 100644
index 6d6a80f..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/logger/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains logging functionality used throughout the system.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/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 0977cbf..274f3f8 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
@@ -11,7 +11,7 @@ package org.gridgain.grid.logger.java;
 
 import junit.framework.*;
 import org.apache.ignite.*;
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.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/8e1e2812/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
index 45027bb..211b951 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.testframework.junits.logger;
 
+import org.apache.ignite.logger.*;
 import org.apache.log4j.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/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 5c4a179..224fd79 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
@@ -11,11 +11,11 @@ package org.gridgain.testframework.junits.logger;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.logger.*;
 import org.apache.log4j.*;
 import org.apache.log4j.varia.*;
 import org.apache.log4j.xml.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e1e2812/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 526bf45..4fda087 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
@@ -11,11 +11,11 @@ package org.gridgain.grid.logger.log4j;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.logger.*;
 import org.apache.log4j.*;
 import org.apache.log4j.varia.*;
 import org.apache.log4j.xml.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;


[27/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
new file mode 100644
index 0000000..63253fe
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
@@ -0,0 +1,2086 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.gridgain.grid.util.io.*;
+import org.gridgain.testframework.*;
+import org.gridgain.testframework.junits.common.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.math.*;
+import java.net.*;
+import java.text.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.junit.Assert.*;
+
+/**
+ * Test for optimized object streams.
+ */
+public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testNull() throws Exception {
+        assertNull(marshalUnmarshal(null));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testByte() throws Exception {
+        byte val = 10;
+
+        assertEquals(val, marshalUnmarshal(val));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testShort() throws Exception {
+        short val = 100;
+
+        assertEquals(val, marshalUnmarshal(val));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testInteger() throws Exception {
+        int val = 100;
+
+        assertEquals(val, marshalUnmarshal(val));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testLong() throws Exception {
+        long val = 1000L;
+
+        assertEquals(val, marshalUnmarshal(val));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testFloat() throws Exception {
+        float val = 10.0f;
+
+        assertEquals(val, marshalUnmarshal(val));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testDouble() throws Exception {
+        double val = 100.0d;
+
+        assertEquals(val, marshalUnmarshal(val));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testBoolean() throws Exception {
+        boolean val = true;
+
+        assertEquals(val, marshalUnmarshal(val));
+
+        val = false;
+
+        assertEquals(val, marshalUnmarshal(val));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testChar() throws Exception {
+        char val = 10;
+
+        assertEquals(val, marshalUnmarshal(val));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testByteArray() throws Exception {
+        byte[] arr = marshalUnmarshal(new byte[] {1, 2});
+
+        assertArrayEquals(new byte[] {1, 2}, arr);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testShortArray() throws Exception {
+        short[] arr = marshalUnmarshal(new short[] {1, 2});
+
+        assertArrayEquals(new short[] {1, 2}, arr);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testIntArray() throws Exception {
+        int[] arr = marshalUnmarshal(new int[] {1, 2});
+
+        assertArrayEquals(new int[] {1, 2}, arr);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testLongArray() throws Exception {
+        long[] arr = marshalUnmarshal(new long[] {1L, 2L});
+
+        assertArrayEquals(new long[] {1, 2}, arr);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testFloatArray() throws Exception {
+        float[] arr = marshalUnmarshal(new float[] {1.0f, 2.0f});
+
+        assertArrayEquals(new float[] {1.0f, 2.0f}, arr, 0.1f);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testDoubleArray() throws Exception {
+        double[] arr = marshalUnmarshal(new double[] {1.0d, 2.0d});
+
+        assertArrayEquals(new double[] {1.0d, 2.0d}, arr, 0.1d);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testBooleanArray() throws Exception {
+        boolean[] arr = marshalUnmarshal(new boolean[] {true, false, false});
+
+        assertEquals(3, arr.length);
+        assertEquals(true, arr[0]);
+        assertEquals(false, arr[1]);
+        assertEquals(false, arr[2]);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCharArray() throws Exception {
+        char[] arr = marshalUnmarshal(new char[] {1, 2});
+
+        assertArrayEquals(new char[] {1, 2}, arr);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testObject() throws Exception {
+        TestObject obj = new TestObject();
+
+        obj.longVal = 100L;
+        obj.doubleVal = 100.0d;
+        obj.longArr = new Long[] {200L, 300L};
+        obj.doubleArr = new Double[] {200.0d, 300.0d};
+
+        assertEquals(obj, marshalUnmarshal(obj));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testRequireSerializable() throws Exception {
+        try {
+            new GridOptimizedMarshaller(true, null, null, 0).marshal(new Object());
+
+            assert false : "Exception not thrown.";
+        }
+        catch (GridException e) {
+            NotSerializableException serEx = e.getCause(NotSerializableException.class);
+
+            if (serEx == null)
+                throw e;
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testPool() throws Exception {
+        final TestObject obj = new TestObject();
+
+        obj.longVal = 100L;
+        obj.doubleVal = 100.0d;
+        obj.longArr = new Long[100 * 1024];
+        obj.doubleArr = new Double[100 * 1024];
+
+        Arrays.fill(obj.longArr, 100L);
+        Arrays.fill(obj.doubleArr, 100.0d);
+
+        final GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(false, null, null, 5);
+
+        try {
+            multithreaded(new Callable<Object>() {
+                @Override public Object call() throws Exception {
+                    for (int i = 0; i < 50; i++)
+                        assertEquals(obj, marsh.unmarshal(marsh.marshal(obj), null));
+
+                    return null;
+                }
+            }, 20);
+        }
+        finally {
+            marsh.setPoolSize(0);
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testObjectWithNulls() throws Exception {
+        TestObject obj = new TestObject();
+
+        obj.longVal = 100L;
+        obj.longArr = new Long[] {200L, 300L};
+
+        assertEquals(obj, marshalUnmarshal(obj));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testObjectArray() throws Exception {
+        TestObject obj1 = new TestObject();
+
+        obj1.longVal = 100L;
+        obj1.doubleVal = 100.0d;
+        obj1.longArr = new Long[] {200L, 300L};
+        obj1.doubleArr = new Double[] {200.0d, 300.0d};
+
+        TestObject obj2 = new TestObject();
+
+        obj2.longVal = 400L;
+        obj2.doubleVal = 400.0d;
+        obj2.longArr = new Long[] {500L, 600L};
+        obj2.doubleArr = new Double[] {500.0d, 600.0d};
+
+        TestObject[] arr = new TestObject[] {obj1, obj2};
+
+        assertArrayEquals(arr, (Object[])marshalUnmarshal(arr));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testExternalizable() throws Exception {
+        ExternalizableTestObject1 obj = new ExternalizableTestObject1();
+
+        obj.longVal = 100L;
+        obj.doubleVal = 100.0d;
+        obj.longArr = new Long[] {200L, 300L};
+        obj.doubleArr = new Double[] {200.0d, 300.0d};
+
+        assertEquals(obj, marshalUnmarshal(obj));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testExternalizableWithNulls() throws Exception {
+        ExternalizableTestObject2 obj = new ExternalizableTestObject2();
+
+        obj.longVal = 100L;
+        obj.doubleVal = 100.0d;
+        obj.longArr = new Long[] {200L, 300L};
+        obj.doubleArr = new Double[] {200.0d, 300.0d};
+
+        obj = marshalUnmarshal(obj);
+
+        assertEquals(100L, obj.longVal.longValue());
+        assertNull(obj.doubleVal);
+        assertArrayEquals(new Long[] {200L, 300L}, obj.longArr);
+        assertNull(obj.doubleArr);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testLink() throws Exception {
+        for (int i = 0; i < 20; i++) {
+            LinkTestObject1 obj1 = new LinkTestObject1();
+            LinkTestObject2 obj2 = new LinkTestObject2();
+            LinkTestObject2 obj3 = new LinkTestObject2();
+
+            obj1.val = 100;
+            obj2.ref = obj1;
+            obj3.ref = obj1;
+
+            LinkTestObject2[] arr = new LinkTestObject2[] {obj2, obj3};
+
+            assertArrayEquals(arr, (Object[])marshalUnmarshal(arr));
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCycleLink() throws Exception {
+        for (int i = 0; i < 20; i++) {
+            CycleLinkTestObject obj = new CycleLinkTestObject();
+
+            obj.val = 100;
+            obj.ref = obj;
+
+            assertEquals(obj, marshalUnmarshal(obj));
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testNoDefaultConstructor() throws Exception {
+        NoDefaultConstructorTestObject obj = new NoDefaultConstructorTestObject(100);
+
+        assertEquals(obj, marshalUnmarshal(obj));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testEnum() throws Exception {
+        assertEquals(TestEnum.B, marshalUnmarshal(TestEnum.B));
+
+        TestEnum[] arr = new TestEnum[] {TestEnum.C, TestEnum.A, TestEnum.B, TestEnum.A};
+
+        assertArrayEquals(arr, (Object[])marshalUnmarshal(arr));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCollection() throws Exception {
+        TestObject obj1 = new TestObject();
+
+        obj1.longVal = 100L;
+        obj1.doubleVal = 100.0d;
+        obj1.longArr = new Long[] {200L, 300L};
+        obj1.doubleArr = new Double[] {200.0d, 300.0d};
+
+        TestObject obj2 = new TestObject();
+
+        obj2.longVal = 400L;
+        obj2.doubleVal = 400.0d;
+        obj2.longArr = new Long[] {500L, 600L};
+        obj2.doubleArr = new Double[] {500.0d, 600.0d};
+
+        Collection<TestObject> col = F.asList(obj1, obj2);
+
+        assertEquals(col, marshalUnmarshal(col));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testMap() throws Exception {
+        TestObject obj1 = new TestObject();
+
+        obj1.longVal = 100L;
+        obj1.doubleVal = 100.0d;
+        obj1.longArr = new Long[] {200L, 300L};
+        obj1.doubleArr = new Double[] {200.0d, 300.0d};
+
+        TestObject obj2 = new TestObject();
+
+        obj2.longVal = 400L;
+        obj2.doubleVal = 400.0d;
+        obj2.longArr = new Long[] {500L, 600L};
+        obj2.doubleArr = new Double[] {500.0d, 600.0d};
+
+        Map<Integer, TestObject> map = F.asMap(1, obj1, 2, obj2);
+
+        assertEquals(map, marshalUnmarshal(map));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testUuid() throws Exception {
+        UUID uuid = UUID.randomUUID();
+
+        assertEquals(uuid, marshalUnmarshal(uuid));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testDate() throws Exception {
+        Date date = new Date();
+
+        assertEquals(date, marshalUnmarshal(date));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testTransient() throws Exception {
+        TransientTestObject obj = marshalUnmarshal(new TransientTestObject(100, 200, "str1", "str2"));
+
+        assertEquals(100, obj.val1);
+        assertEquals(0, obj.val2);
+        assertEquals("str1", obj.str1);
+        assertNull(obj.str2);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testWriteReadObject() throws Exception {
+        WriteReadTestObject obj = marshalUnmarshal(new WriteReadTestObject(100, "str"));
+
+        assertEquals(100, obj.val);
+        assertEquals("Optional data", obj.str);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testWriteReplace() throws Exception {
+        ReplaceTestObject obj = marshalUnmarshal(new ReplaceTestObject(100));
+
+        assertEquals(200, obj.value());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testWriteReplaceNull() throws Exception {
+        ReplaceNullTestObject obj = marshalUnmarshal(new ReplaceNullTestObject());
+
+        assertNull(obj);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testReadResolve() throws Exception {
+        ResolveTestObject obj = marshalUnmarshal(new ResolveTestObject(100));
+
+        assertEquals(200, obj.value());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testArrayDeque() throws Exception {
+        Queue<Integer> queue = new ArrayDeque<>();
+
+        for (int i = 0; i < 100; i++)
+            queue.add(i);
+
+        Queue<Integer> newQueue = marshalUnmarshal(queue);
+
+        assertEquals(queue.size(), newQueue.size());
+
+        Integer i;
+
+        while ((i = newQueue.poll()) != null)
+            assertEquals(queue.poll(), i);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testArrayList() throws Exception {
+        Collection<Integer> list = new ArrayList<>();
+
+        for (int i = 0; i < 100; i++)
+            list.add(i);
+
+        assertEquals(list, marshalUnmarshal(list));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testHashMap() throws Exception {
+        Map<Integer, Integer> map = new HashMap<>();
+
+        for (int i = 0; i < 100; i++)
+            map.put(i, i);
+
+        assertEquals(map, marshalUnmarshal(map));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testHashSet() throws Exception {
+        Collection<Integer> set = new HashSet<>();
+
+        for (int i = 0; i < 100; i++)
+            set.add(i);
+
+        assertEquals(set, marshalUnmarshal(set));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    @SuppressWarnings("UseOfObsoleteCollectionType")
+    public void testHashtable() throws Exception {
+        Map<Integer, Integer> map = new Hashtable<>();
+
+        for (int i = 0; i < 100; i++)
+            map.put(i, i);
+
+        assertEquals(map, marshalUnmarshal(map));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testIdentityHashMap() throws Exception {
+        Map<Integer, Integer> map = new IdentityHashMap<>();
+
+        for (int i = 0; i < 100; i++)
+            map.put(i, i);
+
+        assertEquals(map, marshalUnmarshal(map));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testLinkedHashMap() throws Exception {
+        Map<Integer, Integer> map = new LinkedHashMap<>();
+
+        for (int i = 0; i < 100; i++)
+            map.put(i, i);
+
+        assertEquals(map, marshalUnmarshal(map));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testLinkedHashSet() throws Exception {
+        Collection<Integer> set = new LinkedHashSet<>();
+
+        for (int i = 0; i < 100; i++)
+            set.add(i);
+
+        assertEquals(set, marshalUnmarshal(set));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testLinkedList() throws Exception {
+        Collection<Integer> list = new LinkedList<>();
+
+        for (int i = 0; i < 100; i++)
+            list.add(i);
+
+        assertEquals(list, marshalUnmarshal(list));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testPriorityQueue() throws Exception {
+        Queue<Integer> queue = new PriorityQueue<>();
+
+        for (int i = 0; i < 100; i++)
+            queue.add(i);
+
+        Queue<Integer> newQueue = marshalUnmarshal(queue);
+
+        assertEquals(queue.size(), newQueue.size());
+
+        Integer i;
+
+        while ((i = newQueue.poll()) != null)
+            assertEquals(queue.poll(), i);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testProperties() throws Exception {
+        Properties dflts = new Properties();
+
+        dflts.setProperty("key1", "val1");
+        dflts.setProperty("key2", "wrong");
+
+        Properties props = new Properties(dflts);
+
+        props.setProperty("key2", "val2");
+
+        Properties newProps = marshalUnmarshal(props);
+
+        assertEquals("val1", newProps.getProperty("key1"));
+        assertEquals("val2", newProps.getProperty("key2"));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testTreeMap() throws Exception {
+        Map<Integer, Integer> map = new TreeMap<>();
+
+        for (int i = 0; i < 100; i++)
+            map.put(i, i);
+
+        assertEquals(map, marshalUnmarshal(map));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testTreeSet() throws Exception {
+        Collection<Integer> set = new TreeSet<>();
+
+        for (int i = 0; i < 100; i++)
+            set.add(i);
+
+        assertEquals(set, marshalUnmarshal(set));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    @SuppressWarnings("UseOfObsoleteCollectionType")
+    public void testVector() throws Exception {
+        Collection<Integer> vector = new Vector<>();
+
+        for (int i = 0; i < 100; i++)
+            vector.add(i);
+
+        assertEquals(vector, marshalUnmarshal(vector));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testString() throws Exception {
+        assertEquals("Latin", marshalUnmarshal("Latin"));
+        assertEquals("Кириллица", marshalUnmarshal("Кириллица"));
+        assertEquals("中国的", marshalUnmarshal("中国的"));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testReadLine() throws Exception {
+        GridOptimizedObjectInputStream in = new GridOptimizedObjectInputStream(new GridUnsafeDataInput());
+
+        byte[] bytes = "line1\nline2\r\nli\rne3\nline4".getBytes();
+
+        in.in().bytes(bytes, bytes.length);
+
+        assertEquals("line1", in.readLine());
+        assertEquals("line2", in.readLine());
+        assertEquals("line3", in.readLine());
+        assertEquals("line4", in.readLine());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testHierarchy() throws Exception {
+        C c = new C(100, "str", 200, "str", 300, "str");
+
+        C newC = marshalUnmarshal(c);
+
+        assertEquals(100, newC.valueA());
+        assertEquals("Optional data", newC.stringA());
+        assertEquals(200, newC.valueB());
+        assertNull(newC.stringB());
+        assertEquals(0, newC.valueC());
+        assertEquals("Optional data", newC.stringC());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testInet4Address() throws Exception {
+        Inet4Address addr = (Inet4Address)InetAddress.getByName("localhost");
+
+        assertEquals(addr, marshalUnmarshal(addr));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testClass() throws Exception {
+        assertEquals(int.class, marshalUnmarshal(int.class));
+        assertEquals(Long.class, marshalUnmarshal(Long.class));
+        assertEquals(TestObject.class, marshalUnmarshal(TestObject.class));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testWriteReadFields() throws Exception {
+        WriteReadFieldsTestObject obj = marshalUnmarshal(new WriteReadFieldsTestObject(100, "str"));
+
+        assertEquals(100, obj.val);
+        assertEquals("Optional data", obj.str);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testWriteFields() throws Exception {
+        WriteFieldsTestObject obj = marshalUnmarshal(new WriteFieldsTestObject(100, "str"));
+
+        assertEquals(100, obj.val);
+        assertEquals("Optional data", obj.str);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testBigInteger() throws Exception {
+        BigInteger b = new BigInteger("54654865468745468465321414646834562346475457488");
+
+        assertEquals(b, marshalUnmarshal(b));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testBigDecimal() throws Exception {
+        BigDecimal b = new BigDecimal("849572389457208934572093574.123512938654126458542145");
+
+        assertEquals(b, marshalUnmarshal(b));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSimpleDateFormat() throws Exception {
+        SimpleDateFormat f = new SimpleDateFormat("MM/dd/yyyy");
+
+        assertEquals(f, marshalUnmarshal(f));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testComplexObject() throws Exception {
+        ComplexTestObject obj = new ComplexTestObject();
+
+        assertEquals(obj, marshalUnmarshal(obj));
+
+        ExternalizableTestObject1 extObj1 = new ExternalizableTestObject1();
+
+        extObj1.longVal = 1000L;
+        extObj1.doubleVal = 1000.0d;
+        extObj1.longArr = new Long[] {1000L, 2000L, 3000L};
+        extObj1.doubleArr = new Double[] {1000.0d, 2000.0d, 3000.0d};
+
+        ExternalizableTestObject1 extObj2 = new ExternalizableTestObject1();
+
+        extObj2.longVal = 2000L;
+        extObj2.doubleVal = 2000.0d;
+        extObj2.longArr = new Long[] {4000L, 5000L, 6000L};
+        extObj2.doubleArr = new Double[] {4000.0d, 5000.0d, 6000.0d};
+
+        Properties props = new Properties();
+
+        props.setProperty("name", "value");
+
+        Collection<Integer> col = F.asList(10, 20, 30);
+
+        Map<Integer, String> map = F.asMap(10, "str1", 20, "str2", 30, "str3");
+
+        obj = new ComplexTestObject(
+            (byte)1,
+            (short)10,
+            100,
+            1000L,
+            100.0f,
+            1000.0d,
+            'a',
+            false,
+            (byte)2,
+            (short)20,
+            200,
+            2000L,
+            200.0f,
+            2000.0d,
+            'b',
+            true,
+            new byte[] {1, 2, 3},
+            new short[] {10, 20, 30},
+            new int[] {100, 200, 300},
+            new long[] {1000, 2000, 3000},
+            new float[] {100.0f, 200.0f, 300.0f},
+            new double[] {1000.0d, 2000.0d, 3000.0d},
+            new char[] {'a', 'b', 'c'},
+            new boolean[] {false, true},
+            new ExternalizableTestObject1[] {extObj1, extObj2},
+            "String",
+            TestEnum.A,
+            UUID.randomUUID(),
+            props,
+            new ArrayList<>(col),
+            new HashMap<>(map),
+            new HashSet<>(col),
+            new LinkedList<>(col),
+            new LinkedHashMap<>(map),
+            new LinkedHashSet<>(col),
+            new Date(),
+            ExternalizableTestObject2.class
+        );
+
+        assertEquals(obj, marshalUnmarshal(obj));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testReadToArray() throws Exception {
+        GridOptimizedObjectInputStream in = GridOptimizedObjectStreamRegistry.in();
+
+        try {
+            byte[] arr = new byte[50];
+
+            for (int i = 0; i < arr.length; i++)
+                arr[i] = (byte)i;
+
+            in.in().bytes(arr, arr.length);
+
+            byte[] buf = new byte[10];
+
+            assertEquals(10, in.read(buf));
+
+            for (int i = 0; i < buf.length; i++)
+                assertEquals(i, buf[i]);
+
+            buf = new byte[30];
+
+            assertEquals(20, in.read(buf, 0, 20));
+
+            for (int i = 0; i < buf.length; i++)
+                assertEquals(i < 20 ? 10 + i : 0, buf[i]);
+
+            buf = new byte[30];
+
+            assertEquals(10, in.read(buf, 10, 10));
+
+            for (int i = 0; i < buf.length; i++)
+                assertEquals(i >= 10 && i < 20 ? 30 + (i - 10) : 0, buf[i]);
+
+            buf = new byte[20];
+
+            assertEquals(10, in.read(buf));
+
+            for (int i = 0; i < buf.length; i++)
+                assertEquals(i < 10 ? 40 + i : 0, buf[i]);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeIn(in);
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testHandleTableGrow() throws Exception {
+        List<String> c = new ArrayList<>();
+
+        for (int i = 0; i < 29; i++)
+            c.add("str");
+
+        String str = c.get(28);
+
+        c.add("str");
+        c.add(str);
+
+        List<Object> c0 = marshalUnmarshal(c);
+
+        assertTrue(c0.get(28) == c0.get(30));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testIncorrectExternalizable() throws Exception {
+        GridTestUtils.assertThrows(
+            log,
+            new Callable<Object>() {
+                @Override public Object call() throws Exception {
+                    return marshalUnmarshal(new IncorrectExternalizable());
+                }
+            },
+            IOException.class,
+            null);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testExcludedClass() throws Exception {
+        Class<?>[] exclClasses = U.staticField(GridMarshallerExclusions.class, "EXCL_CLASSES");
+
+        assertFalse(F.isEmpty(exclClasses));
+
+        for (Class<?> cls : exclClasses)
+            assertEquals(cls, marshalUnmarshal(cls));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testInet6Address() throws Exception {
+        final InetAddress address = Inet6Address.getByAddress(new byte[16]);
+
+        assertEquals(address, marshalUnmarshal(address));
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+    public void testPutFieldsWithDefaultWriteObject() throws Exception {
+        try {
+            marshalUnmarshal(new CustomWriteObjectMethodObject("test"));
+        }
+        catch (IOException e) {
+            assert e.getCause() instanceof NotActiveException;
+        }
+    }
+
+    /**
+     * Marshals and unmarshals object.
+     *
+     * @param obj Original object.
+     * @return Object after marshalling and unmarshalling.
+     * @throws Exception In case of error.
+     */
+    private <T> T marshalUnmarshal(@Nullable Object obj) throws Exception {
+        GridOptimizedObjectOutputStream out = null;
+        GridOptimizedObjectInputStream in = null;
+
+        try {
+            out = GridOptimizedObjectStreamRegistry.out();
+
+            out.requireSerializable(true);
+
+            out.writeObject(obj);
+
+            byte[] arr = out.out().array();
+
+            in = GridOptimizedObjectStreamRegistry.in();
+
+            in.classLoader(getClass().getClassLoader());
+
+            in.in().bytes(arr, arr.length);
+
+            Object obj0 = in.readObject();
+
+            checkHandles(out, in);
+
+            return (T)obj0;
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeOut(out);
+            GridOptimizedObjectStreamRegistry.closeIn(in);
+        }
+    }
+
+    /**
+     * Checks that handles are equal in output and input streams.
+     *
+     * @param out Output stream.
+     * @param in Input stream.
+     * @throws Exception If failed.
+     */
+    private void checkHandles(GridOptimizedObjectOutputStream out, GridOptimizedObjectInputStream in)
+        throws Exception {
+        Object[] outHandles = out.handledObjects();
+        Object[] inHandles = in.handledObjects();
+
+        assertEquals(outHandles.length, inHandles.length);
+
+        for (int i = 0; i < outHandles.length; i++) {
+            if (outHandles[i] == null)
+                assertTrue(inHandles[i] == null);
+            else {
+                assertFalse(inHandles[i] == null);
+
+                assertTrue(outHandles[i].getClass() == inHandles[i].getClass());
+            }
+        }
+    }
+
+    /** */
+    private static class IncorrectExternalizable implements Externalizable {
+        /**
+         * Required by {@link Externalizable}.
+         */
+        public IncorrectExternalizable() {
+            // No-op.
+        }
+
+        /** {@inheritDoc} */
+        @Override public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeLong(0);
+            out.writeObject("str");
+        }
+
+        /** {@inheritDoc} */
+        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            in.readInt();
+            in.readObject();
+        }
+    }
+
+    /**
+     * Test object.
+     */
+    private static class TestObject implements Serializable {
+        /** */
+        private Long longVal;
+
+        /** */
+        private Double doubleVal;
+
+        /** */
+        private Long[] longArr;
+
+        /** */
+        private Double[] doubleArr;
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            TestObject obj = (TestObject)o;
+
+            return longVal != null ? longVal.equals(obj.longVal) : obj.longVal == null &&
+                doubleVal != null ? doubleVal.equals(obj.doubleVal) : obj.doubleVal == null &&
+                Arrays.equals(longArr, obj.longArr) &&
+                Arrays.equals(doubleArr, obj.doubleArr);
+        }
+    }
+
+    /**
+     * Externalizable test object.
+     */
+    private static class ExternalizableTestObject1 implements Externalizable {
+        /** */
+        private Long longVal;
+
+        /** */
+        private Double doubleVal;
+
+        /** */
+        private Long[] longArr;
+
+        /** */
+        private Double[] doubleArr;
+
+        /**
+         * Required by {@link Externalizable}.
+         */
+        public ExternalizableTestObject1() {
+            // No-op.
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            ExternalizableTestObject1 obj = (ExternalizableTestObject1)o;
+
+            return longVal != null ? longVal.equals(obj.longVal) : obj.longVal == null &&
+                doubleVal != null ? doubleVal.equals(obj.doubleVal) : obj.doubleVal == null &&
+                Arrays.equals(longArr, obj.longArr) &&
+                Arrays.equals(doubleArr, obj.doubleArr);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeLong(longVal);
+            out.writeDouble(doubleVal);
+            U.writeArray(out, longArr);
+            U.writeArray(out, doubleArr);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            longVal = in.readLong();
+            doubleVal = in.readDouble();
+
+            Object[] arr = U.readArray(in);
+
+            longArr = Arrays.copyOf(arr, arr.length, Long[].class);
+
+            arr = U.readArray(in);
+
+            doubleArr = Arrays.copyOf(arr, arr.length, Double[].class);
+        }
+    }
+
+    /**
+     * Externalizable test object.
+     */
+    private static class ExternalizableTestObject2 implements Externalizable {
+        /** */
+        private Long longVal;
+
+        /** */
+        private Double doubleVal;
+
+        /** */
+        private Long[] longArr;
+
+        /** */
+        private Double[] doubleArr;
+
+        /**
+         * Required by {@link Externalizable}.
+         */
+        public ExternalizableTestObject2() {
+            // No-op.
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            ExternalizableTestObject2 obj = (ExternalizableTestObject2)o;
+
+            return longVal != null ? longVal.equals(obj.longVal) : obj.longVal == null &&
+                doubleVal != null ? doubleVal.equals(obj.doubleVal) : obj.doubleVal == null &&
+                Arrays.equals(longArr, obj.longArr) &&
+                Arrays.equals(doubleArr, obj.doubleArr);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeLong(longVal);
+            U.writeArray(out, longArr);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            longVal = in.readLong();
+
+            Object[] arr = U.readArray(in);
+
+            longArr = Arrays.copyOf(arr, arr.length, Long[].class);
+        }
+    }
+
+    /**
+     * Test object.
+     */
+    private static class LinkTestObject1 implements Serializable {
+        /** */
+        private int val;
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            LinkTestObject1 obj = (LinkTestObject1)o;
+
+            return val == obj.val;
+        }
+    }
+
+    /**
+     * Test object.
+     */
+    private static class LinkTestObject2 implements Serializable {
+        /** */
+        private LinkTestObject1 ref;
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            LinkTestObject2 obj = (LinkTestObject2)o;
+
+            return ref != null ? ref.equals(obj.ref) : obj.ref == null;
+        }
+    }
+
+    /**
+     * Cycle link test object.
+     */
+    private static class CycleLinkTestObject implements Serializable {
+        /** */
+        private int val;
+
+        /** */
+        private CycleLinkTestObject ref;
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            CycleLinkTestObject obj = (CycleLinkTestObject)o;
+
+            return val == obj.val && ref != null ? ref.val == val : obj.ref == null;
+        }
+    }
+
+    /**
+     * Test object without default constructor.
+     */
+    private static class NoDefaultConstructorTestObject implements Serializable {
+        /** */
+        private int val;
+
+        /**
+         * @param val Value.
+         */
+        private NoDefaultConstructorTestObject(int val) {
+            this.val = val;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            NoDefaultConstructorTestObject obj = (NoDefaultConstructorTestObject)o;
+
+            return val == obj.val;
+        }
+    }
+
+    /**
+     * Test object with transient fields.
+     */
+    @SuppressWarnings("TransientFieldNotInitialized")
+    private static class TransientTestObject implements Serializable {
+        /** */
+        private int val1;
+
+        /** */
+        private transient int val2;
+
+        /** */
+        private String str1;
+
+        /** */
+        private transient String str2;
+
+        /**
+         * @param val1 Value 1.
+         * @param val2 Value 2.
+         * @param str1 String 1.
+         * @param str2 String 2.
+         */
+        private TransientTestObject(int val1, int val2, String str1, String str2) {
+            this.val1 = val1;
+            this.val2 = val2;
+            this.str1 = str1;
+            this.str2 = str2;
+        }
+    }
+
+    /**
+     * Test object with {@code writeObject} and {@code readObject} methods.
+     */
+    @SuppressWarnings("TransientFieldNotInitialized")
+    private static class WriteReadTestObject implements Serializable {
+        /** */
+        private int val;
+
+        /** */
+        private transient String str;
+
+        /**
+         * @param val Value.
+         * @param str String.
+         */
+        private WriteReadTestObject(int val, String str) {
+            this.val = val;
+            this.str = str;
+        }
+
+        /**
+         * @param out Output stream.
+         * @throws IOException In case of error.
+         */
+        private void writeObject(ObjectOutputStream out) throws IOException {
+            out.defaultWriteObject();
+
+            out.writeUTF("Optional data");
+        }
+
+        /**
+         * @param in Input stream.
+         * @throws IOException In case of error.
+         * @throws ClassNotFoundException If class not found.
+         */
+        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+            in.defaultReadObject();
+
+            str = in.readUTF();
+        }
+    }
+
+    /**
+     * Test object that uses {@code writeFields} and {@code readFields} methods.
+     */
+    private static class WriteReadFieldsTestObject implements Serializable {
+        /** */
+        private int val;
+
+        /** */
+        private String str;
+
+        /**
+         * @param val Value.
+         * @param str String.
+         */
+        private WriteReadFieldsTestObject(int val, String str) {
+            this.val = val;
+            this.str = str;
+        }
+
+        /**
+         * @param out Output stream.
+         * @throws IOException In case of error.
+         */
+        private void writeObject(ObjectOutputStream out) throws IOException {
+            ObjectOutputStream.PutField fields = out.putFields();
+
+            fields.put("val", val);
+            fields.put("str", "Optional data");
+
+            out.writeFields();
+        }
+
+        /**
+         * @param in Input stream.
+         * @throws IOException In case of error.
+         * @throws ClassNotFoundException If class not found.
+         */
+        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+            ObjectInputStream.GetField fields = in.readFields();
+
+            val = fields.get("val", 0);
+            str = (String)fields.get("str", null);
+        }
+    }
+
+    /**
+     * Test object that uses {@code writeFields} and {@code readFields} methods.
+     */
+    private static class WriteFieldsTestObject implements Serializable {
+        /** */
+        private int val;
+
+        /** */
+        @SuppressWarnings("UnusedDeclaration")
+        private String str;
+
+        /**
+         * @param val Value.
+         * @param str String.
+         */
+        private WriteFieldsTestObject(int val, String str) {
+            this.val = val;
+            this.str = str;
+        }
+
+        /**
+         * @param out Output stream.
+         * @throws IOException In case of error.
+         */
+        private void writeObject(ObjectOutputStream out) throws IOException {
+            ObjectOutputStream.PutField fields = out.putFields();
+
+            fields.put("val", val);
+            fields.put("str", "Optional data");
+
+            out.writeFields();
+        }
+    }
+
+    /**
+     * Base object with {@code writeReplace} method.
+     */
+    private abstract static class ReplaceTestBaseObject implements Serializable {
+        /** */
+        private int val;
+
+        /**
+         * @param val Value.
+         */
+        private ReplaceTestBaseObject(int val) {
+            this.val = val;
+        }
+
+        /**
+         * @return Value.
+         */
+        public int value() {
+            return val;
+        }
+
+        /**
+         * @return Replaced object.
+         * @throws ObjectStreamException In case of error.
+         */
+        protected Object writeReplace() throws ObjectStreamException {
+            return new ReplaceTestObject(val * 2);
+        }
+    }
+
+    /**
+     * Test object for {@code writeReplace} method.
+     */
+    private static class ReplaceTestObject extends ReplaceTestBaseObject {
+        /**
+         * @param val Value.
+         */
+        private ReplaceTestObject(int val) {
+            super(val);
+        }
+    }
+
+    /**
+     * Test object with {@code writeReplace} method.
+     */
+    private static class ReplaceNullTestObject implements Serializable {
+        /**
+         * @return Replaced object.
+         * @throws ObjectStreamException In case of error.
+         */
+        protected Object writeReplace() throws ObjectStreamException {
+            return null;
+        }
+    }
+
+    /**
+     * Base object with {@code readResolve} method.
+     */
+    private abstract static class ResolveTestBaseObject implements Serializable {
+        /** */
+        private int val;
+
+        /**
+         * @param val Value.
+         */
+        private ResolveTestBaseObject(int val) {
+            this.val = val;
+        }
+
+        /**
+         * @return Value.
+         */
+        public int value() {
+            return val;
+        }
+
+        /**
+         * @return Replaced object.
+         * @throws ObjectStreamException In case of error.
+         */
+        protected Object readResolve() throws ObjectStreamException {
+            return new ResolveTestObject(val * 2);
+        }
+    }
+
+    /**
+     * Test object for {@code readResolve} method.
+     */
+    private static class ResolveTestObject extends ResolveTestBaseObject {
+        /**
+         * @param val Value.
+         */
+        private ResolveTestObject(int val) {
+            super(val);
+        }
+    }
+
+    /**
+     * Class A.
+     */
+    private static class A implements Serializable {
+        /** */
+        private int valA;
+
+        /** */
+        private transient String strA;
+
+        /**
+         * @param valA Value A.
+         * @param strA String A.
+         */
+        A(int valA, String strA) {
+            this.valA = valA;
+            this.strA = strA;
+        }
+
+        /**
+         * @return Value.
+         */
+        int valueA() {
+            return valA;
+        }
+
+        /**
+         * @return String.
+         */
+        String stringA() {
+            return strA;
+        }
+
+        /**
+         * @param out Output stream.
+         * @throws IOException In case of error.
+         */
+        private void writeObject(ObjectOutputStream out) throws IOException {
+            out.defaultWriteObject();
+
+            out.writeUTF("Optional data");
+        }
+
+        /**
+         * @param in Input stream.
+         * @throws IOException In case of error.
+         * @throws ClassNotFoundException If class not found.
+         */
+        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+            in.defaultReadObject();
+
+            strA = in.readUTF();
+        }
+    }
+
+    /**
+     * Class B.
+     */
+    private static class B extends A {
+        /** */
+        private int valB;
+
+        /** */
+        @SuppressWarnings("TransientFieldNotInitialized")
+        private transient String strB;
+
+        /**
+         * @param valA Value A.
+         * @param strA String A.
+         * @param valB Value B.
+         * @param strB String B.
+         */
+        B(int valA, String strA, int valB, String strB) {
+            super(valA, strA);
+
+            this.valB = valB;
+            this.strB = strB;
+        }
+
+        /**
+         * @return Value.
+         */
+        int valueB() {
+            return valB;
+        }
+
+        /**
+         * @return String.
+         */
+        String stringB() {
+            return strB;
+        }
+    }
+
+    /**
+     * Class C.
+     */
+    @SuppressWarnings("MethodOverridesPrivateMethodOfSuperclass")
+    private static class C extends B {
+        /** */
+        @SuppressWarnings("InstanceVariableMayNotBeInitializedByReadObject")
+        private int valC;
+
+        /** */
+        private transient String strC;
+
+        /**
+         * @param valA Value A.
+         * @param strA String A.
+         * @param valB Value B.
+         * @param strB String B.
+         * @param valC Value C.
+         * @param strC String C.
+         */
+        C(int valA, String strA, int valB, String strB, int valC, String strC) {
+            super(valA, strA, valB, strB);
+
+            this.valC = valC;
+            this.strC = strC;
+        }
+
+        /**
+         * @return Value.
+         */
+        int valueC() {
+            return valC;
+        }
+
+        /**
+         * @return String.
+         */
+        String stringC() {
+            return strC;
+        }
+
+        /**
+         * @param out Output stream.
+         * @throws IOException In case of error.
+         */
+        private void writeObject(ObjectOutputStream out) throws IOException {
+            out.writeUTF("Optional data");
+        }
+
+        /**
+         * @param in Input stream.
+         * @throws IOException In case of error.
+         * @throws ClassNotFoundException If class not found.
+         */
+        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+            strC = in.readUTF();
+        }
+    }
+
+    /**
+     * Complex test object.
+     */
+    private static class ComplexTestObject implements Serializable {
+        /** */
+        private byte byteVal1;
+
+        /** */
+        private short shortVal1;
+
+        /** */
+        private int intVal1;
+
+        /** */
+        private long longVal1;
+
+        /** */
+        private float floatVal1;
+
+        /** */
+        private double doubleVal1;
+
+        /** */
+        private char cVal1;
+
+        /** */
+        private boolean boolVal1;
+
+        /** */
+        private Byte byteVal2;
+
+        /** */
+        private Short shortVal2;
+
+        /** */
+        private Integer intVal2;
+
+        /** */
+        private Long longVal2;
+
+        /** */
+        private Float floatVal2;
+
+        /** */
+        private Double doubleVal2;
+
+        /** */
+        private Character cVal2;
+
+        /** */
+        private Boolean boolVal2;
+
+        /** */
+        private byte[] byteArr;
+
+        /** */
+        private short[] shortArr;
+
+        /** */
+        private int[] intArr;
+
+        /** */
+        private long[] longArr;
+
+        /** */
+        private float[] floatArr;
+
+        /** */
+        private double[] doubleArr;
+
+        /** */
+        private char[] cArr;
+
+        /** */
+        private boolean[] boolArr;
+
+        /** */
+        private ExternalizableTestObject1[] objArr;
+
+        /** */
+        private String str;
+
+        /** */
+        private TestEnum enumVal;
+
+        /** */
+        private UUID uuid;
+
+        /** */
+        private Properties props;
+
+        /** */
+        private ArrayList<Integer> arrList;
+
+        /** */
+        private HashMap<Integer, String> hashMap;
+
+        /** */
+        private HashSet<Integer> hashSet;
+
+        /** */
+        private LinkedList<Integer> linkedList;
+
+        /** */
+        private LinkedHashMap<Integer, String> linkedHashMap;
+
+        /** */
+        private LinkedHashSet<Integer> linkedHashSet;
+
+        /** */
+        private Date date;
+
+        /** */
+        private Class<?> cls;
+
+        /** */
+        private ComplexTestObject self;
+
+        /** */
+        private ComplexTestObject() {
+            self = this;
+        }
+
+        /**
+         * @param byteVal1 Byte value.
+         * @param shortVal1 Short value.
+         * @param intVal1 Integer value.
+         * @param longVal1 Long value.
+         * @param floatVal1 Float value.
+         * @param doubleVal1 Double value.
+         * @param cVal1 Char value.
+         * @param boolVal1 Boolean value.
+         * @param byteVal2 Byte value.
+         * @param shortVal2 Short value.
+         * @param intVal2 Integer value.
+         * @param longVal2 Long value.
+         * @param floatVal2 Float value.
+         * @param doubleVal2 Double value.
+         * @param cVal2 Char value.
+         * @param boolVal2 Boolean value.
+         * @param byteArr Bytes array.
+         * @param shortArr Shorts array.
+         * @param intArr Integers array.
+         * @param longArr Longs array.
+         * @param floatArr Floats array.
+         * @param doubleArr Doubles array.
+         * @param cArr Chars array.
+         * @param boolArr Booleans array.
+         * @param objArr Objects array.
+         * @param str String.
+         * @param enumVal Enum.
+         * @param uuid UUID.
+         * @param props Properties.
+         * @param arrList ArrayList.
+         * @param hashMap HashMap.
+         * @param hashSet HashSet.
+         * @param linkedList LinkedList.
+         * @param linkedHashMap LinkedHashMap.
+         * @param linkedHashSet LinkedHashSet.
+         * @param date Date.
+         * @param cls Class.
+         */
+        private ComplexTestObject(byte byteVal1, short shortVal1, int intVal1, long longVal1, float floatVal1,
+            double doubleVal1, char cVal1, boolean boolVal1, Byte byteVal2, Short shortVal2, Integer intVal2,
+            Long longVal2, Float floatVal2, Double doubleVal2, Character cVal2, Boolean boolVal2, byte[] byteArr,
+            short[] shortArr, int[] intArr, long[] longArr, float[] floatArr, double[] doubleArr, char[] cArr,
+            boolean[] boolArr, ExternalizableTestObject1[] objArr, String str, TestEnum enumVal, UUID uuid,
+            Properties props, ArrayList<Integer> arrList, HashMap<Integer, String> hashMap, HashSet<Integer> hashSet,
+            LinkedList<Integer> linkedList, LinkedHashMap<Integer, String> linkedHashMap,
+            LinkedHashSet<Integer> linkedHashSet, Date date, Class<?> cls) {
+            this.byteVal1 = byteVal1;
+            this.shortVal1 = shortVal1;
+            this.intVal1 = intVal1;
+            this.longVal1 = longVal1;
+            this.floatVal1 = floatVal1;
+            this.doubleVal1 = doubleVal1;
+            this.cVal1 = cVal1;
+            this.boolVal1 = boolVal1;
+            this.byteVal2 = byteVal2;
+            this.shortVal2 = shortVal2;
+            this.intVal2 = intVal2;
+            this.longVal2 = longVal2;
+            this.floatVal2 = floatVal2;
+            this.doubleVal2 = doubleVal2;
+            this.cVal2 = cVal2;
+            this.boolVal2 = boolVal2;
+            this.byteArr = byteArr;
+            this.shortArr = shortArr;
+            this.intArr = intArr;
+            this.longArr = longArr;
+            this.floatArr = floatArr;
+            this.doubleArr = doubleArr;
+            this.cArr = cArr;
+            this.boolArr = boolArr;
+            this.objArr = objArr;
+            this.str = str;
+            this.enumVal = enumVal;
+            this.uuid = uuid;
+            this.props = props;
+            this.arrList = arrList;
+            this.hashMap = hashMap;
+            this.hashSet = hashSet;
+            this.linkedList = linkedList;
+            this.linkedHashMap = linkedHashMap;
+            this.linkedHashSet = linkedHashSet;
+            this.date = date;
+            this.cls = cls;
+
+            self = this;
+        }
+
+        /** {@inheritDoc} */
+        @SuppressWarnings("RedundantIfStatement")
+        @Override public boolean equals(Object o) {
+            if (this == o)
+                return true;
+
+            if (o == null || getClass() != o.getClass())
+                return false;
+
+            ComplexTestObject obj = (ComplexTestObject)o;
+
+            if (boolVal1 != obj.boolVal1)
+                return false;
+
+            if (byteVal1 != obj.byteVal1)
+                return false;
+
+            if (cVal1 != obj.cVal1)
+                return false;
+
+            if (Double.compare(obj.doubleVal1, doubleVal1) != 0)
+                return false;
+
+            if (Float.compare(obj.floatVal1, floatVal1) != 0)
+                return false;
+
+            if (intVal1 != obj.intVal1)
+                return false;
+
+            if (longVal1 != obj.longVal1)
+                return false;
+
+            if (shortVal1 != obj.shortVal1)
+                return false;
+
+            if (arrList != null ? !arrList.equals(obj.arrList) : obj.arrList != null)
+                return false;
+
+            if (!Arrays.equals(boolArr, obj.boolArr))
+                return false;
+
+            if (boolVal2 != null ? !boolVal2.equals(obj.boolVal2) : obj.boolVal2 != null)
+                return false;
+
+            if (!Arrays.equals(byteArr, obj.byteArr))
+                return false;
+
+            if (byteVal2 != null ? !byteVal2.equals(obj.byteVal2) : obj.byteVal2 != null)
+                return false;
+
+            if (!Arrays.equals(cArr, obj.cArr))
+                return false;
+
+            if (cVal2 != null ? !cVal2.equals(obj.cVal2) : obj.cVal2 != null)
+                return false;
+
+            if (cls != null ? !cls.equals(obj.cls) : obj.cls != null)
+                return false;
+
+            if (date != null ? !date.equals(obj.date) : obj.date != null)
+                return false;
+
+            if (!Arrays.equals(doubleArr, obj.doubleArr))
+                return false;
+
+            if (doubleVal2 != null ? !doubleVal2.equals(obj.doubleVal2) : obj.doubleVal2 != null)
+                return false;
+
+            if (enumVal != obj.enumVal)
+                return false;
+
+            if (!Arrays.equals(floatArr, obj.floatArr))
+                return false;
+
+            if (floatVal2 != null ? !floatVal2.equals(obj.floatVal2) : obj.floatVal2 != null)
+                return false;
+
+            if (hashMap != null ? !hashMap.equals(obj.hashMap) : obj.hashMap != null)
+                return false;
+
+            if (hashSet != null ? !hashSet.equals(obj.hashSet) : obj.hashSet != null)
+                return false;
+
+            if (!Arrays.equals(intArr, obj.intArr))
+                return false;
+
+            if (intVal2 != null ? !intVal2.equals(obj.intVal2) : obj.intVal2 != null)
+                return false;
+
+            if (linkedHashMap != null ? !linkedHashMap.equals(obj.linkedHashMap) : obj.linkedHashMap != null)
+                return false;
+
+            if (linkedHashSet != null ? !linkedHashSet.equals(obj.linkedHashSet) : obj.linkedHashSet != null)
+                return false;
+
+            if (linkedList != null ? !linkedList.equals(obj.linkedList) : obj.linkedList != null)
+                return false;
+
+            if (!Arrays.equals(longArr, obj.longArr))
+                return false;
+
+            if (longVal2 != null ? !longVal2.equals(obj.longVal2) : obj.longVal2 != null)
+                return false;
+
+            if (!Arrays.equals(objArr, obj.objArr))
+                return false;
+
+            if (props != null ? !props.equals(obj.props) : obj.props != null)
+                return false;
+
+            if (!Arrays.equals(shortArr, obj.shortArr))
+                return false;
+
+            if (shortVal2 != null ? !shortVal2.equals(obj.shortVal2) : obj.shortVal2 != null)
+                return false;
+
+            if (str != null ? !str.equals(obj.str) : obj.str != null)
+                return false;
+
+            if (uuid != null ? !uuid.equals(obj.uuid) : obj.uuid != null)
+                return false;
+
+            if (self != this)
+                return false;
+
+            return true;
+        }
+    }
+
+    /**
+     * Test enum.
+     */
+    @SuppressWarnings("JavaDoc")
+    private enum TestEnum {
+        /** */
+        A,
+
+        /** */
+        B,
+
+        /** */
+        C
+    }
+
+    /**
+     * Class with custom serialization method which at the beginning invokes
+     * {@link ObjectOutputStream#defaultWriteObject()} and {@link ObjectOutputStream#putFields()} then.
+     */
+    public static class CustomWriteObjectMethodObject implements Serializable {
+        /** */
+        private final String name;
+
+        /**
+         * Creates new instance.
+         * @param name Object name.
+         */
+        public CustomWriteObjectMethodObject(String name) {
+            this.name = name;
+        }
+
+        /** {@inheritDoc} */
+        private void writeObject(ObjectOutputStream stream) throws IOException {
+            stream.defaultWriteObject();
+
+            ObjectOutputStream.PutField fields = stream.putFields();
+            fields.put("name", "test");
+
+            stream.writeFields();
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
new file mode 100644
index 0000000..0c6f379
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
@@ -0,0 +1,36 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.gridgain.grid.spi.GridSpiException;
+import org.gridgain.grid.spi.discovery.tcp.ipfinder.GridTcpDiscoveryIpFinderAdapter;
+
+import java.net.InetSocketAddress;
+import java.util.Collection;
+
+/**
+ * Test TCP discovery IP finder adapter.
+ */
+public class GridTestTcpDiscoveryIpFinderAdapter extends GridTcpDiscoveryIpFinderAdapter {
+    /** {@inheritDoc} */
+    @Override public Collection<InetSocketAddress> getRegisteredAddresses() throws GridSpiException {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void registerAddresses(Collection<InetSocketAddress> addrs) throws GridSpiException {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void unregisterAddresses(Collection<InetSocketAddress> addrs) throws GridSpiException {
+        // No-op.
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/package.html b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/package.html
new file mode 100644
index 0000000..07c5c25
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Optimized marchalling test package.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
deleted file mode 100644
index 1167250..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import junit.framework.*;
-import org.apache.ignite.marshaller.optimized.*;
-
-/**
- *
- */
-public class GridOptimizedMarshallerEnumSelfTest extends TestCase {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testEnumSerialisation() throws Exception {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
-
-        byte[] bytes = marsh.marshal(TestEnum.Bond);
-
-        TestEnum unmarshalled = marsh.unmarshal(bytes, Thread.currentThread().getContextClassLoader());
-
-        assertEquals(TestEnum.Bond, unmarshalled);
-        assertEquals(TestEnum.Bond.desc, unmarshalled.desc);
-    }
-
-    private enum TestEnum {
-        Equity("Equity") {
-            @Override public String getTestString() {
-                return "eee";
-            }
-        },
-
-        Bond("Bond") {
-            @Override public String getTestString() {
-                return "qqq";
-            }
-        };
-
-        public final String desc;
-
-        TestEnum(String desc) {
-            this.desc = desc;
-        }
-
-        public abstract String getTestString();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
deleted file mode 100644
index ce795b6..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
+++ /dev/null
@@ -1,437 +0,0 @@
-package org.gridgain.grid.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.testframework.*;
-import org.gridgain.testframework.junits.common.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-
-/**
- * Optimized marshaller self test.
- */
-@GridCommonTest(group = "Marshaller")
-public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
-    /** {@inheritDoc} */
-    @Override protected GridMarshaller createMarshaller() {
-        GridOptimizedMarshaller m = new GridOptimizedMarshaller();
-
-        m.setRequireSerializable(false);
-        m.setClassNames(F.asList(GoodMarshallable.class.getName(), NoMarshallable.class.getName()));
-
-        return m;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testTestMarshalling() throws Exception {
-        final String msg = "PASSED";
-
-        assert msg != null;
-
-        byte[] buf = marshal(new IgniteRunnable() {
-            @Override public void run() {
-                c1.apply(msg);
-                c2.apply(msg);
-
-                c3.apply();
-                c4.reduce();
-
-                System.out.println("Test message: " + msg);
-            }
-        });
-
-        Runnable r = unmarshal(buf);
-
-        assertNotNull(r);
-
-        r.run();
-    }
-
-    /**
-     * Tests marshal self-linked object.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testMarshallingSelfLink() throws GridException {
-        SelfLink sl = new SelfLink("a string 1");
-
-        sl.link(sl);
-
-        SelfLink sl1 = unmarshal(marshal(sl));
-
-        assert sl1.link() == sl1;
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testInvalid() throws Exception {
-        GridTestUtils.assertThrows(
-            log,
-            new Callable<Object>() {
-                @Override public Object call() throws Exception {
-                    unmarshal(new byte[10]);
-
-                    return null;
-                }
-            },
-            GridException.class,
-            null
-        );
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testNested() throws Exception {
-        NestedTestObject obj = new NestedTestObject("String", 100);
-
-        NestedTestObject newObj = unmarshal(marshal(obj));
-
-        assertEquals("String", newObj.str);
-        assertEquals(100, newObj.val);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGoodMarshallable() throws Exception {
-        GoodMarshallable obj = new GoodMarshallable("String", 100);
-
-        GoodMarshallable newObj = unmarshal(marshal(obj));
-
-        assertEquals("String", newObj.getString());
-        assertEquals(100, newObj.getInt());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testBadMarshallable() throws Exception {
-        BadMarshallable obj = new BadMarshallable("String", 100);
-
-        try {
-            System.out.println(unmarshal(marshal(obj)));
-
-            assert false;
-        }
-        catch (GridException e) {
-            assert e.getCause() instanceof IOException;
-            assert e.getCause().getMessage().contains("must return the value of the field");
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void checkPerformance() throws Exception {
-        final int cnt = 5_000_000;
-
-        for (int j = 0; j < 5; j++) {
-            long start = System.nanoTime();
-
-            for (int i = 0; i < cnt; i++) {
-                String s = "string-" + i;
-
-                NoMarshallable obj = new NoMarshallable(s, i);
-
-                NoMarshallable newObj = unmarshal(marshal(obj));
-
-                assertEquals(s, newObj.getString());
-            }
-
-            X.println("Marshalling NoMarshallable duration: " + ((System.nanoTime() - start) / 1_000_000) + "ms");
-        }
-
-
-        for (int j = 0; j < 5; j++) {
-            long start = System.nanoTime();
-
-            for (int i = 0; i < cnt; i++) {
-                String s = "string-" + i;
-
-                GoodMarshallable obj = new GoodMarshallable(s, i);
-
-                GoodMarshallable newObj = unmarshal(marshal(obj));
-
-                assertEquals(s, newObj.getString());
-            }
-
-            X.println("Marshalling Marshallable duration: " + ((System.nanoTime() - start) / 1_000_000) + "ms");
-        }
-    }
-
-    /**
-     * Class for nested execution test.
-     */
-    private static class NestedTestObject implements Serializable {
-        /** */
-        private String str;
-
-        /** */
-        private int val;
-
-        /**
-         * @param str String.
-         * @param val Value.
-         */
-        private NestedTestObject(String str, int val) {
-            this.str = str;
-            this.val = val;
-        }
-
-        /** {@inheritDoc} */
-        private void writeObject(ObjectOutputStream out) throws IOException {
-            try {
-                byte[] arr = marshal(str);
-
-                out.writeInt(arr.length);
-                out.write(arr);
-
-                out.writeInt(val);
-            }
-            catch (GridException e) {
-                throw new IOException(e);
-            }
-        }
-
-        /** {@inheritDoc} */
-        @SuppressWarnings("UnusedParameters")
-        private void readObject(ObjectInputStream in) throws IOException {
-            try {
-                byte[] arr = new byte[in.readInt()];
-
-                in.read(arr);
-
-                str = unmarshal(arr);
-
-                val = in.readInt();
-            }
-            catch (GridException e) {
-                throw new IOException(e);
-            }
-        }
-    }
-
-    /** */
-    private static class TestObject2 {
-        /** */
-        private final int i;
-
-        /**
-         * Constructor for TestObject2 instances.
-         *
-         * @param i Integer value to hold.
-         */
-        private TestObject2(int i) {
-            this.i = i;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            return i == ((TestObject2)o).i;
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return i;
-        }
-    }
-
-    /**
-     * Static nested class.
-     */
-    private static class TestObject {
-        /** */
-        private final TestObject2 o2;
-
-        /** The only meaningful field in the class, used for {@link #equals(Object o)} and {@link #hashCode()}. */
-        private final String str;
-
-        /**
-         * @param str String to hold.
-         * @param i Integer.
-         */
-        TestObject(String str, int i) {
-            this.str = str;
-
-            o2 = new TestObject2(i);
-        }
-
-        /**
-         * Method for accessing value of the hold string after the object is created.
-         *
-         * @return Wrapped string.
-         */
-        public String string() {
-            return str;
-        }
-
-        /**
-         * @return Object held in this wrapped.
-         */
-        public TestObject2 obj() {
-            return o2;
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return 31 * o2.hashCode() + str.hashCode();
-        }
-
-        /** {@inheritDoc} */
-        @SuppressWarnings("RedundantIfStatement")
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            TestObject obj = (TestObject)o;
-
-            if (o2 != null ? !o2.equals(obj.o2) : obj.o2 != null)
-                return false;
-
-            if (str != null ? !str.equals(obj.str) : obj.str != null)
-                return false;
-
-            return true;
-        }
-    }
-
-    /**
-     * Static nested class.
-     */
-    private static class SelfLink extends TestObject {
-        /** */
-        private SelfLink link;
-
-        /**
-         * @param str String to hold.
-         */
-        SelfLink(String str) {
-            super(str, 1);
-        }
-
-        /**
-         * @return The object this link points to,.
-         */
-        public SelfLink link() {
-            return link;
-        }
-
-        /**
-         * @param link The object this link should points to,
-         */
-        public void link(SelfLink link) {
-            this.link = link;
-        }
-    }
-
-    /**
-     *
-     */
-    public static class GoodMarshallable implements GridOptimizedMarshallable, Serializable {
-        /** Class ID required by {@link GridOptimizedMarshallable}. */
-        @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
-
-        /** */
-        private String str;
-
-        /** */
-        private int i;
-
-        /**
-         * @param str String.
-         * @param i Integer.
-         */
-        public GoodMarshallable(String str, int i) {
-            this.str = str;
-            this.i = i;
-        }
-
-        /**
-         * @return Int value.
-         */
-        private int getInt() {
-            return i;
-        }
-
-        /**
-         * @return String value
-         */
-        private String getString() {
-            return str;
-        }
-
-        /** {@inheritDoc} */
-        @Override public Object ggClassId() {
-            return GG_CLASS_ID;
-        }
-    }
-
-    /**
-     *
-     */
-    public static class NoMarshallable implements Serializable {
-        /** */
-        private String str;
-
-        /** */
-        private int i;
-
-        /**
-         * @param str String.
-         * @param i Integer.
-         */
-        public NoMarshallable(String str, int i) {
-            this.str = str;
-            this.i = i;
-        }
-
-        /**
-         * @return Int value.
-         */
-        private int getInt() {
-            return i;
-        }
-
-        /**
-         * @return String value
-         */
-        private String getString() {
-            return str;
-        }
-    }
-
-    /**
-     *
-     */
-    private static class BadMarshallable extends TestObject implements GridOptimizedMarshallable {
-        /** Class ID required by {@link GridOptimizedMarshallable}. */
-        @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
-        private static Object GG_CLASS_ID;
-
-        /**
-         * @param str String.
-         * @param i Integer.
-         */
-        private BadMarshallable(String str, int i) {
-            super(str, i);
-        }
-
-        /** {@inheritDoc} */
-        @Override public Object ggClassId() {
-            return new Object();
-        }
-    }
-}


[12/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 78736f3c418666b4c50f2f094912b6be0bea5ce4
Parents: ff14819
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:50:21 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:50:26 2014 +0300

----------------------------------------------------------------------
 .../spi/checkpoint/s3/GridS3CheckpointSpi.java  |   2 +-
 .../processors/rest/GridTestMemcacheClient.java |   2 +-
 .../configuration/IgniteConfiguration.java      |   2 +-
 .../marshaller/GridAbstractMarshaller.java      |  57 ++++++++
 .../ignite/marshaller/GridMarshaller.java       | 130 +++++++++++++++++
 .../marshaller/GridMarshallerExclusions.java    | 145 +++++++++++++++++++
 .../org/apache/ignite/marshaller/package.html   |  15 ++
 .../resources/IgniteMarshallerResource.java     |   3 +-
 .../GridCacheRendezvousAffinityFunction.java    |   2 +-
 .../store/jdbc/GridCacheJdbcBlobStore.java      |   2 +-
 .../grid/kernal/GridEventConsumeHandler.java    |   2 +-
 .../org/gridgain/grid/kernal/GridGainEx.java    |   2 +-
 .../grid/kernal/GridJobSiblingsResponse.java    |   2 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |   2 +-
 .../checkpoint/GridCheckpointManager.java       |   2 +-
 .../managers/communication/GridIoManager.java   |   2 +-
 .../deployment/GridDeploymentCommunication.java |   2 +-
 .../eventstorage/GridEventStorageManager.java   |   2 +-
 .../managers/indexing/GridIndexingManager.java  |   2 +-
 .../swapspace/GridSwapSpaceManager.java         |   2 +-
 .../processors/cache/GridCacheContext.java      |   2 +-
 .../processors/cache/GridCacheEntryInfo.java    |   2 +-
 .../processors/cache/GridCacheMessage.java      |   2 +-
 .../cache/GridCacheSharedContext.java           |   2 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |   2 +-
 .../cache/query/GridCacheQueryRequest.java      |   2 +-
 .../GridCacheContinuousQueryEntry.java          |   2 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   2 +-
 .../closure/GridClosureProcessor.java           |   2 +-
 .../continuous/GridContinuousProcessor.java     |   2 +-
 .../dataload/GridDataLoaderProcessor.java       |   2 +-
 .../processors/dr/GridRawVersionedEntry.java    |   2 +-
 .../processors/dr/GridVersionedEntry.java       |   2 +-
 .../processors/ggfs/GridGgfsAckMessage.java     |   2 +-
 .../ggfs/GridGgfsCommunicationMessage.java      |   2 +-
 .../processors/ggfs/GridGgfsDeleteMessage.java  |   2 +-
 .../kernal/processors/job/GridJobProcessor.java |   2 +-
 .../kernal/processors/job/GridJobWorker.java    |   2 +-
 .../offheap/GridOffHeapProcessor.java           |   2 +-
 .../resource/GridResourceCustomInjector.java    |   2 +-
 .../resource/GridResourceProcessor.java         |   2 +-
 .../tcp/GridMemcachedMessageWrapper.java        |   2 +-
 .../tcp/GridTcpMemcachedNioListener.java        |   2 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   2 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   2 +-
 .../service/GridServiceProcessor.java           |   2 +-
 .../processors/task/GridTaskProcessor.java      |   2 +-
 .../kernal/processors/task/GridTaskWorker.java  |   2 +-
 .../grid/marshaller/GridAbstractMarshaller.java |  57 --------
 .../grid/marshaller/GridMarshaller.java         | 130 -----------------
 .../marshaller/GridMarshallerExclusions.java    | 145 -------------------
 .../grid/marshaller/jdk/GridJdkMarshaller.java  |   2 +-
 .../GridJdkMarshallerObjectOutputStream.java    |   2 +-
 .../optimized/GridOptimizedClassDescriptor.java |   2 +-
 .../optimized/GridOptimizedMarshaller.java      |   2 +-
 .../org/gridgain/grid/marshaller/package.html   |  15 --
 .../sharedfs/GridSharedFsCheckpointSpi.java     |   2 +-
 .../sharedfs/GridSharedFsTimeoutTask.java       |   2 +-
 .../checkpoint/sharedfs/GridSharedFsUtils.java  |   2 +-
 .../tcp/GridTcpCommunicationSpi.java            |   2 +-
 .../spi/discovery/tcp/GridTcpDiscoverySpi.java  |   2 +-
 .../tcp/GridTcpDiscoverySpiAdapter.java         |   2 +-
 .../GridTcpDiscoveryMulticastIpFinder.java      |   2 +-
 .../spi/indexing/GridIndexingEntityAdapter.java |   3 +-
 .../swapspace/file/GridFileSwapSpaceSpi.java    |   2 +-
 .../org/gridgain/jdbc/util/GridJdbcUtils.java   |   2 +-
 .../grid/GridExternalizableAbstractTest.java    |   2 +-
 .../java/org/gridgain/grid/GridTestIoUtils.java |   2 +-
 .../grid/ggfs/GridGgfsPathSelfTest.java         |   2 +-
 .../kernal/GridJobMasterLeaveAwareSelfTest.java |   2 +-
 .../kernal/GridTopicExternalizableSelfTest.java |   2 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |   2 +-
 .../processors/cache/GridCacheMvccSelfTest.java |   2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |   2 +-
 .../ggfs/GridGgfsFileInfoSelfTest.java          |   2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |   1 +
 .../marshaller/GridMarshallerResourceBean.java  |   1 +
 .../jdk/GridJdkMarshallerSelfTest.java          |   1 +
 .../GridOptimizedMarshallerSelfTest.java        |   1 +
 .../optimized/GridOptimizedMarshallerTest.java  |   1 +
 .../GridOptimizedObjectStreamSelfTest.java      |   2 +-
 .../GridSessionCheckpointAbstractSelfTest.java  |   2 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |   2 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |   2 +-
 .../GridAbstractDiscoverySelfTest.java          |   2 +-
 .../util/future/GridFinishedFutureSelfTest.java |   2 +-
 .../testframework/junits/GridAbstractTest.java  |   2 +-
 .../testframework/junits/GridTestResources.java |   2 +-
 .../GridHadoopExternalCommunication.java        |   2 +-
 .../GridHadoopMarshallerFilter.java             |   2 +-
 ...GridHadoopExternalCommunicationSelfTest.java |   2 +-
 .../hibernate/GridCacheHibernateBlobStore.java  |   2 +-
 .../grid/spi/indexing/h2/GridH2IndexingSpi.java |   2 +-
 .../GridIndexingSpiAbstractSelfTest.java        |   2 +-
 .../grid/kernal/GridFactorySelfTest.java        |   2 +-
 .../GridSpringBeanSerializationSelfTest.java    |   2 +-
 .../GridResourceFieldInjectionSelfTest.java     |   2 +-
 .../GridResourceMethodInjectionSelfTest.java    |   2 +-
 99 files changed, 438 insertions(+), 435 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
index d0fcf23..2a7cf00 100644
--- a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
@@ -14,9 +14,9 @@ import com.amazonaws.auth.*;
 import com.amazonaws.services.s3.*;
 import com.amazonaws.services.s3.model.*;
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
index 4f7ac77..08d13a7 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.rest;
 
 import org.apache.ignite.*;
 import org.apache.ignite.logger.java.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index a6574f3..18075c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -14,6 +14,7 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.managed.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.plugin.*;
 import org.gridgain.client.ssl.*;
 import org.gridgain.grid.*;
@@ -24,7 +25,6 @@ import org.gridgain.grid.dr.hub.sender.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java
new file mode 100644
index 0000000..40fd1ad
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridAbstractMarshaller.java
@@ -0,0 +1,57 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.gridgain.grid.util.io.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Base class for marshallers. Provides default implementations of methods
+ * that work with byte array or {@link GridByteArrayList}. These implementations
+ * use {@link GridByteArrayInputStream} or {@link GridByteArrayOutputStream}
+ * to marshal and unmarshal objects.
+ */
+public abstract class GridAbstractMarshaller implements GridMarshaller {
+    /** Default initial buffer size for the {@link GridByteArrayOutputStream}. */
+    public static final int DFLT_BUFFER_SIZE = 512;
+
+    /** {@inheritDoc} */
+    @Override public byte[] marshal(@Nullable Object obj) throws GridException {
+        GridByteArrayOutputStream out = null;
+
+        try {
+            out = new GridByteArrayOutputStream(DFLT_BUFFER_SIZE);
+
+            marshal(obj, out);
+
+            return out.toByteArray();
+        }
+        finally {
+            U.close(out, null);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
+        GridByteArrayInputStream in = null;
+
+        try {
+            in = new GridByteArrayInputStream(arr, 0, arr.length);
+
+            return unmarshal(in, clsLdr);
+        }
+        finally {
+            U.close(in, null);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
new file mode 100644
index 0000000..703eb51
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
@@ -0,0 +1,130 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.marshaller.jdk.*;
+import org.gridgain.grid.marshaller.optimized.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides
+ * serialization/deserialization mechanism for all instances that are sent across networks
+ * or are otherwise serialized.
+ * <p>
+ * Gridgain provides the following {@code GridMarshaller} implementations:
+ * <ul>
+ * <li>{@link GridOptimizedMarshaller} - default</li>
+ * <li>{@link GridJdkMarshaller}</li>
+ * </ul>
+ * <p>
+ * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,
+ * and SPI's.
+ * <h2 class="header">Java Example</h2>
+ * {@code GridMarshaller} can be explicitely configured in code.
+ * <pre name="code" class="java">
+ * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Override marshaller.
+ * cfg.setMarshaller(marshaller);
+ *
+ * // Starts grid.
+ * G.start(cfg);
+ * </pre>
+ * <h2 class="header">Spring Example</h2>
+ * GridMarshaller can be configured from Spring XML configuration file:
+ * <pre name="code" class="xml">
+ * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ *     ...
+ *     &lt;property name="marshaller"&gt;
+ *         &lt;bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/&gt;
+ *     &lt;/property&gt;
+ *     ...
+ * &lt;/bean&gt;
+ * </pre>
+ * <p>
+ * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <br>
+ * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
+ * <h2 class="header">Injection Example</h2>
+ * GridMarshaller can be injected in users task, job or SPI as following:
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     private GridMarshaller marshaller;
+ *
+ *     public Serializable execute() {
+ *         // Use marshaller to serialize/deserialize any object.
+ *         ...
+ *     }
+ * }
+ * </pre>
+ * or
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     private GridMarshaller marshaller;
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     public void setMarshaller(GridMarshaller marshaller) {
+ *         this.marshaller = marshaller;
+ *     }
+ *     ...
+ * }
+ * </pre>
+ */
+public interface GridMarshaller {
+    /**
+     * Marshals object to the output stream. This method should not close
+     * given output stream.
+     *
+     * @param obj Object to marshal.
+     * @param out Output stream to marshal into.
+     * @throws GridException If marshalling failed.
+     */
+    public void marshal(@Nullable Object obj, OutputStream out) throws GridException;
+
+    /**
+     * Marshals object to byte array.
+     *
+     * @param obj Object to marshal.
+     * @return Byte array.
+     * @throws GridException If marshalling failed.
+     */
+    public byte[] marshal(@Nullable Object obj) throws GridException;
+
+    /**
+     * Unmarshals object from the output stream using given class loader.
+     * This method should not close given input stream.
+     *
+     * @param <T> Type of unmarshalled object.
+     * @param in Input stream.
+     * @param clsLdr Class loader to use.
+     * @return Unmarshalled object.
+     * @throws GridException If unmarshalling failed.
+     */
+    public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException;
+
+    /**
+     * Unmarshals object from byte array using given class loader.
+     *
+     * @param <T> Type of unmarshalled object.
+     * @param arr Byte array.
+     * @param clsLdr Class loader to use.
+     * @return Unmarshalled object.
+     * @throws GridException If unmarshalling failed.
+     */
+    public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java
new file mode 100644
index 0000000..d9d7792
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshallerExclusions.java
@@ -0,0 +1,145 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller;
+
+import org.apache.ignite.*;
+import org.apache.ignite.compute.*;
+import org.gridgain.grid.kernal.*;
+import org.gridgain.grid.kernal.executor.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import javax.management.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+/**
+ * Controls what classes should be excluded from marshalling by default.
+ */
+public final class GridMarshallerExclusions {
+    /**
+     * Classes that must be included in serialization. All marshallers must
+     * included these classes.
+     * <p>
+     * Note that this list supercedes {@link #EXCL_CLASSES}.
+     */
+    private static final Class<?>[] INCL_CLASSES = new Class[] {
+        // GridGain classes.
+        GridLoggerProxy.class,
+        GridExecutorService.class
+    };
+
+    /** */
+    private static final Map<Class<?>, Boolean> cache = new GridBoundedConcurrentLinkedHashMap<>(
+        512, 512, 0.75f, 16);
+
+    /**
+     * Excluded grid classes from serialization. All marshallers must omit
+     * these classes. Fields of these types should be serialized as {@code null}.
+     * <p>
+     * Note that {@link #INCL_CLASSES} supercedes this list.
+     */
+    private static final Class<?>[] EXCL_CLASSES;
+
+    /**
+     *
+     */
+    static {
+        Class springCtxCls = null;
+
+        try {
+            springCtxCls = Class.forName("org.springframework.context.ApplicationContext");
+        }
+        catch (Exception ignored) {
+            // No-op.
+        }
+
+        List<Class<?>> excl = new ArrayList<>();
+
+        // Non-GridGain classes.
+        excl.add(MBeanServer.class);
+        excl.add(ExecutorService.class);
+        excl.add(ClassLoader.class);
+        excl.add(Thread.class);
+
+        if (springCtxCls != null)
+            excl.add(springCtxCls);
+
+        // GridGain classes.
+        excl.add(IgniteLogger.class);
+        excl.add(ComputeTaskSession.class);
+        excl.add(ComputeLoadBalancer.class);
+        excl.add(ComputeJobContext.class);
+        excl.add(GridMarshaller.class);
+        excl.add(GridComponent.class);
+        excl.add(ComputeTaskContinuousMapper.class);
+
+        EXCL_CLASSES = U.toArray(excl, new Class[excl.size()]);
+    }
+
+    /**
+     * Ensures singleton.
+     */
+    private GridMarshallerExclusions() {
+        // No-op.
+    }
+
+    /**
+     * Checks given class against predefined set of excluded types.
+     *
+     * @param cls Class to check.
+     * @return {@code true} if class should be excluded, {@code false} otherwise.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    private static boolean isExcluded0(Class<?> cls) {
+        assert cls != null;
+
+        final Class<?>[] inc = INCL_CLASSES;
+
+        // NOTE: don't use foreach for performance reasons.
+        for (int i = 0; i < inc.length; i++)
+            if (inc[i].isAssignableFrom(cls))
+                return false;
+
+        final Class<?>[] exc = EXCL_CLASSES;
+
+        // NOTE: don't use foreach for performance reasons.
+        for (int i = 0; i < exc.length; i++)
+            if (exc[i].isAssignableFrom(cls))
+                return true;
+
+        return false;
+    }
+
+    /**
+     * Checks whether or not given class should be excluded from marshalling.
+     *
+     * @param cls Class to check.
+     * @return {@code true} if class should be excluded, {@code false} otherwise.
+     */
+    public static boolean isExcluded(Class<?> cls) {
+        Boolean res = cache.get(cls);
+
+        if (res == null) {
+            res = isExcluded0(cls);
+
+            cache.put(cls, res);
+        }
+
+        return res;
+    }
+
+    /**
+     * Intended for test purposes only.
+     */
+    public static void clearCache() {
+        cache.clear();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/marshaller/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/package.html b/modules/core/src/main/java/org/apache/ignite/marshaller/package.html
new file mode 100644
index 0000000..0129583
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains various supported marshallers.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
index 5fc46a5..0ad0732 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteMarshallerResource.java
@@ -9,13 +9,12 @@
 
 package org.apache.ignite.resources;
 
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 
 import java.lang.annotation.*;
 
 /**
- * Annotates a field or a setter method for injection of {@link GridMarshaller} resource. Grid marshaller
+ * Annotates a field or a setter method for injection of {@link org.apache.ignite.marshaller.GridMarshaller} resource. Grid marshaller
  * is provided to grid via {@link org.apache.ignite.configuration.IgniteConfiguration}.
  * <p>
  * Marshaller can be injected into instances of following classes:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
index 4ed0998..a7f195f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
@@ -11,11 +11,11 @@ package org.gridgain.grid.cache.affinity.rendezvous;
 
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
index 4e5512d..d9df3e7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
@@ -10,11 +10,11 @@
 package org.gridgain.grid.cache.store.jdbc;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.store.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java
index 5590a0b..c1f27de 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java
@@ -12,12 +12,12 @@ package org.gridgain.grid.kernal;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.continuous.*;
-import org.gridgain.grid.marshaller.*;
 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/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index d9db364..1fe7cbd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -14,6 +14,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.logger.*;
 import org.apache.ignite.logger.java.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.mbean.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -22,7 +23,6 @@ import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.kernal.processors.interop.*;
 import org.gridgain.grid.kernal.processors.resource.*;
 import org.gridgain.grid.kernal.processors.spring.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.segmentation.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
index 772e82d..e91f3f4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobSiblingsResponse.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.compute.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index cbc9d18..965c526 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.mbean.*;
 import org.apache.ignite.plugin.*;
 import org.gridgain.grid.*;
@@ -57,7 +58,6 @@ import org.gridgain.grid.kernal.processors.session.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.product.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java
index 97a9bd7..406273e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManager.java
@@ -13,11 +13,11 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.communication.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java
index a52a46b..7cb14ec 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/communication/GridIoManager.java
@@ -12,13 +12,13 @@ package org.gridgain.grid.kernal.managers.communication;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.communication.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
index e868343..c7f6a14 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
@@ -13,11 +13,11 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.marshaller.*;
 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/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
index ad05dea..585fbd7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/eventstorage/GridEventStorageManager.java
@@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.managers.eventstorage;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.eventstorage.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
index 418e8b6..99cd118 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
@@ -10,13 +10,13 @@
 package org.gridgain.grid.kernal.managers.indexing;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.indexing.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
index 3791958..2e7085c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/swapspace/GridSwapSpaceManager.java
@@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.managers.swapspace;
 
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.swapspace.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
index a7ed532..85d1107 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
@@ -13,6 +13,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.cloner.*;
@@ -35,7 +36,6 @@ import org.gridgain.grid.kernal.processors.closure.*;
 import org.gridgain.grid.kernal.processors.offheap.*;
 import org.gridgain.grid.kernal.processors.portable.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java
index 614252a..66aaf5b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfo.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
index 52e5947..c7bef12 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMessage.java
@@ -10,11 +10,11 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
index 808c117..fd03aaa 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
@@ -13,6 +13,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
@@ -21,7 +22,6 @@ import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.discovery.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java
index aa7f739..c584996 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheLocalQueryFuture.java
@@ -10,10 +10,10 @@
 package org.gridgain.grid.kernal.processors.cache.query;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
index 5c54108..1c5d7ba 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryRequest.java
@@ -10,11 +10,11 @@
 package org.gridgain.grid.kernal.processors.cache.query;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
index 964afe7..33d8e82 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
@@ -10,11 +10,11 @@
 package org.gridgain.grid.kernal.processors.cache.query.continuous;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index ff150df..434a290 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.processors.cache.query.jdbc;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 1d148d2..eaf57e1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -12,13 +12,13 @@ package org.gridgain.grid.kernal.processors.cache.query.jdbc;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.indexing.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
index 6c24f5d..cd83114 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
@@ -12,13 +12,13 @@ package org.gridgain.grid.kernal.processors.closure;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.*;
-import org.gridgain.grid.marshaller.*;
 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/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
index 6166f72..d6ab870 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
@@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.continuous;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
@@ -19,7 +20,6 @@ import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java
index d09608d..0a8d9c2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessor.java
@@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.processors.dataload;
 import org.apache.ignite.*;
 import org.apache.ignite.dataload.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java
index f0cf251..83a1824 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridRawVersionedEntry.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.processors.dr;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java
index 7dd47ae..8a04583 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridVersionedEntry.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.processors.dr;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.marshaller.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
index 78f2562..ff92b80 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAckMessage.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.direct.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java
index 15f2754..0c9ad31 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCommunicationMessage.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.direct.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
index 9cbe3a0..7813fe5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteMessage.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
index bc40b52..b5589e1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
@@ -13,6 +13,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.collision.*;
@@ -21,7 +22,6 @@ import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.*;
 import org.gridgain.grid.kernal.processors.jobmetrics.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.collision.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
index 8fef3ac..b18294e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
@@ -14,13 +14,13 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.worker.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java
index 9459b7a..cd5a31c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/offheap/GridOffHeapProcessor.java
@@ -10,10 +10,10 @@
 package org.gridgain.grid.kernal.processors.offheap;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.offheap.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
index c814579..9ac4f99 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
@@ -12,11 +12,11 @@ package org.gridgain.grid.kernal.processors.resource;
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.managed.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
-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/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
index 1c2bc95..8463fe7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
@@ -13,12 +13,12 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.managed.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
index d366ffa..1bcf300 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridMemcachedMessageWrapper.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index 6c5ddc7..6f14c58 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -11,12 +11,12 @@ package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.rest.*;
 import org.gridgain.grid.kernal.processors.rest.handlers.cache.*;
 import org.gridgain.grid.kernal.processors.rest.request.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
index 5203825..a45179c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -8,10 +8,10 @@
  */
 package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 633c90a..ee574af 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -10,6 +10,7 @@
 package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.client.marshaller.jdk.*;
 import org.gridgain.client.marshaller.optimized.*;
@@ -19,7 +20,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.rest.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
 import org.gridgain.grid.kernal.processors.rest.protocols.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.direct.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
index ca112ac..c2a580f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
@@ -14,6 +14,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.managed.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.GridCacheContinuousQueryEntry;
@@ -23,7 +24,6 @@ import org.gridgain.grid.kernal.processors.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.query.continuous.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
index f07bf46..f6c1e0f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
@@ -13,6 +13,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
@@ -20,7 +21,6 @@ import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
index 9d7c705..b76f6c1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
@@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.ggfs.*;
@@ -21,7 +22,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.job.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.worker.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/GridAbstractMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridAbstractMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridAbstractMarshaller.java
deleted file mode 100644
index 5bea1f6..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridAbstractMarshaller.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.io.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Base class for marshallers. Provides default implementations of methods
- * that work with byte array or {@link GridByteArrayList}. These implementations
- * use {@link GridByteArrayInputStream} or {@link GridByteArrayOutputStream}
- * to marshal and unmarshal objects.
- */
-public abstract class GridAbstractMarshaller implements GridMarshaller {
-    /** Default initial buffer size for the {@link GridByteArrayOutputStream}. */
-    public static final int DFLT_BUFFER_SIZE = 512;
-
-    /** {@inheritDoc} */
-    @Override public byte[] marshal(@Nullable Object obj) throws GridException {
-        GridByteArrayOutputStream out = null;
-
-        try {
-            out = new GridByteArrayOutputStream(DFLT_BUFFER_SIZE);
-
-            marshal(obj, out);
-
-            return out.toByteArray();
-        }
-        finally {
-            U.close(out, null);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
-        GridByteArrayInputStream in = null;
-
-        try {
-            in = new GridByteArrayInputStream(arr, 0, arr.length);
-
-            return unmarshal(in, clsLdr);
-        }
-        finally {
-            U.close(in, null);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshaller.java
deleted file mode 100644
index e8e6f2b..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshaller.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.jdk.*;
-import org.gridgain.grid.marshaller.optimized.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-/**
- * {@code GridMarshaller} allows to marshal or unmarshal objects in grid. It provides
- * serialization/deserialization mechanism for all instances that are sent across networks
- * or are otherwise serialized.
- * <p>
- * Gridgain provides the following {@code GridMarshaller} implementations:
- * <ul>
- * <li>{@link GridOptimizedMarshaller} - default</li>
- * <li>{@link GridJdkMarshaller}</li>
- * </ul>
- * <p>
- * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,
- * and SPI's.
- * <h2 class="header">Java Example</h2>
- * {@code GridMarshaller} can be explicitely configured in code.
- * <pre name="code" class="java">
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * // Override marshaller.
- * cfg.setMarshaller(marshaller);
- *
- * // Starts grid.
- * G.start(cfg);
- * </pre>
- * <h2 class="header">Spring Example</h2>
- * GridMarshaller can be configured from Spring XML configuration file:
- * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
- *     ...
- *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/&gt;
- *     &lt;/property&gt;
- *     ...
- * &lt;/bean&gt;
- * </pre>
- * <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
- * <h2 class="header">Injection Example</h2>
- * GridMarshaller can be injected in users task, job or SPI as following:
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     &#64;GridMarshallerResource
- *     private GridMarshaller marshaller;
- *
- *     public Serializable execute() {
- *         // Use marshaller to serialize/deserialize any object.
- *         ...
- *     }
- * }
- * </pre>
- * or
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     private GridMarshaller marshaller;
- *     ...
- *     &#64;GridMarshallerResource
- *     public void setMarshaller(GridMarshaller marshaller) {
- *         this.marshaller = marshaller;
- *     }
- *     ...
- * }
- * </pre>
- */
-public interface GridMarshaller {
-    /**
-     * Marshals object to the output stream. This method should not close
-     * given output stream.
-     *
-     * @param obj Object to marshal.
-     * @param out Output stream to marshal into.
-     * @throws GridException If marshalling failed.
-     */
-    public void marshal(@Nullable Object obj, OutputStream out) throws GridException;
-
-    /**
-     * Marshals object to byte array.
-     *
-     * @param obj Object to marshal.
-     * @return Byte array.
-     * @throws GridException If marshalling failed.
-     */
-    public byte[] marshal(@Nullable Object obj) throws GridException;
-
-    /**
-     * Unmarshals object from the output stream using given class loader.
-     * This method should not close given input stream.
-     *
-     * @param <T> Type of unmarshalled object.
-     * @param in Input stream.
-     * @param clsLdr Class loader to use.
-     * @return Unmarshalled object.
-     * @throws GridException If unmarshalling failed.
-     */
-    public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException;
-
-    /**
-     * Unmarshals object from byte array using given class loader.
-     *
-     * @param <T> Type of unmarshalled object.
-     * @param arr Byte array.
-     * @param clsLdr Class loader to use.
-     * @return Unmarshalled object.
-     * @throws GridException If unmarshalling failed.
-     */
-    public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java
deleted file mode 100644
index 76b81bc..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller;
-
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.kernal.executor.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import javax.management.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-/**
- * Controls what classes should be excluded from marshalling by default.
- */
-public final class GridMarshallerExclusions {
-    /**
-     * Classes that must be included in serialization. All marshallers must
-     * included these classes.
-     * <p>
-     * Note that this list supercedes {@link #EXCL_CLASSES}.
-     */
-    private static final Class<?>[] INCL_CLASSES = new Class[] {
-        // GridGain classes.
-        GridLoggerProxy.class,
-        GridExecutorService.class
-    };
-
-    /** */
-    private static final Map<Class<?>, Boolean> cache = new GridBoundedConcurrentLinkedHashMap<>(
-        512, 512, 0.75f, 16);
-
-    /**
-     * Excluded grid classes from serialization. All marshallers must omit
-     * these classes. Fields of these types should be serialized as {@code null}.
-     * <p>
-     * Note that {@link #INCL_CLASSES} supercedes this list.
-     */
-    private static final Class<?>[] EXCL_CLASSES;
-
-    /**
-     *
-     */
-    static {
-        Class springCtxCls = null;
-
-        try {
-            springCtxCls = Class.forName("org.springframework.context.ApplicationContext");
-        }
-        catch (Exception ignored) {
-            // No-op.
-        }
-
-        List<Class<?>> excl = new ArrayList<>();
-
-        // Non-GridGain classes.
-        excl.add(MBeanServer.class);
-        excl.add(ExecutorService.class);
-        excl.add(ClassLoader.class);
-        excl.add(Thread.class);
-
-        if (springCtxCls != null)
-            excl.add(springCtxCls);
-
-        // GridGain classes.
-        excl.add(IgniteLogger.class);
-        excl.add(ComputeTaskSession.class);
-        excl.add(ComputeLoadBalancer.class);
-        excl.add(ComputeJobContext.class);
-        excl.add(GridMarshaller.class);
-        excl.add(GridComponent.class);
-        excl.add(ComputeTaskContinuousMapper.class);
-
-        EXCL_CLASSES = U.toArray(excl, new Class[excl.size()]);
-    }
-
-    /**
-     * Ensures singleton.
-     */
-    private GridMarshallerExclusions() {
-        // No-op.
-    }
-
-    /**
-     * Checks given class against predefined set of excluded types.
-     *
-     * @param cls Class to check.
-     * @return {@code true} if class should be excluded, {@code false} otherwise.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    private static boolean isExcluded0(Class<?> cls) {
-        assert cls != null;
-
-        final Class<?>[] inc = INCL_CLASSES;
-
-        // NOTE: don't use foreach for performance reasons.
-        for (int i = 0; i < inc.length; i++)
-            if (inc[i].isAssignableFrom(cls))
-                return false;
-
-        final Class<?>[] exc = EXCL_CLASSES;
-
-        // NOTE: don't use foreach for performance reasons.
-        for (int i = 0; i < exc.length; i++)
-            if (exc[i].isAssignableFrom(cls))
-                return true;
-
-        return false;
-    }
-
-    /**
-     * Checks whether or not given class should be excluded from marshalling.
-     *
-     * @param cls Class to check.
-     * @return {@code true} if class should be excluded, {@code false} otherwise.
-     */
-    public static boolean isExcluded(Class<?> cls) {
-        Boolean res = cache.get(cls);
-
-        if (res == null) {
-            res = isExcluded0(cls);
-
-            cache.put(cls, res);
-        }
-
-        return res;
-    }
-
-    /**
-     * Intended for test purposes only.
-     */
-    public static void clearCache() {
-        cache.clear();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java
index e4d12fc..b8826a5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java
+++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.marshaller.jdk;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
index beeca05..e820977 100644
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
+++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.marshaller.jdk;
 
-import org.gridgain.grid.marshaller.*;
+import org.apache.ignite.marshaller.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java
index 18ec95f..af15ab8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedClassDescriptor.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid.marshaller.optimized;
 
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.marshaller.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
 import sun.misc.*;


[26/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
deleted file mode 100644
index 51bf4d6..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ /dev/null
@@ -1,816 +0,0 @@
-package org.gridgain.grid.marshaller.optimized;
-
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.lang.reflect.Proxy;
-import java.net.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-/**
- *
- */
-public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
-    /**
-     * Tests ability to marshal non-serializable objects.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testNonSerializable() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
-
-        marsh.setRequireSerializable(false);
-
-        NonSerializable outObj = marsh.unmarshal(marsh.marshal(new NonSerializable(null)), null);
-
-        outObj.checkAfterUnmarshalled();
-    }
-
-    /**
-     * Tests ability to marshal non-serializable objects.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testNonSerializable1() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
-
-        marsh.setRequireSerializable(false);
-
-        byte[] bytes = marsh.marshal(new GridTcpDiscoveryVmIpFinder());
-
-        GridTcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null);
-
-        assertFalse(ipFinder.isShared());
-
-        ipFinder = marsh.unmarshal(marsh.marshal(new GridTcpDiscoveryVmIpFinder(true)), null);
-
-        assertTrue(ipFinder.isShared());
-    }
-
-    /**
-     * Tests ability to marshal non-serializable objects.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testNonSerializable2() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
-
-        marsh.setRequireSerializable(false);
-
-        GridTcpDiscoveryIpFinderAdapter ipFinder = new GridTcpDiscoveryIpFinderAdapter() {
-            @Override public Collection<InetSocketAddress> getRegisteredAddresses() {
-                return null;
-            }
-
-            @Override public void registerAddresses(Collection<InetSocketAddress> addrs) {
-                //No-op.
-            }
-
-            @Override public void unregisterAddresses(Collection<InetSocketAddress> addrs) {
-                //No-op.
-            }
-        };
-
-        ipFinder.setShared(false);
-
-        byte[] bytes = marsh.marshal(ipFinder);
-
-        ipFinder = marsh.unmarshal(bytes, null);
-
-        assertFalse(ipFinder.isShared());
-    }
-
-    /**
-     * Tests ability to marshal non-serializable objects.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testNonSerializable3() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
-
-        marsh.setRequireSerializable(false);
-
-        byte[] bytes = marsh.marshal(new GridTestTcpDiscoveryIpFinderAdapter());
-
-        GridTcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null);
-
-        assertFalse(ipFinder.isShared());
-    }
-
-     /**
-     * Tests ability to marshal non-serializable objects.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testNonSerializable4() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
-
-        marsh.setRequireSerializable(false);
-
-        byte[] bytes = marsh.marshal(new GridMarshallerTestInheritedBean());
-
-        info(Arrays.toString(bytes));
-
-        GridMarshallerTestInheritedBean bean = marsh.unmarshal(bytes, null);
-
-        assertTrue(bean.isFlag());
-    }
-
-     /**
-     * Tests ability to marshal non-serializable objects.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testNonSerializable5() throws GridException {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
-
-        byte[] bytes = marsh.marshal(true);
-
-        Boolean val = marsh.unmarshal(bytes, null);
-
-        assertTrue(val);
-    }
-
-    /**
-     * Tests ability to marshal serializable objects.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testSerializable() throws GridException {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
-
-        SomeSerializable outObj = marsh.unmarshal(marsh.marshal(new SomeSerializable(null)), null);
-
-        outObj.checkAfterUnmarshalled();
-    }
-
-    /**
-     * @throws GridException If failed.
-     */
-    public void testSerializableAfterChangingValue() throws GridException {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
-
-        SomeSimpleSerializable newObj = new SomeSimpleSerializable();
-
-        assert(newObj.flag);
-
-        newObj.setFlagValue(false);
-
-        assert(! newObj.flag);
-
-        SomeSimpleSerializable outObj = marsh.unmarshal(marsh.marshal(newObj), null);
-
-        assert (! outObj.flag);
-    }
-
-    /**
-     * Tests ability to marshal externalizable objects.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testExternalizable() throws GridException {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
-
-        ExternalizableA outObj = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, true)), null);
-        ExternalizableA outObj1 = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, false)), null);
-
-        assertNotNull(outObj);
-        assertNotNull(outObj1);
-    }
-
-    /**
-     * Tests {@link GridOptimizedMarshaller#setRequireSerializable(boolean)}.
-     */
-    public void testRequireSerializable() {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
-
-        marsh.setRequireSerializable(true);
-
-        try {
-            marsh.marshal(new NonSerializable(null));
-
-            fail();
-        }
-        catch (GridException ignore) {
-            // No-op.
-        }
-    }
-
-    /**
-     * Tests {@link GridOptimizedMarshaller#setClassNames(List)}.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testUserPreregisteredNames() throws GridException {
-        Object obj = new SomeSerializable(null);
-
-        // Clear caches.
-        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
-        GridOptimizedClassResolver.userClasses(null, null);
-
-        GridMarshaller marsh = new GridOptimizedMarshaller();
-
-        int size1 = marsh.marshal(obj).length;
-
-        // Clear caches.
-        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
-        GridOptimizedClassResolver.userClasses(null, null);
-
-        GridOptimizedMarshaller marshPreregistered = new GridOptimizedMarshaller();
-
-        marshPreregistered.setClassNames(Arrays.asList(SomeSerializable.class.getName()));
-
-        int size2 = marshPreregistered.marshal(obj).length;
-
-        assertTrue(size1 > size2);
-    }
-
-    /**
-     * Tests {@link GridOptimizedMarshaller#setClassNames(List)}.
-     *
-     * @throws GridException If marshalling failed.
-     * @throws IOException If an I/O error occurs.
-     */
-    public void testUserPreregisteredNamesPath() throws GridException, IOException {
-        Object obj = new SomeSerializable(null);
-
-        // Clear caches.
-        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
-        GridOptimizedClassResolver.userClasses(null, null);
-
-        GridMarshaller marsh = new GridOptimizedMarshaller();
-
-        int size1 = marsh.marshal(obj).length;
-
-        // Clear caches.
-        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
-        GridOptimizedClassResolver.userClasses(null, null);
-
-        GridOptimizedMarshaller marshPreregistered = new GridOptimizedMarshaller();
-
-        File namesFile = File.createTempFile("gg-", null);
-
-        U.writeStringToFile(namesFile, SomeSerializable.class.getName(), "UTF-8");
-
-        marshPreregistered.setClassNamesPath(namesFile.getAbsolutePath());
-
-        int size2 = marshPreregistered.marshal(obj).length;
-
-        assertTrue(size1 > size2);
-    }
-
-    /**
-     * Tests {@link Proxy}.
-     *
-     * @throws GridException If marshalling failed.
-     */
-    public void testProxy() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
-
-        marsh.setRequireSerializable(false);
-
-        SomeItf inItf = (SomeItf)Proxy.newProxyInstance(
-            GridOptimizedMarshallerTest.class.getClassLoader(), new Class[] {SomeItf.class},
-            new InvocationHandler() {
-                private NonSerializable obj = new NonSerializable(null);
-
-                @Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
-                    obj.checkAfterUnmarshalled();
-
-                    return 17;
-                }
-            }
-        );
-
-        SomeItf outItf = marsh.unmarshal(marsh.marshal(inItf), null);
-
-        assertEquals(outItf.checkAfterUnmarshalled(), 17);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testDescriptorCache() throws Exception {
-        try {
-            Ignite ignite = startGridsMultiThreaded(2);
-
-            String taskClsName = "org.gridgain.grid.tests.p2p.GridSingleSplitTestTask";
-            String jobClsName = "org.gridgain.grid.tests.p2p.GridSingleSplitTestTask$GridSingleSplitTestJob";
-
-            ClassLoader ldr = getExternalClassLoader();
-
-            Class<? extends ComputeTask<?, ?>> taskCls = (Class<? extends ComputeTask<?, ?>>)ldr.loadClass(taskClsName);
-            Class<? extends ComputeTask<?, ?>> jobCls = (Class<? extends ComputeTask<?, ?>>)ldr.loadClass(jobClsName);
-
-            ignite.compute().localDeployTask(taskCls, ldr);
-
-            ignite.compute().execute(taskClsName, 2);
-
-            ConcurrentMap<Class<?>, GridOptimizedClassDescriptor> cache =
-                U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE");
-
-            assertTrue(cache.containsKey(jobCls));
-
-            ignite.compute().undeployTask(taskClsName);
-
-            // Wait for undeploy.
-            Thread.sleep(1000);
-
-            assertFalse(cache.containsKey(jobCls));
-        }
-        finally {
-            stopAllGrids();
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPerformance() throws Exception {
-        System.gc();
-
-        checkPerformance(10000, 4);
-    }
-
-    /**
-     * @param cnt Number of marshalling attempts.
-     * @param tries Number of retries.
-     * @throws Exception If failed.
-     */
-    private void checkPerformance(int cnt, int tries) throws Exception {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
-
-        for (int j = 0; j < tries; j++) {
-            System.gc();
-
-            long start = System.currentTimeMillis();
-
-            for (int i = 0; i < cnt; i++) {
-                TestCacheKey key = new TestCacheKey("key", "id");
-
-                TestCacheKey outKey = marsh.unmarshal(marsh.marshal(key), null);
-
-                assert key.equals(outKey);
-                assert key.hashCode() == outKey.hashCode();
-            }
-
-            info("Time non-serializable: " + (System.currentTimeMillis() - start));
-
-            System.gc();
-
-            start = System.currentTimeMillis();
-
-            for (int i = 0; i < cnt; i++) {
-                TestCacheKeySerializable key1 = new TestCacheKeySerializable("key", "id");
-
-                TestCacheKeySerializable outKey = marsh.unmarshal(marsh.marshal(key1), null);
-
-                assert key1.equals(outKey);
-                assert key1.hashCode() == outKey.hashCode();
-            }
-
-            info("Time serializable: " + (System.currentTimeMillis() - start));
-
-            System.gc();
-
-            start = System.currentTimeMillis();
-
-            for (int i = 0; i < cnt; i++) {
-                TestCacheKeyExternalizable key2 = new TestCacheKeyExternalizable("key", "id");
-
-                TestCacheKeyExternalizable outKey = marsh.unmarshal(marsh.marshal(key2), null);
-
-                assert key2.equals(outKey);
-                assert key2.hashCode() == outKey.hashCode();
-            }
-
-            info("Time externalizable: " + (System.currentTimeMillis() - start));
-
-            info(">>>");
-        }
-
-        info(">>> Finished performance check <<<");
-    }
-
-    /**
-     * Some non-serializable class.
-     */
-    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","FieldMayBeStatic"})
-    private static class NonSerializableA {
-        /** */
-        private final long longVal = 0x33445566778899AAL;
-
-        /** */
-        protected Short shortVal = (short)0xAABB;
-
-        /** */
-        public String[] strArr = {"AA","BB"};
-
-        /** */
-        public boolean flag1 = true;
-
-        /** */
-        public boolean flag2;
-
-        /** */
-        public Boolean flag3;
-
-        /** */
-        public Boolean flag4 = true;
-
-        /** */
-        public Boolean flag5 = false;
-
-        /** */
-        private transient int intVal = 0xAABBCCDD;
-
-        /**
-         * @param strArr Array.
-         * @param shortVal Short value.
-         */
-        @SuppressWarnings( {"UnusedDeclaration"})
-        private NonSerializableA(@Nullable String[] strArr, @Nullable Short shortVal) {
-            // No-op.
-        }
-
-        /**
-         * Checks correctness of the state after unmarshalling.
-         */
-        void checkAfterUnmarshalled() {
-            assertEquals(longVal, 0x33445566778899AAL);
-
-            assertEquals(shortVal.shortValue(), (short)0xAABB);
-
-            assertTrue(Arrays.equals(strArr, new String[] {"AA","BB"}));
-
-            assertEquals(intVal, 0);
-
-            assertTrue(flag1);
-            assertFalse(flag2);
-            assertNull(flag3);
-            assertTrue(flag4);
-            assertFalse(flag5);
-        }
-    }
-
-    /**
-     * Some non-serializable class.
-     */
-    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","PackageVisibleInnerClass"})
-    static class NonSerializableB extends NonSerializableA {
-        /** */
-        public Short shortVal = 0x1122;
-
-        /** */
-        public long longVal = 0x8877665544332211L;
-
-        /** */
-        private transient NonSerializableA[] aArr = {
-            new NonSerializableA(null, null),
-            new NonSerializableA(null, null),
-            new NonSerializableA(null, null)
-        };
-
-        /** */
-        protected Double doubleVal = 123.456;
-
-        /**
-         * Just to eliminate the default constructor.
-         */
-        private NonSerializableB() {
-            super(null, null);
-        }
-
-        /**
-         * Checks correctness of the state after unmarshalling.
-         */
-        @Override void checkAfterUnmarshalled() {
-            super.checkAfterUnmarshalled();
-
-            assertEquals(shortVal.shortValue(), 0x1122);
-
-            assertEquals(longVal, 0x8877665544332211L);
-
-            assertNull(aArr);
-
-            assertEquals(doubleVal, 123.456);
-        }
-    }
-
-    /**
-     * Some non-serializable class.
-     */
-    @SuppressWarnings( {"TransientFieldInNonSerializableClass","PublicField"})
-    private static class NonSerializable extends NonSerializableB {
-        /** */
-        private int idVal = -17;
-
-        /** */
-        private final NonSerializableA aVal = new NonSerializableB();
-
-        /** */
-        private transient NonSerializableB bVal = new NonSerializableB();
-
-        /** */
-        private NonSerializableA[] bArr = new NonSerializableA[] {
-            new NonSerializableB(),
-            new NonSerializableA(null, null)
-        };
-
-        /** */
-        public float floatVal = 567.89F;
-
-        /**
-         * Just to eliminate the default constructor.
-         *
-         * @param aVal Unused.
-         */
-        @SuppressWarnings( {"UnusedDeclaration"})
-        private NonSerializable(NonSerializableA aVal) {
-        }
-
-        /**
-         * Checks correctness of the state after unmarshalling.
-         */
-        @Override void checkAfterUnmarshalled() {
-            super.checkAfterUnmarshalled();
-
-            assertEquals(idVal, -17);
-
-            aVal.checkAfterUnmarshalled();
-
-            assertNull(bVal);
-
-            for (NonSerializableA a : bArr) {
-                a.checkAfterUnmarshalled();
-            }
-
-            assertEquals(floatVal, 567.89F);
-        }
-    }
-
-    /**
-     * Some serializable class.
-     */
-    @SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","PackageVisibleInnerClass"})
-    static class ForSerializableB {
-        /** */
-        public Short shortVal = 0x1122;
-
-        /** */
-        public long longVal = 0x8877665544332211L;
-
-        /** */
-        private transient NonSerializableA[] aArr;
-
-        /** */
-        private transient String strVal = "abc";
-
-        /** */
-        protected Double doubleVal = 123.456;
-
-        /**
-         */
-        protected void init() {
-            shortVal = 0x1122;
-
-            longVal = 0x8877665544332211L;
-
-            aArr = new NonSerializableA[] {
-                new NonSerializableA(null, null),
-                new NonSerializableA(null, null),
-                new NonSerializableA(null, null)
-            };
-        }
-
-        /**
-         * Checks correctness of the state after unmarshalling.
-         */
-        void checkAfterUnmarshalled() {
-            assertEquals(shortVal.shortValue(), 0x1122);
-
-            assertEquals(longVal, 0x8877665544332211L);
-
-            assertNull(aArr);
-
-            assertNull(strVal);
-
-            assertEquals(doubleVal, 123.456);
-        }
-    }
-
-    /**
-     * Some serializable class.
-     */
-    private static class SomeSimpleSerializable extends ComputeJobAdapter {
-        /** */
-        private boolean flag = true;
-
-        /**
-         * @param newFlagVal - The new value of flag field.
-         */
-        public void setFlagValue(boolean newFlagVal) {
-            flag = newFlagVal;
-        }
-
-        /** {@inheritDoc} */
-        @Override public Object execute() throws GridException {
-            assert false;
-
-            return null;
-        }
-    }
-    /**
-     * Some serializable class.
-     */
-    private static class SomeSerializable extends ForSerializableB implements Serializable {
-        /**
-         * Just to eliminate the default constructor.
-         *
-         * @param id Unused.
-         */
-        @SuppressWarnings( {"UnusedDeclaration"})
-        private SomeSerializable(Long id) {
-            init();
-        }
-    }
-
-    /**
-     */
-    private static interface SomeItf {
-        /**
-         * @return Check result.
-         */
-        int checkAfterUnmarshalled();
-    }
-
-    /**
-     * Some externalizable class.
-     */
-    @SuppressWarnings( {"UnusedDeclaration", "PublicField"})
-    private static class ExternalizableA implements Externalizable {
-        /** */
-        private boolean boolVal;
-
-        /** */
-        public String[] strArr;
-
-        /** No-arg constructor is required by externalization.  */
-        public ExternalizableA() {
-            // No-op.
-        }
-
-        /**
-         *
-         * @param strArr String array.
-         * @param boolVal Boolean value.
-         */
-        private ExternalizableA(String[] strArr, boolean boolVal) {
-            this.strArr = strArr;
-            this.boolVal = boolVal;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeBoolean(false);
-            out.writeBoolean(false);
-            out.writeBoolean(false);
-            out.writeBoolean(false);
-            out.writeBoolean(false);
-            out.writeBoolean(false);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            boolVal = in.readBoolean();
-            in.readBoolean();
-            in.readBoolean();
-            in.readBoolean();
-            in.readBoolean();
-            in.readBoolean();
-        }
-    }
-
-    /**
-     *
-     */
-    private static class TestCacheKey implements Serializable {
-        /** */
-        private String key;
-
-        /** */
-        @SuppressWarnings({"UnusedDeclaration"})
-        private String terminalId;
-
-        /**
-         * @param key Key.
-         * @param terminalId Some ID.
-         */
-        TestCacheKey(String key, String terminalId) {
-            this.key = key;
-            this.terminalId = terminalId;
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return key.hashCode();
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object obj) {
-            return obj instanceof TestCacheKey && key.equals(((TestCacheKey)obj).key);
-        }
-    }
-
-    /**
-     *
-     */
-    private static class TestCacheKeySerializable implements Serializable {
-        /** */
-        private String key;
-
-        /** */
-        @SuppressWarnings({"UnusedDeclaration"})
-        private String terminalId;
-
-        /**
-         * @param key Key.
-         * @param terminalId Some ID.
-         */
-        TestCacheKeySerializable(String key, String terminalId) {
-            this.key = key;
-            this.terminalId = terminalId;
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return key.hashCode();
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object obj) {
-            return obj instanceof TestCacheKeySerializable && key.equals(((TestCacheKeySerializable)obj).key);
-        }
-    }
-
-    /**
-     *
-     */
-    private static class TestCacheKeyExternalizable implements Externalizable {
-        /** */
-        private String key;
-
-        /** */
-        private String terminalId;
-
-        /**
-         *
-         */
-        public TestCacheKeyExternalizable() {
-            // No-op.
-        }
-
-        /**
-         * @param key Key.
-         * @param terminalId Some ID.
-         */
-        TestCacheKeyExternalizable(String key, String terminalId) {
-            this.key = key;
-            this.terminalId = terminalId;
-        }
-
-        /** {@inheritDoc} */
-        @Override public int hashCode() {
-            return key.hashCode();
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object obj) {
-            return obj instanceof TestCacheKeyExternalizable && key.equals(((TestCacheKeyExternalizable)obj).key);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void writeExternal(ObjectOutput out) throws IOException {
-            U.writeString(out, key);
-            U.writeString(out, terminalId);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            key = U.readString(in);
-            terminalId = U.readString(in);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
deleted file mode 100644
index 4306862..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
+++ /dev/null
@@ -1,2086 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.io.*;
-import org.gridgain.testframework.*;
-import org.gridgain.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.math.*;
-import java.net.*;
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.junit.Assert.*;
-
-/**
- * Test for optimized object streams.
- */
-public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testNull() throws Exception {
-        assertNull(marshalUnmarshal(null));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testByte() throws Exception {
-        byte val = 10;
-
-        assertEquals(val, marshalUnmarshal(val));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testShort() throws Exception {
-        short val = 100;
-
-        assertEquals(val, marshalUnmarshal(val));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testInteger() throws Exception {
-        int val = 100;
-
-        assertEquals(val, marshalUnmarshal(val));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testLong() throws Exception {
-        long val = 1000L;
-
-        assertEquals(val, marshalUnmarshal(val));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testFloat() throws Exception {
-        float val = 10.0f;
-
-        assertEquals(val, marshalUnmarshal(val));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testDouble() throws Exception {
-        double val = 100.0d;
-
-        assertEquals(val, marshalUnmarshal(val));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testBoolean() throws Exception {
-        boolean val = true;
-
-        assertEquals(val, marshalUnmarshal(val));
-
-        val = false;
-
-        assertEquals(val, marshalUnmarshal(val));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testChar() throws Exception {
-        char val = 10;
-
-        assertEquals(val, marshalUnmarshal(val));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testByteArray() throws Exception {
-        byte[] arr = marshalUnmarshal(new byte[] {1, 2});
-
-        assertArrayEquals(new byte[] {1, 2}, arr);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testShortArray() throws Exception {
-        short[] arr = marshalUnmarshal(new short[] {1, 2});
-
-        assertArrayEquals(new short[] {1, 2}, arr);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testIntArray() throws Exception {
-        int[] arr = marshalUnmarshal(new int[] {1, 2});
-
-        assertArrayEquals(new int[] {1, 2}, arr);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testLongArray() throws Exception {
-        long[] arr = marshalUnmarshal(new long[] {1L, 2L});
-
-        assertArrayEquals(new long[] {1, 2}, arr);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testFloatArray() throws Exception {
-        float[] arr = marshalUnmarshal(new float[] {1.0f, 2.0f});
-
-        assertArrayEquals(new float[] {1.0f, 2.0f}, arr, 0.1f);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testDoubleArray() throws Exception {
-        double[] arr = marshalUnmarshal(new double[] {1.0d, 2.0d});
-
-        assertArrayEquals(new double[] {1.0d, 2.0d}, arr, 0.1d);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testBooleanArray() throws Exception {
-        boolean[] arr = marshalUnmarshal(new boolean[] {true, false, false});
-
-        assertEquals(3, arr.length);
-        assertEquals(true, arr[0]);
-        assertEquals(false, arr[1]);
-        assertEquals(false, arr[2]);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testCharArray() throws Exception {
-        char[] arr = marshalUnmarshal(new char[] {1, 2});
-
-        assertArrayEquals(new char[] {1, 2}, arr);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testObject() throws Exception {
-        TestObject obj = new TestObject();
-
-        obj.longVal = 100L;
-        obj.doubleVal = 100.0d;
-        obj.longArr = new Long[] {200L, 300L};
-        obj.doubleArr = new Double[] {200.0d, 300.0d};
-
-        assertEquals(obj, marshalUnmarshal(obj));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testRequireSerializable() throws Exception {
-        try {
-            new GridOptimizedMarshaller(true, null, null, 0).marshal(new Object());
-
-            assert false : "Exception not thrown.";
-        }
-        catch (GridException e) {
-            NotSerializableException serEx = e.getCause(NotSerializableException.class);
-
-            if (serEx == null)
-                throw e;
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPool() throws Exception {
-        final TestObject obj = new TestObject();
-
-        obj.longVal = 100L;
-        obj.doubleVal = 100.0d;
-        obj.longArr = new Long[100 * 1024];
-        obj.doubleArr = new Double[100 * 1024];
-
-        Arrays.fill(obj.longArr, 100L);
-        Arrays.fill(obj.doubleArr, 100.0d);
-
-        final GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(false, null, null, 5);
-
-        try {
-            multithreaded(new Callable<Object>() {
-                @Override public Object call() throws Exception {
-                    for (int i = 0; i < 50; i++)
-                        assertEquals(obj, marsh.unmarshal(marsh.marshal(obj), null));
-
-                    return null;
-                }
-            }, 20);
-        }
-        finally {
-            marsh.setPoolSize(0);
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testObjectWithNulls() throws Exception {
-        TestObject obj = new TestObject();
-
-        obj.longVal = 100L;
-        obj.longArr = new Long[] {200L, 300L};
-
-        assertEquals(obj, marshalUnmarshal(obj));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testObjectArray() throws Exception {
-        TestObject obj1 = new TestObject();
-
-        obj1.longVal = 100L;
-        obj1.doubleVal = 100.0d;
-        obj1.longArr = new Long[] {200L, 300L};
-        obj1.doubleArr = new Double[] {200.0d, 300.0d};
-
-        TestObject obj2 = new TestObject();
-
-        obj2.longVal = 400L;
-        obj2.doubleVal = 400.0d;
-        obj2.longArr = new Long[] {500L, 600L};
-        obj2.doubleArr = new Double[] {500.0d, 600.0d};
-
-        TestObject[] arr = new TestObject[] {obj1, obj2};
-
-        assertArrayEquals(arr, (Object[])marshalUnmarshal(arr));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testExternalizable() throws Exception {
-        ExternalizableTestObject1 obj = new ExternalizableTestObject1();
-
-        obj.longVal = 100L;
-        obj.doubleVal = 100.0d;
-        obj.longArr = new Long[] {200L, 300L};
-        obj.doubleArr = new Double[] {200.0d, 300.0d};
-
-        assertEquals(obj, marshalUnmarshal(obj));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testExternalizableWithNulls() throws Exception {
-        ExternalizableTestObject2 obj = new ExternalizableTestObject2();
-
-        obj.longVal = 100L;
-        obj.doubleVal = 100.0d;
-        obj.longArr = new Long[] {200L, 300L};
-        obj.doubleArr = new Double[] {200.0d, 300.0d};
-
-        obj = marshalUnmarshal(obj);
-
-        assertEquals(100L, obj.longVal.longValue());
-        assertNull(obj.doubleVal);
-        assertArrayEquals(new Long[] {200L, 300L}, obj.longArr);
-        assertNull(obj.doubleArr);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testLink() throws Exception {
-        for (int i = 0; i < 20; i++) {
-            LinkTestObject1 obj1 = new LinkTestObject1();
-            LinkTestObject2 obj2 = new LinkTestObject2();
-            LinkTestObject2 obj3 = new LinkTestObject2();
-
-            obj1.val = 100;
-            obj2.ref = obj1;
-            obj3.ref = obj1;
-
-            LinkTestObject2[] arr = new LinkTestObject2[] {obj2, obj3};
-
-            assertArrayEquals(arr, (Object[])marshalUnmarshal(arr));
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testCycleLink() throws Exception {
-        for (int i = 0; i < 20; i++) {
-            CycleLinkTestObject obj = new CycleLinkTestObject();
-
-            obj.val = 100;
-            obj.ref = obj;
-
-            assertEquals(obj, marshalUnmarshal(obj));
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testNoDefaultConstructor() throws Exception {
-        NoDefaultConstructorTestObject obj = new NoDefaultConstructorTestObject(100);
-
-        assertEquals(obj, marshalUnmarshal(obj));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testEnum() throws Exception {
-        assertEquals(TestEnum.B, marshalUnmarshal(TestEnum.B));
-
-        TestEnum[] arr = new TestEnum[] {TestEnum.C, TestEnum.A, TestEnum.B, TestEnum.A};
-
-        assertArrayEquals(arr, (Object[])marshalUnmarshal(arr));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testCollection() throws Exception {
-        TestObject obj1 = new TestObject();
-
-        obj1.longVal = 100L;
-        obj1.doubleVal = 100.0d;
-        obj1.longArr = new Long[] {200L, 300L};
-        obj1.doubleArr = new Double[] {200.0d, 300.0d};
-
-        TestObject obj2 = new TestObject();
-
-        obj2.longVal = 400L;
-        obj2.doubleVal = 400.0d;
-        obj2.longArr = new Long[] {500L, 600L};
-        obj2.doubleArr = new Double[] {500.0d, 600.0d};
-
-        Collection<TestObject> col = F.asList(obj1, obj2);
-
-        assertEquals(col, marshalUnmarshal(col));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testMap() throws Exception {
-        TestObject obj1 = new TestObject();
-
-        obj1.longVal = 100L;
-        obj1.doubleVal = 100.0d;
-        obj1.longArr = new Long[] {200L, 300L};
-        obj1.doubleArr = new Double[] {200.0d, 300.0d};
-
-        TestObject obj2 = new TestObject();
-
-        obj2.longVal = 400L;
-        obj2.doubleVal = 400.0d;
-        obj2.longArr = new Long[] {500L, 600L};
-        obj2.doubleArr = new Double[] {500.0d, 600.0d};
-
-        Map<Integer, TestObject> map = F.asMap(1, obj1, 2, obj2);
-
-        assertEquals(map, marshalUnmarshal(map));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testUuid() throws Exception {
-        UUID uuid = UUID.randomUUID();
-
-        assertEquals(uuid, marshalUnmarshal(uuid));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testDate() throws Exception {
-        Date date = new Date();
-
-        assertEquals(date, marshalUnmarshal(date));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testTransient() throws Exception {
-        TransientTestObject obj = marshalUnmarshal(new TransientTestObject(100, 200, "str1", "str2"));
-
-        assertEquals(100, obj.val1);
-        assertEquals(0, obj.val2);
-        assertEquals("str1", obj.str1);
-        assertNull(obj.str2);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testWriteReadObject() throws Exception {
-        WriteReadTestObject obj = marshalUnmarshal(new WriteReadTestObject(100, "str"));
-
-        assertEquals(100, obj.val);
-        assertEquals("Optional data", obj.str);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testWriteReplace() throws Exception {
-        ReplaceTestObject obj = marshalUnmarshal(new ReplaceTestObject(100));
-
-        assertEquals(200, obj.value());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testWriteReplaceNull() throws Exception {
-        ReplaceNullTestObject obj = marshalUnmarshal(new ReplaceNullTestObject());
-
-        assertNull(obj);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testReadResolve() throws Exception {
-        ResolveTestObject obj = marshalUnmarshal(new ResolveTestObject(100));
-
-        assertEquals(200, obj.value());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testArrayDeque() throws Exception {
-        Queue<Integer> queue = new ArrayDeque<>();
-
-        for (int i = 0; i < 100; i++)
-            queue.add(i);
-
-        Queue<Integer> newQueue = marshalUnmarshal(queue);
-
-        assertEquals(queue.size(), newQueue.size());
-
-        Integer i;
-
-        while ((i = newQueue.poll()) != null)
-            assertEquals(queue.poll(), i);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testArrayList() throws Exception {
-        Collection<Integer> list = new ArrayList<>();
-
-        for (int i = 0; i < 100; i++)
-            list.add(i);
-
-        assertEquals(list, marshalUnmarshal(list));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testHashMap() throws Exception {
-        Map<Integer, Integer> map = new HashMap<>();
-
-        for (int i = 0; i < 100; i++)
-            map.put(i, i);
-
-        assertEquals(map, marshalUnmarshal(map));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testHashSet() throws Exception {
-        Collection<Integer> set = new HashSet<>();
-
-        for (int i = 0; i < 100; i++)
-            set.add(i);
-
-        assertEquals(set, marshalUnmarshal(set));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings("UseOfObsoleteCollectionType")
-    public void testHashtable() throws Exception {
-        Map<Integer, Integer> map = new Hashtable<>();
-
-        for (int i = 0; i < 100; i++)
-            map.put(i, i);
-
-        assertEquals(map, marshalUnmarshal(map));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testIdentityHashMap() throws Exception {
-        Map<Integer, Integer> map = new IdentityHashMap<>();
-
-        for (int i = 0; i < 100; i++)
-            map.put(i, i);
-
-        assertEquals(map, marshalUnmarshal(map));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testLinkedHashMap() throws Exception {
-        Map<Integer, Integer> map = new LinkedHashMap<>();
-
-        for (int i = 0; i < 100; i++)
-            map.put(i, i);
-
-        assertEquals(map, marshalUnmarshal(map));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testLinkedHashSet() throws Exception {
-        Collection<Integer> set = new LinkedHashSet<>();
-
-        for (int i = 0; i < 100; i++)
-            set.add(i);
-
-        assertEquals(set, marshalUnmarshal(set));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testLinkedList() throws Exception {
-        Collection<Integer> list = new LinkedList<>();
-
-        for (int i = 0; i < 100; i++)
-            list.add(i);
-
-        assertEquals(list, marshalUnmarshal(list));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testPriorityQueue() throws Exception {
-        Queue<Integer> queue = new PriorityQueue<>();
-
-        for (int i = 0; i < 100; i++)
-            queue.add(i);
-
-        Queue<Integer> newQueue = marshalUnmarshal(queue);
-
-        assertEquals(queue.size(), newQueue.size());
-
-        Integer i;
-
-        while ((i = newQueue.poll()) != null)
-            assertEquals(queue.poll(), i);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testProperties() throws Exception {
-        Properties dflts = new Properties();
-
-        dflts.setProperty("key1", "val1");
-        dflts.setProperty("key2", "wrong");
-
-        Properties props = new Properties(dflts);
-
-        props.setProperty("key2", "val2");
-
-        Properties newProps = marshalUnmarshal(props);
-
-        assertEquals("val1", newProps.getProperty("key1"));
-        assertEquals("val2", newProps.getProperty("key2"));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testTreeMap() throws Exception {
-        Map<Integer, Integer> map = new TreeMap<>();
-
-        for (int i = 0; i < 100; i++)
-            map.put(i, i);
-
-        assertEquals(map, marshalUnmarshal(map));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testTreeSet() throws Exception {
-        Collection<Integer> set = new TreeSet<>();
-
-        for (int i = 0; i < 100; i++)
-            set.add(i);
-
-        assertEquals(set, marshalUnmarshal(set));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings("UseOfObsoleteCollectionType")
-    public void testVector() throws Exception {
-        Collection<Integer> vector = new Vector<>();
-
-        for (int i = 0; i < 100; i++)
-            vector.add(i);
-
-        assertEquals(vector, marshalUnmarshal(vector));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testString() throws Exception {
-        assertEquals("Latin", marshalUnmarshal("Latin"));
-        assertEquals("Кириллица", marshalUnmarshal("Кириллица"));
-        assertEquals("中国的", marshalUnmarshal("中国的"));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testReadLine() throws Exception {
-        GridOptimizedObjectInputStream in = new GridOptimizedObjectInputStream(new GridUnsafeDataInput());
-
-        byte[] bytes = "line1\nline2\r\nli\rne3\nline4".getBytes();
-
-        in.in().bytes(bytes, bytes.length);
-
-        assertEquals("line1", in.readLine());
-        assertEquals("line2", in.readLine());
-        assertEquals("line3", in.readLine());
-        assertEquals("line4", in.readLine());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testHierarchy() throws Exception {
-        C c = new C(100, "str", 200, "str", 300, "str");
-
-        C newC = marshalUnmarshal(c);
-
-        assertEquals(100, newC.valueA());
-        assertEquals("Optional data", newC.stringA());
-        assertEquals(200, newC.valueB());
-        assertNull(newC.stringB());
-        assertEquals(0, newC.valueC());
-        assertEquals("Optional data", newC.stringC());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testInet4Address() throws Exception {
-        Inet4Address addr = (Inet4Address)InetAddress.getByName("localhost");
-
-        assertEquals(addr, marshalUnmarshal(addr));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testClass() throws Exception {
-        assertEquals(int.class, marshalUnmarshal(int.class));
-        assertEquals(Long.class, marshalUnmarshal(Long.class));
-        assertEquals(TestObject.class, marshalUnmarshal(TestObject.class));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testWriteReadFields() throws Exception {
-        WriteReadFieldsTestObject obj = marshalUnmarshal(new WriteReadFieldsTestObject(100, "str"));
-
-        assertEquals(100, obj.val);
-        assertEquals("Optional data", obj.str);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testWriteFields() throws Exception {
-        WriteFieldsTestObject obj = marshalUnmarshal(new WriteFieldsTestObject(100, "str"));
-
-        assertEquals(100, obj.val);
-        assertEquals("Optional data", obj.str);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testBigInteger() throws Exception {
-        BigInteger b = new BigInteger("54654865468745468465321414646834562346475457488");
-
-        assertEquals(b, marshalUnmarshal(b));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testBigDecimal() throws Exception {
-        BigDecimal b = new BigDecimal("849572389457208934572093574.123512938654126458542145");
-
-        assertEquals(b, marshalUnmarshal(b));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testSimpleDateFormat() throws Exception {
-        SimpleDateFormat f = new SimpleDateFormat("MM/dd/yyyy");
-
-        assertEquals(f, marshalUnmarshal(f));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testComplexObject() throws Exception {
-        ComplexTestObject obj = new ComplexTestObject();
-
-        assertEquals(obj, marshalUnmarshal(obj));
-
-        ExternalizableTestObject1 extObj1 = new ExternalizableTestObject1();
-
-        extObj1.longVal = 1000L;
-        extObj1.doubleVal = 1000.0d;
-        extObj1.longArr = new Long[] {1000L, 2000L, 3000L};
-        extObj1.doubleArr = new Double[] {1000.0d, 2000.0d, 3000.0d};
-
-        ExternalizableTestObject1 extObj2 = new ExternalizableTestObject1();
-
-        extObj2.longVal = 2000L;
-        extObj2.doubleVal = 2000.0d;
-        extObj2.longArr = new Long[] {4000L, 5000L, 6000L};
-        extObj2.doubleArr = new Double[] {4000.0d, 5000.0d, 6000.0d};
-
-        Properties props = new Properties();
-
-        props.setProperty("name", "value");
-
-        Collection<Integer> col = F.asList(10, 20, 30);
-
-        Map<Integer, String> map = F.asMap(10, "str1", 20, "str2", 30, "str3");
-
-        obj = new ComplexTestObject(
-            (byte)1,
-            (short)10,
-            100,
-            1000L,
-            100.0f,
-            1000.0d,
-            'a',
-            false,
-            (byte)2,
-            (short)20,
-            200,
-            2000L,
-            200.0f,
-            2000.0d,
-            'b',
-            true,
-            new byte[] {1, 2, 3},
-            new short[] {10, 20, 30},
-            new int[] {100, 200, 300},
-            new long[] {1000, 2000, 3000},
-            new float[] {100.0f, 200.0f, 300.0f},
-            new double[] {1000.0d, 2000.0d, 3000.0d},
-            new char[] {'a', 'b', 'c'},
-            new boolean[] {false, true},
-            new ExternalizableTestObject1[] {extObj1, extObj2},
-            "String",
-            TestEnum.A,
-            UUID.randomUUID(),
-            props,
-            new ArrayList<>(col),
-            new HashMap<>(map),
-            new HashSet<>(col),
-            new LinkedList<>(col),
-            new LinkedHashMap<>(map),
-            new LinkedHashSet<>(col),
-            new Date(),
-            ExternalizableTestObject2.class
-        );
-
-        assertEquals(obj, marshalUnmarshal(obj));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testReadToArray() throws Exception {
-        GridOptimizedObjectInputStream in = GridOptimizedObjectStreamRegistry.in();
-
-        try {
-            byte[] arr = new byte[50];
-
-            for (int i = 0; i < arr.length; i++)
-                arr[i] = (byte)i;
-
-            in.in().bytes(arr, arr.length);
-
-            byte[] buf = new byte[10];
-
-            assertEquals(10, in.read(buf));
-
-            for (int i = 0; i < buf.length; i++)
-                assertEquals(i, buf[i]);
-
-            buf = new byte[30];
-
-            assertEquals(20, in.read(buf, 0, 20));
-
-            for (int i = 0; i < buf.length; i++)
-                assertEquals(i < 20 ? 10 + i : 0, buf[i]);
-
-            buf = new byte[30];
-
-            assertEquals(10, in.read(buf, 10, 10));
-
-            for (int i = 0; i < buf.length; i++)
-                assertEquals(i >= 10 && i < 20 ? 30 + (i - 10) : 0, buf[i]);
-
-            buf = new byte[20];
-
-            assertEquals(10, in.read(buf));
-
-            for (int i = 0; i < buf.length; i++)
-                assertEquals(i < 10 ? 40 + i : 0, buf[i]);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeIn(in);
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testHandleTableGrow() throws Exception {
-        List<String> c = new ArrayList<>();
-
-        for (int i = 0; i < 29; i++)
-            c.add("str");
-
-        String str = c.get(28);
-
-        c.add("str");
-        c.add(str);
-
-        List<Object> c0 = marshalUnmarshal(c);
-
-        assertTrue(c0.get(28) == c0.get(30));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testIncorrectExternalizable() throws Exception {
-        GridTestUtils.assertThrows(
-            log,
-            new Callable<Object>() {
-                @Override public Object call() throws Exception {
-                    return marshalUnmarshal(new IncorrectExternalizable());
-                }
-            },
-            IOException.class,
-            null);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testExcludedClass() throws Exception {
-        Class<?>[] exclClasses = U.staticField(GridMarshallerExclusions.class, "EXCL_CLASSES");
-
-        assertFalse(F.isEmpty(exclClasses));
-
-        for (Class<?> cls : exclClasses)
-            assertEquals(cls, marshalUnmarshal(cls));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testInet6Address() throws Exception {
-        final InetAddress address = Inet6Address.getByAddress(new byte[16]);
-
-        assertEquals(address, marshalUnmarshal(address));
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-    public void testPutFieldsWithDefaultWriteObject() throws Exception {
-        try {
-            marshalUnmarshal(new CustomWriteObjectMethodObject("test"));
-        }
-        catch (IOException e) {
-            assert e.getCause() instanceof NotActiveException;
-        }
-    }
-
-    /**
-     * Marshals and unmarshals object.
-     *
-     * @param obj Original object.
-     * @return Object after marshalling and unmarshalling.
-     * @throws Exception In case of error.
-     */
-    private <T> T marshalUnmarshal(@Nullable Object obj) throws Exception {
-        GridOptimizedObjectOutputStream out = null;
-        GridOptimizedObjectInputStream in = null;
-
-        try {
-            out = GridOptimizedObjectStreamRegistry.out();
-
-            out.requireSerializable(true);
-
-            out.writeObject(obj);
-
-            byte[] arr = out.out().array();
-
-            in = GridOptimizedObjectStreamRegistry.in();
-
-            in.classLoader(getClass().getClassLoader());
-
-            in.in().bytes(arr, arr.length);
-
-            Object obj0 = in.readObject();
-
-            checkHandles(out, in);
-
-            return (T)obj0;
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeOut(out);
-            GridOptimizedObjectStreamRegistry.closeIn(in);
-        }
-    }
-
-    /**
-     * Checks that handles are equal in output and input streams.
-     *
-     * @param out Output stream.
-     * @param in Input stream.
-     * @throws Exception If failed.
-     */
-    private void checkHandles(GridOptimizedObjectOutputStream out, GridOptimizedObjectInputStream in)
-        throws Exception {
-        Object[] outHandles = out.handledObjects();
-        Object[] inHandles = in.handledObjects();
-
-        assertEquals(outHandles.length, inHandles.length);
-
-        for (int i = 0; i < outHandles.length; i++) {
-            if (outHandles[i] == null)
-                assertTrue(inHandles[i] == null);
-            else {
-                assertFalse(inHandles[i] == null);
-
-                assertTrue(outHandles[i].getClass() == inHandles[i].getClass());
-            }
-        }
-    }
-
-    /** */
-    private static class IncorrectExternalizable implements Externalizable {
-        /**
-         * Required by {@link Externalizable}.
-         */
-        public IncorrectExternalizable() {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeLong(0);
-            out.writeObject("str");
-        }
-
-        /** {@inheritDoc} */
-        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            in.readInt();
-            in.readObject();
-        }
-    }
-
-    /**
-     * Test object.
-     */
-    private static class TestObject implements Serializable {
-        /** */
-        private Long longVal;
-
-        /** */
-        private Double doubleVal;
-
-        /** */
-        private Long[] longArr;
-
-        /** */
-        private Double[] doubleArr;
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            TestObject obj = (TestObject)o;
-
-            return longVal != null ? longVal.equals(obj.longVal) : obj.longVal == null &&
-                doubleVal != null ? doubleVal.equals(obj.doubleVal) : obj.doubleVal == null &&
-                Arrays.equals(longArr, obj.longArr) &&
-                Arrays.equals(doubleArr, obj.doubleArr);
-        }
-    }
-
-    /**
-     * Externalizable test object.
-     */
-    private static class ExternalizableTestObject1 implements Externalizable {
-        /** */
-        private Long longVal;
-
-        /** */
-        private Double doubleVal;
-
-        /** */
-        private Long[] longArr;
-
-        /** */
-        private Double[] doubleArr;
-
-        /**
-         * Required by {@link Externalizable}.
-         */
-        public ExternalizableTestObject1() {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            ExternalizableTestObject1 obj = (ExternalizableTestObject1)o;
-
-            return longVal != null ? longVal.equals(obj.longVal) : obj.longVal == null &&
-                doubleVal != null ? doubleVal.equals(obj.doubleVal) : obj.doubleVal == null &&
-                Arrays.equals(longArr, obj.longArr) &&
-                Arrays.equals(doubleArr, obj.doubleArr);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeLong(longVal);
-            out.writeDouble(doubleVal);
-            U.writeArray(out, longArr);
-            U.writeArray(out, doubleArr);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            longVal = in.readLong();
-            doubleVal = in.readDouble();
-
-            Object[] arr = U.readArray(in);
-
-            longArr = Arrays.copyOf(arr, arr.length, Long[].class);
-
-            arr = U.readArray(in);
-
-            doubleArr = Arrays.copyOf(arr, arr.length, Double[].class);
-        }
-    }
-
-    /**
-     * Externalizable test object.
-     */
-    private static class ExternalizableTestObject2 implements Externalizable {
-        /** */
-        private Long longVal;
-
-        /** */
-        private Double doubleVal;
-
-        /** */
-        private Long[] longArr;
-
-        /** */
-        private Double[] doubleArr;
-
-        /**
-         * Required by {@link Externalizable}.
-         */
-        public ExternalizableTestObject2() {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            ExternalizableTestObject2 obj = (ExternalizableTestObject2)o;
-
-            return longVal != null ? longVal.equals(obj.longVal) : obj.longVal == null &&
-                doubleVal != null ? doubleVal.equals(obj.doubleVal) : obj.doubleVal == null &&
-                Arrays.equals(longArr, obj.longArr) &&
-                Arrays.equals(doubleArr, obj.doubleArr);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void writeExternal(ObjectOutput out) throws IOException {
-            out.writeLong(longVal);
-            U.writeArray(out, longArr);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-            longVal = in.readLong();
-
-            Object[] arr = U.readArray(in);
-
-            longArr = Arrays.copyOf(arr, arr.length, Long[].class);
-        }
-    }
-
-    /**
-     * Test object.
-     */
-    private static class LinkTestObject1 implements Serializable {
-        /** */
-        private int val;
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            LinkTestObject1 obj = (LinkTestObject1)o;
-
-            return val == obj.val;
-        }
-    }
-
-    /**
-     * Test object.
-     */
-    private static class LinkTestObject2 implements Serializable {
-        /** */
-        private LinkTestObject1 ref;
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            LinkTestObject2 obj = (LinkTestObject2)o;
-
-            return ref != null ? ref.equals(obj.ref) : obj.ref == null;
-        }
-    }
-
-    /**
-     * Cycle link test object.
-     */
-    private static class CycleLinkTestObject implements Serializable {
-        /** */
-        private int val;
-
-        /** */
-        private CycleLinkTestObject ref;
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            CycleLinkTestObject obj = (CycleLinkTestObject)o;
-
-            return val == obj.val && ref != null ? ref.val == val : obj.ref == null;
-        }
-    }
-
-    /**
-     * Test object without default constructor.
-     */
-    private static class NoDefaultConstructorTestObject implements Serializable {
-        /** */
-        private int val;
-
-        /**
-         * @param val Value.
-         */
-        private NoDefaultConstructorTestObject(int val) {
-            this.val = val;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            NoDefaultConstructorTestObject obj = (NoDefaultConstructorTestObject)o;
-
-            return val == obj.val;
-        }
-    }
-
-    /**
-     * Test object with transient fields.
-     */
-    @SuppressWarnings("TransientFieldNotInitialized")
-    private static class TransientTestObject implements Serializable {
-        /** */
-        private int val1;
-
-        /** */
-        private transient int val2;
-
-        /** */
-        private String str1;
-
-        /** */
-        private transient String str2;
-
-        /**
-         * @param val1 Value 1.
-         * @param val2 Value 2.
-         * @param str1 String 1.
-         * @param str2 String 2.
-         */
-        private TransientTestObject(int val1, int val2, String str1, String str2) {
-            this.val1 = val1;
-            this.val2 = val2;
-            this.str1 = str1;
-            this.str2 = str2;
-        }
-    }
-
-    /**
-     * Test object with {@code writeObject} and {@code readObject} methods.
-     */
-    @SuppressWarnings("TransientFieldNotInitialized")
-    private static class WriteReadTestObject implements Serializable {
-        /** */
-        private int val;
-
-        /** */
-        private transient String str;
-
-        /**
-         * @param val Value.
-         * @param str String.
-         */
-        private WriteReadTestObject(int val, String str) {
-            this.val = val;
-            this.str = str;
-        }
-
-        /**
-         * @param out Output stream.
-         * @throws IOException In case of error.
-         */
-        private void writeObject(ObjectOutputStream out) throws IOException {
-            out.defaultWriteObject();
-
-            out.writeUTF("Optional data");
-        }
-
-        /**
-         * @param in Input stream.
-         * @throws IOException In case of error.
-         * @throws ClassNotFoundException If class not found.
-         */
-        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-            in.defaultReadObject();
-
-            str = in.readUTF();
-        }
-    }
-
-    /**
-     * Test object that uses {@code writeFields} and {@code readFields} methods.
-     */
-    private static class WriteReadFieldsTestObject implements Serializable {
-        /** */
-        private int val;
-
-        /** */
-        private String str;
-
-        /**
-         * @param val Value.
-         * @param str String.
-         */
-        private WriteReadFieldsTestObject(int val, String str) {
-            this.val = val;
-            this.str = str;
-        }
-
-        /**
-         * @param out Output stream.
-         * @throws IOException In case of error.
-         */
-        private void writeObject(ObjectOutputStream out) throws IOException {
-            ObjectOutputStream.PutField fields = out.putFields();
-
-            fields.put("val", val);
-            fields.put("str", "Optional data");
-
-            out.writeFields();
-        }
-
-        /**
-         * @param in Input stream.
-         * @throws IOException In case of error.
-         * @throws ClassNotFoundException If class not found.
-         */
-        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-            ObjectInputStream.GetField fields = in.readFields();
-
-            val = fields.get("val", 0);
-            str = (String)fields.get("str", null);
-        }
-    }
-
-    /**
-     * Test object that uses {@code writeFields} and {@code readFields} methods.
-     */
-    private static class WriteFieldsTestObject implements Serializable {
-        /** */
-        private int val;
-
-        /** */
-        @SuppressWarnings("UnusedDeclaration")
-        private String str;
-
-        /**
-         * @param val Value.
-         * @param str String.
-         */
-        private WriteFieldsTestObject(int val, String str) {
-            this.val = val;
-            this.str = str;
-        }
-
-        /**
-         * @param out Output stream.
-         * @throws IOException In case of error.
-         */
-        private void writeObject(ObjectOutputStream out) throws IOException {
-            ObjectOutputStream.PutField fields = out.putFields();
-
-            fields.put("val", val);
-            fields.put("str", "Optional data");
-
-            out.writeFields();
-        }
-    }
-
-    /**
-     * Base object with {@code writeReplace} method.
-     */
-    private abstract static class ReplaceTestBaseObject implements Serializable {
-        /** */
-        private int val;
-
-        /**
-         * @param val Value.
-         */
-        private ReplaceTestBaseObject(int val) {
-            this.val = val;
-        }
-
-        /**
-         * @return Value.
-         */
-        public int value() {
-            return val;
-        }
-
-        /**
-         * @return Replaced object.
-         * @throws ObjectStreamException In case of error.
-         */
-        protected Object writeReplace() throws ObjectStreamException {
-            return new ReplaceTestObject(val * 2);
-        }
-    }
-
-    /**
-     * Test object for {@code writeReplace} method.
-     */
-    private static class ReplaceTestObject extends ReplaceTestBaseObject {
-        /**
-         * @param val Value.
-         */
-        private ReplaceTestObject(int val) {
-            super(val);
-        }
-    }
-
-    /**
-     * Test object with {@code writeReplace} method.
-     */
-    private static class ReplaceNullTestObject implements Serializable {
-        /**
-         * @return Replaced object.
-         * @throws ObjectStreamException In case of error.
-         */
-        protected Object writeReplace() throws ObjectStreamException {
-            return null;
-        }
-    }
-
-    /**
-     * Base object with {@code readResolve} method.
-     */
-    private abstract static class ResolveTestBaseObject implements Serializable {
-        /** */
-        private int val;
-
-        /**
-         * @param val Value.
-         */
-        private ResolveTestBaseObject(int val) {
-            this.val = val;
-        }
-
-        /**
-         * @return Value.
-         */
-        public int value() {
-            return val;
-        }
-
-        /**
-         * @return Replaced object.
-         * @throws ObjectStreamException In case of error.
-         */
-        protected Object readResolve() throws ObjectStreamException {
-            return new ResolveTestObject(val * 2);
-        }
-    }
-
-    /**
-     * Test object for {@code readResolve} method.
-     */
-    private static class ResolveTestObject extends ResolveTestBaseObject {
-        /**
-         * @param val Value.
-         */
-        private ResolveTestObject(int val) {
-            super(val);
-        }
-    }
-
-    /**
-     * Class A.
-     */
-    private static class A implements Serializable {
-        /** */
-        private int valA;
-
-        /** */
-        private transient String strA;
-
-        /**
-         * @param valA Value A.
-         * @param strA String A.
-         */
-        A(int valA, String strA) {
-            this.valA = valA;
-            this.strA = strA;
-        }
-
-        /**
-         * @return Value.
-         */
-        int valueA() {
-            return valA;
-        }
-
-        /**
-         * @return String.
-         */
-        String stringA() {
-            return strA;
-        }
-
-        /**
-         * @param out Output stream.
-         * @throws IOException In case of error.
-         */
-        private void writeObject(ObjectOutputStream out) throws IOException {
-            out.defaultWriteObject();
-
-            out.writeUTF("Optional data");
-        }
-
-        /**
-         * @param in Input stream.
-         * @throws IOException In case of error.
-         * @throws ClassNotFoundException If class not found.
-         */
-        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-            in.defaultReadObject();
-
-            strA = in.readUTF();
-        }
-    }
-
-    /**
-     * Class B.
-     */
-    private static class B extends A {
-        /** */
-        private int valB;
-
-        /** */
-        @SuppressWarnings("TransientFieldNotInitialized")
-        private transient String strB;
-
-        /**
-         * @param valA Value A.
-         * @param strA String A.
-         * @param valB Value B.
-         * @param strB String B.
-         */
-        B(int valA, String strA, int valB, String strB) {
-            super(valA, strA);
-
-            this.valB = valB;
-            this.strB = strB;
-        }
-
-        /**
-         * @return Value.
-         */
-        int valueB() {
-            return valB;
-        }
-
-        /**
-         * @return String.
-         */
-        String stringB() {
-            return strB;
-        }
-    }
-
-    /**
-     * Class C.
-     */
-    @SuppressWarnings("MethodOverridesPrivateMethodOfSuperclass")
-    private static class C extends B {
-        /** */
-        @SuppressWarnings("InstanceVariableMayNotBeInitializedByReadObject")
-        private int valC;
-
-        /** */
-        private transient String strC;
-
-        /**
-         * @param valA Value A.
-         * @param strA String A.
-         * @param valB Value B.
-         * @param strB String B.
-         * @param valC Value C.
-         * @param strC String C.
-         */
-        C(int valA, String strA, int valB, String strB, int valC, String strC) {
-            super(valA, strA, valB, strB);
-
-            this.valC = valC;
-            this.strC = strC;
-        }
-
-        /**
-         * @return Value.
-         */
-        int valueC() {
-            return valC;
-        }
-
-        /**
-         * @return String.
-         */
-        String stringC() {
-            return strC;
-        }
-
-        /**
-         * @param out Output stream.
-         * @throws IOException In case of error.
-         */
-        private void writeObject(ObjectOutputStream out) throws IOException {
-            out.writeUTF("Optional data");
-        }
-
-        /**
-         * @param in Input stream.
-         * @throws IOException In case of error.
-         * @throws ClassNotFoundException If class not found.
-         */
-        private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
-            strC = in.readUTF();
-        }
-    }
-
-    /**
-     * Complex test object.
-     */
-    private static class ComplexTestObject implements Serializable {
-        /** */
-        private byte byteVal1;
-
-        /** */
-        private short shortVal1;
-
-        /** */
-        private int intVal1;
-
-        /** */
-        private long longVal1;
-
-        /** */
-        private float floatVal1;
-
-        /** */
-        private double doubleVal1;
-
-        /** */
-        private char cVal1;
-
-        /** */
-        private boolean boolVal1;
-
-        /** */
-        private Byte byteVal2;
-
-        /** */
-        private Short shortVal2;
-
-        /** */
-        private Integer intVal2;
-
-        /** */
-        private Long longVal2;
-
-        /** */
-        private Float floatVal2;
-
-        /** */
-        private Double doubleVal2;
-
-        /** */
-        private Character cVal2;
-
-        /** */
-        private Boolean boolVal2;
-
-        /** */
-        private byte[] byteArr;
-
-        /** */
-        private short[] shortArr;
-
-        /** */
-        private int[] intArr;
-
-        /** */
-        private long[] longArr;
-
-        /** */
-        private float[] floatArr;
-
-        /** */
-        private double[] doubleArr;
-
-        /** */
-        private char[] cArr;
-
-        /** */
-        private boolean[] boolArr;
-
-        /** */
-        private ExternalizableTestObject1[] objArr;
-
-        /** */
-        private String str;
-
-        /** */
-        private TestEnum enumVal;
-
-        /** */
-        private UUID uuid;
-
-        /** */
-        private Properties props;
-
-        /** */
-        private ArrayList<Integer> arrList;
-
-        /** */
-        private HashMap<Integer, String> hashMap;
-
-        /** */
-        private HashSet<Integer> hashSet;
-
-        /** */
-        private LinkedList<Integer> linkedList;
-
-        /** */
-        private LinkedHashMap<Integer, String> linkedHashMap;
-
-        /** */
-        private LinkedHashSet<Integer> linkedHashSet;
-
-        /** */
-        private Date date;
-
-        /** */
-        private Class<?> cls;
-
-        /** */
-        private ComplexTestObject self;
-
-        /** */
-        private ComplexTestObject() {
-            self = this;
-        }
-
-        /**
-         * @param byteVal1 Byte value.
-         * @param shortVal1 Short value.
-         * @param intVal1 Integer value.
-         * @param longVal1 Long value.
-         * @param floatVal1 Float value.
-         * @param doubleVal1 Double value.
-         * @param cVal1 Char value.
-         * @param boolVal1 Boolean value.
-         * @param byteVal2 Byte value.
-         * @param shortVal2 Short value.
-         * @param intVal2 Integer value.
-         * @param longVal2 Long value.
-         * @param floatVal2 Float value.
-         * @param doubleVal2 Double value.
-         * @param cVal2 Char value.
-         * @param boolVal2 Boolean value.
-         * @param byteArr Bytes array.
-         * @param shortArr Shorts array.
-         * @param intArr Integers array.
-         * @param longArr Longs array.
-         * @param floatArr Floats array.
-         * @param doubleArr Doubles array.
-         * @param cArr Chars array.
-         * @param boolArr Booleans array.
-         * @param objArr Objects array.
-         * @param str String.
-         * @param enumVal Enum.
-         * @param uuid UUID.
-         * @param props Properties.
-         * @param arrList ArrayList.
-         * @param hashMap HashMap.
-         * @param hashSet HashSet.
-         * @param linkedList LinkedList.
-         * @param linkedHashMap LinkedHashMap.
-         * @param linkedHashSet LinkedHashSet.
-         * @param date Date.
-         * @param cls Class.
-         */
-        private ComplexTestObject(byte byteVal1, short shortVal1, int intVal1, long longVal1, float floatVal1,
-            double doubleVal1, char cVal1, boolean boolVal1, Byte byteVal2, Short shortVal2, Integer intVal2,
-            Long longVal2, Float floatVal2, Double doubleVal2, Character cVal2, Boolean boolVal2, byte[] byteArr,
-            short[] shortArr, int[] intArr, long[] longArr, float[] floatArr, double[] doubleArr, char[] cArr,
-            boolean[] boolArr, ExternalizableTestObject1[] objArr, String str, TestEnum enumVal, UUID uuid,
-            Properties props, ArrayList<Integer> arrList, HashMap<Integer, String> hashMap, HashSet<Integer> hashSet,
-            LinkedList<Integer> linkedList, LinkedHashMap<Integer, String> linkedHashMap,
-            LinkedHashSet<Integer> linkedHashSet, Date date, Class<?> cls) {
-            this.byteVal1 = byteVal1;
-            this.shortVal1 = shortVal1;
-            this.intVal1 = intVal1;
-            this.longVal1 = longVal1;
-            this.floatVal1 = floatVal1;
-            this.doubleVal1 = doubleVal1;
-            this.cVal1 = cVal1;
-            this.boolVal1 = boolVal1;
-            this.byteVal2 = byteVal2;
-            this.shortVal2 = shortVal2;
-            this.intVal2 = intVal2;
-            this.longVal2 = longVal2;
-            this.floatVal2 = floatVal2;
-            this.doubleVal2 = doubleVal2;
-            this.cVal2 = cVal2;
-            this.boolVal2 = boolVal2;
-            this.byteArr = byteArr;
-            this.shortArr = shortArr;
-            this.intArr = intArr;
-            this.longArr = longArr;
-            this.floatArr = floatArr;
-            this.doubleArr = doubleArr;
-            this.cArr = cArr;
-            this.boolArr = boolArr;
-            this.objArr = objArr;
-            this.str = str;
-            this.enumVal = enumVal;
-            this.uuid = uuid;
-            this.props = props;
-            this.arrList = arrList;
-            this.hashMap = hashMap;
-            this.hashSet = hashSet;
-            this.linkedList = linkedList;
-            this.linkedHashMap = linkedHashMap;
-            this.linkedHashSet = linkedHashSet;
-            this.date = date;
-            this.cls = cls;
-
-            self = this;
-        }
-
-        /** {@inheritDoc} */
-        @SuppressWarnings("RedundantIfStatement")
-        @Override public boolean equals(Object o) {
-            if (this == o)
-                return true;
-
-            if (o == null || getClass() != o.getClass())
-                return false;
-
-            ComplexTestObject obj = (ComplexTestObject)o;
-
-            if (boolVal1 != obj.boolVal1)
-                return false;
-
-            if (byteVal1 != obj.byteVal1)
-                return false;
-
-            if (cVal1 != obj.cVal1)
-                return false;
-
-            if (Double.compare(obj.doubleVal1, doubleVal1) != 0)
-                return false;
-
-            if (Float.compare(obj.floatVal1, floatVal1) != 0)
-                return false;
-
-            if (intVal1 != obj.intVal1)
-                return false;
-
-            if (longVal1 != obj.longVal1)
-                return false;
-
-            if (shortVal1 != obj.shortVal1)
-                return false;
-
-            if (arrList != null ? !arrList.equals(obj.arrList) : obj.arrList != null)
-                return false;
-
-            if (!Arrays.equals(boolArr, obj.boolArr))
-                return false;
-
-            if (boolVal2 != null ? !boolVal2.equals(obj.boolVal2) : obj.boolVal2 != null)
-                return false;
-
-            if (!Arrays.equals(byteArr, obj.byteArr))
-                return false;
-
-            if (byteVal2 != null ? !byteVal2.equals(obj.byteVal2) : obj.byteVal2 != null)
-                return false;
-
-            if (!Arrays.equals(cArr, obj.cArr))
-                return false;
-
-            if (cVal2 != null ? !cVal2.equals(obj.cVal2) : obj.cVal2 != null)
-                return false;
-
-            if (cls != null ? !cls.equals(obj.cls) : obj.cls != null)
-                return false;
-
-            if (date != null ? !date.equals(obj.date) : obj.date != null)
-                return false;
-
-            if (!Arrays.equals(doubleArr, obj.doubleArr))
-                return false;
-
-            if (doubleVal2 != null ? !doubleVal2.equals(obj.doubleVal2) : obj.doubleVal2 != null)
-                return false;
-
-            if (enumVal != obj.enumVal)
-                return false;
-
-            if (!Arrays.equals(floatArr, obj.floatArr))
-                return false;
-
-            if (floatVal2 != null ? !floatVal2.equals(obj.floatVal2) : obj.floatVal2 != null)
-                return false;
-
-            if (hashMap != null ? !hashMap.equals(obj.hashMap) : obj.hashMap != null)
-                return false;
-
-            if (hashSet != null ? !hashSet.equals(obj.hashSet) : obj.hashSet != null)
-                return false;
-
-            if (!Arrays.equals(intArr, obj.intArr))
-                return false;
-
-            if (intVal2 != null ? !intVal2.equals(obj.intVal2) : obj.intVal2 != null)
-                return false;
-
-            if (linkedHashMap != null ? !linkedHashMap.equals(obj.linkedHashMap) : obj.linkedHashMap != null)
-                return false;
-
-            if (linkedHashSet != null ? !linkedHashSet.equals(obj.linkedHashSet) : obj.linkedHashSet != null)
-                return false;
-
-            if (linkedList != null ? !linkedList.equals(obj.linkedList) : obj.linkedList != null)
-                return false;
-
-            if (!Arrays.equals(longArr, obj.longArr))
-                return false;
-
-            if (longVal2 != null ? !longVal2.equals(obj.longVal2) : obj.longVal2 != null)
-                return false;
-
-            if (!Arrays.equals(objArr, obj.objArr))
-                return false;
-
-            if (props != null ? !props.equals(obj.props) : obj.props != null)
-                return false;
-
-            if (!Arrays.equals(shortArr, obj.shortArr))
-                return false;
-
-            if (shortVal2 != null ? !shortVal2.equals(obj.shortVal2) : obj.shortVal2 != null)
-                return false;
-
-            if (str != null ? !str.equals(obj.str) : obj.str != null)
-                return false;
-
-            if (uuid != null ? !uuid.equals(obj.uuid) : obj.uuid != null)
-                return false;
-
-            if (self != this)
-                return false;
-
-            return true;
-        }
-    }
-
-    /**
-     * Test enum.
-     */
-    @SuppressWarnings("JavaDoc")
-    private enum TestEnum {
-        /** */
-        A,
-
-        /** */
-        B,
-
-        /** */
-        C
-    }
-
-    /**
-     * Class with custom serialization method which at the beginning invokes
-     * {@link ObjectOutputStream#defaultWriteObject()} and {@link ObjectOutputStream#putFields()} then.
-     */
-    public static class CustomWriteObjectMethodObject implements Serializable {
-        /** */
-        private final String name;
-
-        /**
-         * Creates new instance.
-         * @param name Object name.
-         */
-        public CustomWriteObjectMethodObject(String name) {
-            this.name = name;
-        }
-
-        /** {@inheritDoc} */
-        private void writeObject(ObjectOutputStream stream) throws IOException {
-            stream.defaultWriteObject();
-
-            ObjectOutputStream.PutField fields = stream.putFields();
-            fields.put("name", "test");
-
-            stream.writeFields();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
deleted file mode 100644
index bac8155..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridTestTcpDiscoveryIpFinderAdapter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.gridgain.grid.spi.GridSpiException;
-import org.gridgain.grid.spi.discovery.tcp.ipfinder.GridTcpDiscoveryIpFinderAdapter;
-
-import java.net.InetSocketAddress;
-import java.util.Collection;
-
-/**
- * Test TCP discovery IP finder adapter.
- */
-public class GridTestTcpDiscoveryIpFinderAdapter extends GridTcpDiscoveryIpFinderAdapter {
-    /** {@inheritDoc} */
-    @Override public Collection<InetSocketAddress> getRegisteredAddresses() throws GridSpiException {
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void registerAddresses(Collection<InetSocketAddress> addrs) throws GridSpiException {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void unregisterAddresses(Collection<InetSocketAddress> addrs) throws GridSpiException {
-        // No-op.
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/package.html b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/package.html
deleted file mode 100644
index 07c5c25..0000000
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Optimized marchalling test package.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40cf54f6/modules/core/src/test/java/org/gridgain/testsuites/GridMarshallerSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridMarshallerSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridMarshallerSelfTestSuite.java
index 40d780c..b37ce7c 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/GridMarshallerSelfTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/GridMarshallerSelfTestSuite.java
@@ -10,8 +10,8 @@
 package org.gridgain.testsuites;
 
 import junit.framework.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.marshaller.jdk.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.io.*;
 
 /**


[31/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: cecd94bdf2e82a40c2387517474ed2998328f91e
Parents: 22b17d7
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:32:15 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:32:15 2014 +0300

----------------------------------------------------------------------
 .../processors/rest/GridTestMemcacheClient.java |   2 +-
 .../configuration/IgniteConfiguration.java      |   2 +-
 .../ignite/marshaller/GridMarshaller.java       |   2 +-
 .../marshaller/jdk/GridJdkMarshaller.java       | 134 -------------------
 .../jdk/GridJdkMarshallerDummySerializable.java |  22 ---
 .../GridJdkMarshallerInputStreamWrapper.java    |  73 ----------
 .../jdk/GridJdkMarshallerObjectInputStream.java |  53 --------
 .../GridJdkMarshallerObjectOutputStream.java    |  37 -----
 .../GridJdkMarshallerOutputStreamWrapper.java   |  51 -------
 .../marshaller/jdk/IgniteJdkMarshaller.java     | 134 +++++++++++++++++++
 .../IgniteJdkMarshallerDummySerializable.java   |  22 +++
 .../IgniteJdkMarshallerInputStreamWrapper.java  |  73 ++++++++++
 .../IgniteJdkMarshallerObjectInputStream.java   |  53 ++++++++
 .../IgniteJdkMarshallerObjectOutputStream.java  |  37 +++++
 .../IgniteJdkMarshallerOutputStreamWrapper.java |  51 +++++++
 .../optimized/GridOptimizedMarshaller.java      |   2 +-
 .../org/gridgain/grid/kernal/GridGainEx.java    |   4 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   2 +-
 .../tcp/GridTcpMemcachedNioListener.java        |   2 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   2 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   2 +-
 .../tcp/GridTcpDiscoverySpiAdapter.java         |   2 +-
 .../GridTcpDiscoveryMulticastIpFinder.java      |   2 +-
 .../org/gridgain/jdbc/util/GridJdbcUtils.java   |   2 +-
 .../grid/GridExternalizableAbstractTest.java    |   2 +-
 .../communication/GridIoManagerSelfTest.java    |   2 +-
 .../GridDeploymentManagerStopSelfTest.java      |   2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |   2 +-
 .../marshaller/GridMarshallerResourceBean.java  |   2 +-
 .../jdk/GridJdkMarshallerSelfTest.java          |   2 +-
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |   2 +-
 ...GridTcpDiscoveryMarshallerCheckSelfTest.java |   4 +-
 .../testframework/junits/GridAbstractTest.java  |   2 +-
 34 files changed, 394 insertions(+), 394 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
index 994603d..bf02c2b 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
@@ -61,7 +61,7 @@ final class GridTestMemcacheClient {
     private final IgniteLogger log = new IgniteJavaLogger();
 
     /** JDK marshaller. */
-    private final GridMarshaller jdkMarshaller = new GridJdkMarshaller();
+    private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller();
 
     /** Socket. */
     private final Socket sock;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 2254ffb..b733597 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -1455,7 +1455,7 @@ public class IgniteConfiguration {
     /**
      * Should return an instance of marshaller to use in grid. If not provided,
      * {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} will be used on Java HotSpot VM, and
-     * {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller} will be used on other VMs.
+     * {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller} will be used on other VMs.
      *
      * @return Marshaller to use in grid.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
index d0b8826..df3d0d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
@@ -22,7 +22,7 @@ import java.io.*;
  * Gridgain provides the following {@code GridMarshaller} implementations:
  * <ul>
  * <li>{@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} - default</li>
- * <li>{@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller}</li>
+ * <li>{@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}</li>
  * </ul>
  * <p>
  * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
deleted file mode 100644
index d0c3246..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.jdk;
-
-import org.apache.ignite.marshaller.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-/**
- * Implementation of {@link GridMarshaller} based on JDK serialization mechanism.
- * <p>
- * <h1 class="header">Configuration</h1>
- * <h2 class="header">Mandatory</h2>
- * This marshaller has no mandatory configuration parameters.
- * <h2 class="header">Java Example</h2>
- * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller}.
- * <pre name="code" class="java">
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * // Override default marshaller.
- * cfg.setMarshaller(marshaller);
- *
- * // Starts grid.
- * G.start(cfg);
- * </pre>
- * <h2 class="header">Spring Example</h2>
- * GridJdkMarshaller can be configured from Spring XML configuration file:
- * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
- *     ...
- *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/&gt;
- *     &lt;/property&gt;
- *     ...
- * &lt;/bean&gt;
- * </pre>
- *  <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
- * <h2 class="header">Injection Example</h2>
- * GridMarshaller can be injected in users task, job or SPI as following:
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     &#64;GridMarshallerResource
- *     private GridMarshaller marshaller;
- *     ...
- * }
- * </pre>
- * or
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     private GridMarshaller marshaller;
- *     ...
- *     &#64;GridMarshallerResource
- *     public void setMarshaller(GridMarshaller marshaller) {
- *         this.marshaller = marshaller;
- *     }
- *     ...
- * }
- * </pre>
- * <br>
- *
- */
-public class GridJdkMarshaller extends GridAbstractMarshaller {
-    /** {@inheritDoc} */
-    @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
-        assert out != null;
-
-        ObjectOutputStream objOut = null;
-
-        try {
-            objOut = new GridJdkMarshallerObjectOutputStream(new GridJdkMarshallerOutputStreamWrapper(out));
-
-            // Make sure that we serialize only task, without class loader.
-            objOut.writeObject(obj);
-
-            objOut.flush();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to serialize object: " + obj, e);
-        }
-        finally{
-            U.closeQuiet(objOut);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings({"unchecked"})
-    @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
-        assert in != null;
-
-        if (clsLdr == null)
-            clsLdr = getClass().getClassLoader();
-
-        ObjectInputStream objIn = null;
-
-        try {
-            objIn = new GridJdkMarshallerObjectInputStream(new GridJdkMarshallerInputStreamWrapper(in), clsLdr);
-
-            return (T)objIn.readObject();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
-        }
-        catch (ClassNotFoundException e) {
-            throw new GridException("Failed to find class with given class loader for unmarshalling " +
-                "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " +
-                clsLdr, e);
-        }
-        finally{
-            U.closeQuiet(objIn);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridJdkMarshaller.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java
deleted file mode 100644
index 6487717..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.jdk;
-
-import java.io.*;
-
-/**
- * Serializable object used for {@link Object} replacement.
- */
-class GridJdkMarshallerDummySerializable implements Serializable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    // No-op.
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
deleted file mode 100644
index fb08f40..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.jdk;
-
-import java.io.*;
-
-/**
- * Wrapper for {@link InputStream}.
- */
-class GridJdkMarshallerInputStreamWrapper extends InputStream {
-    /** */
-    private InputStream in;
-
-    /**
-     * Creates wrapper.
-     *
-     * @param in Wrapped input stream
-     */
-    GridJdkMarshallerInputStreamWrapper(InputStream in) {
-        assert in != null;
-
-        this.in = in;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read() throws IOException {
-        return in.read();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read(byte[] b) throws IOException {
-        return in.read(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read(byte[] b, int off, int len) throws IOException {
-        return in.read(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override public long skip(long n) throws IOException {
-        return in.skip(n);
-    }
-
-    /** {@inheritDoc} */
-    @Override public int available() throws IOException {
-        return in.available();
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
-    @Override public void mark(int readLimit) {
-        in.mark(readLimit);
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
-    @Override public void reset() throws IOException {
-        in.reset();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean markSupported() {
-        return in.markSupported();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
deleted file mode 100644
index 5a64a75..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.jdk;
-
-import java.io.*;
-
-/**
- * This class defines custom JDK object input stream.
- */
-class GridJdkMarshallerObjectInputStream extends ObjectInputStream {
-    /** */
-    private final ClassLoader clsLdr;
-
-    /**
-     * @param in Parent input stream.
-     * @param clsLdr Custom class loader.
-     * @throws IOException If initialization failed.
-     */
-    GridJdkMarshallerObjectInputStream(InputStream in, ClassLoader clsLdr) throws IOException {
-        super(in);
-
-        assert clsLdr != null;
-
-        this.clsLdr = clsLdr;
-
-        enableResolveObject(true);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
-        // NOTE: DO NOT CHANGE TO 'clsLoader.loadClass()'
-        // Must have 'Class.forName()' instead of clsLoader.loadClass()
-        // due to weird ClassNotFoundExceptions for arrays of classes
-        // in certain cases.
-        return Class.forName(desc.getName(), true, clsLdr);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected Object resolveObject(Object o) throws IOException {
-        if (o != null && o.getClass().equals(GridJdkMarshallerDummySerializable.class))
-            return new Object();
-
-        return super.resolveObject(o);
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
deleted file mode 100644
index 51cfdd6..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.jdk;
-
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-/**
- * This class defines own object output stream.
- */
-class GridJdkMarshallerObjectOutputStream extends ObjectOutputStream {
-    /**
-     * @param out Output stream.
-     * @throws IOException Thrown in case of any I/O errors.
-     */
-    GridJdkMarshallerObjectOutputStream(OutputStream out) throws IOException {
-        super(out);
-
-        enableReplaceObject(true);
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override protected Object replaceObject(Object o) throws IOException {
-        return o == null || GridMarshallerExclusions.isExcluded(o.getClass()) ? null :
-            o.getClass().equals(Object.class) ? new GridJdkMarshallerDummySerializable() : super.replaceObject(o);
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
deleted file mode 100644
index b5e9e06..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.jdk;
-
-import java.io.*;
-
-/**
- * Wrapper for {@link OutputStream}.
- */
-class GridJdkMarshallerOutputStreamWrapper extends OutputStream {
-    /** */
-    private OutputStream out;
-
-    /**
-     * Creates wrapper.
-     *
-     * @param out Wrapped output stream
-     */
-    GridJdkMarshallerOutputStreamWrapper(OutputStream out) {
-        assert out != null;
-
-        this.out = out;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(int b) throws IOException {
-        out.write(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(byte[] b) throws IOException {
-        out.write(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(byte[] b, int off, int len) throws IOException {
-        out.write(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void flush() throws IOException {
-        out.flush();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
new file mode 100644
index 0000000..3ed5b6c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
@@ -0,0 +1,134 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import org.apache.ignite.marshaller.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ * Implementation of {@link GridMarshaller} based on JDK serialization mechanism.
+ * <p>
+ * <h1 class="header">Configuration</h1>
+ * <h2 class="header">Mandatory</h2>
+ * This marshaller has no mandatory configuration parameters.
+ * <h2 class="header">Java Example</h2>
+ * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller}.
+ * <pre name="code" class="java">
+ * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Override default marshaller.
+ * cfg.setMarshaller(marshaller);
+ *
+ * // Starts grid.
+ * G.start(cfg);
+ * </pre>
+ * <h2 class="header">Spring Example</h2>
+ * GridJdkMarshaller can be configured from Spring XML configuration file:
+ * <pre name="code" class="xml">
+ * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ *     ...
+ *     &lt;property name="marshaller"&gt;
+ *         &lt;bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/&gt;
+ *     &lt;/property&gt;
+ *     ...
+ * &lt;/bean&gt;
+ * </pre>
+ *  <p>
+ * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <br>
+ * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
+ * <h2 class="header">Injection Example</h2>
+ * GridMarshaller can be injected in users task, job or SPI as following:
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     private GridMarshaller marshaller;
+ *     ...
+ * }
+ * </pre>
+ * or
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     private GridMarshaller marshaller;
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     public void setMarshaller(GridMarshaller marshaller) {
+ *         this.marshaller = marshaller;
+ *     }
+ *     ...
+ * }
+ * </pre>
+ * <br>
+ *
+ */
+public class IgniteJdkMarshaller extends GridAbstractMarshaller {
+    /** {@inheritDoc} */
+    @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
+        assert out != null;
+
+        ObjectOutputStream objOut = null;
+
+        try {
+            objOut = new IgniteJdkMarshallerObjectOutputStream(new IgniteJdkMarshallerOutputStreamWrapper(out));
+
+            // Make sure that we serialize only task, without class loader.
+            objOut.writeObject(obj);
+
+            objOut.flush();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to serialize object: " + obj, e);
+        }
+        finally{
+            U.closeQuiet(objOut);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings({"unchecked"})
+    @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
+        assert in != null;
+
+        if (clsLdr == null)
+            clsLdr = getClass().getClassLoader();
+
+        ObjectInputStream objIn = null;
+
+        try {
+            objIn = new IgniteJdkMarshallerObjectInputStream(new IgniteJdkMarshallerInputStreamWrapper(in), clsLdr);
+
+            return (T)objIn.readObject();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
+        }
+        catch (ClassNotFoundException e) {
+            throw new GridException("Failed to find class with given class loader for unmarshalling " +
+                "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " +
+                clsLdr, e);
+        }
+        finally{
+            U.closeQuiet(objIn);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(IgniteJdkMarshaller.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerDummySerializable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerDummySerializable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerDummySerializable.java
new file mode 100644
index 0000000..23c2c67
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerDummySerializable.java
@@ -0,0 +1,22 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import java.io.*;
+
+/**
+ * Serializable object used for {@link Object} replacement.
+ */
+class IgniteJdkMarshallerDummySerializable implements Serializable {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerInputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerInputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerInputStreamWrapper.java
new file mode 100644
index 0000000..698ed74
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerInputStreamWrapper.java
@@ -0,0 +1,73 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import java.io.*;
+
+/**
+ * Wrapper for {@link InputStream}.
+ */
+class IgniteJdkMarshallerInputStreamWrapper extends InputStream {
+    /** */
+    private InputStream in;
+
+    /**
+     * Creates wrapper.
+     *
+     * @param in Wrapped input stream
+     */
+    IgniteJdkMarshallerInputStreamWrapper(InputStream in) {
+        assert in != null;
+
+        this.in = in;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read() throws IOException {
+        return in.read();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read(byte[] b) throws IOException {
+        return in.read(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read(byte[] b, int off, int len) throws IOException {
+        return in.read(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override public long skip(long n) throws IOException {
+        return in.skip(n);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int available() throws IOException {
+        return in.available();
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
+    @Override public void mark(int readLimit) {
+        in.mark(readLimit);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
+    @Override public void reset() throws IOException {
+        in.reset();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean markSupported() {
+        return in.markSupported();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectInputStream.java
new file mode 100644
index 0000000..1022c4d
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectInputStream.java
@@ -0,0 +1,53 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import java.io.*;
+
+/**
+ * This class defines custom JDK object input stream.
+ */
+class IgniteJdkMarshallerObjectInputStream extends ObjectInputStream {
+    /** */
+    private final ClassLoader clsLdr;
+
+    /**
+     * @param in Parent input stream.
+     * @param clsLdr Custom class loader.
+     * @throws IOException If initialization failed.
+     */
+    IgniteJdkMarshallerObjectInputStream(InputStream in, ClassLoader clsLdr) throws IOException {
+        super(in);
+
+        assert clsLdr != null;
+
+        this.clsLdr = clsLdr;
+
+        enableResolveObject(true);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+        // NOTE: DO NOT CHANGE TO 'clsLoader.loadClass()'
+        // Must have 'Class.forName()' instead of clsLoader.loadClass()
+        // due to weird ClassNotFoundExceptions for arrays of classes
+        // in certain cases.
+        return Class.forName(desc.getName(), true, clsLdr);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object resolveObject(Object o) throws IOException {
+        if (o != null && o.getClass().equals(IgniteJdkMarshallerDummySerializable.class))
+            return new Object();
+
+        return super.resolveObject(o);
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java
new file mode 100644
index 0000000..7243893
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerObjectOutputStream.java
@@ -0,0 +1,37 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import org.apache.ignite.marshaller.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ * This class defines own object output stream.
+ */
+class IgniteJdkMarshallerObjectOutputStream extends ObjectOutputStream {
+    /**
+     * @param out Output stream.
+     * @throws IOException Thrown in case of any I/O errors.
+     */
+    IgniteJdkMarshallerObjectOutputStream(OutputStream out) throws IOException {
+        super(out);
+
+        enableReplaceObject(true);
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override protected Object replaceObject(Object o) throws IOException {
+        return o == null || GridMarshallerExclusions.isExcluded(o.getClass()) ? null :
+            o.getClass().equals(Object.class) ? new IgniteJdkMarshallerDummySerializable() : super.replaceObject(o);
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerOutputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerOutputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerOutputStreamWrapper.java
new file mode 100644
index 0000000..0610747
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshallerOutputStreamWrapper.java
@@ -0,0 +1,51 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import java.io.*;
+
+/**
+ * Wrapper for {@link OutputStream}.
+ */
+class IgniteJdkMarshallerOutputStreamWrapper extends OutputStream {
+    /** */
+    private OutputStream out;
+
+    /**
+     * Creates wrapper.
+     *
+     * @param out Wrapped output stream
+     */
+    IgniteJdkMarshallerOutputStreamWrapper(OutputStream out) {
+        assert out != null;
+
+        this.out = out;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(int b) throws IOException {
+        out.write(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(byte[] b) throws IOException {
+        out.write(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(byte[] b, int off, int len) throws IOException {
+        out.write(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void flush() throws IOException {
+        out.flush();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
index 3a94bb3..17b3a07 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
@@ -22,7 +22,7 @@ import java.net.*;
 import java.util.*;
 
 /**
- * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller},
+ * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller},
  * which is based on standard {@link ObjectOutputStream}, this marshaller does not
  * enforce that all serialized objects implement {@link Serializable} interface. It is also
  * about 20 times faster as it removes lots of serialization overhead that exists in

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index 8888f9b..fcfc385 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -1596,7 +1596,7 @@ public class GridGainEx {
                         "object serialization performance will be significantly slower.",
                         "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release.");
 
-                    marsh = new GridJdkMarshaller();
+                    marsh = new IgniteJdkMarshaller();
                 }
                 else if (!GridOptimizedMarshaller.available()) {
                     U.warn(log, "GridOptimizedMarshaller is not supported on this JVM " +
@@ -1606,7 +1606,7 @@ public class GridGainEx {
                         "object serialization performance will be significantly slower.",
                         "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release.");
 
-                    marsh = new GridJdkMarshaller();
+                    marsh = new IgniteJdkMarshaller();
                 }
                 else
                     marsh = new GridOptimizedMarshaller();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index 4ffed4a..8682c55 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -35,7 +35,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
     private static final long serialVersionUID = 0L;
 
     /** Marshaller. */
-    private static final GridMarshaller MARSHALLER = new GridJdkMarshaller();
+    private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller();
 
     /** {@inheritDoc} */
     @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 03fa113..c8e59f4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -44,7 +44,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
     private static final long serialVersionUID = 0L;
 
     /** Marshaller. */
-    private static final GridMarshaller MARSHALLER = new GridJdkMarshaller();
+    private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller();
 
     /** How long to store future (10 minutes). */
     private static final int RMV_DELAY = 10 * 60;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index b3c8b22..abcc72e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -42,7 +42,7 @@ public class GridTcpMemcachedNioListener extends GridNioServerListenerAdapter<Gr
     private final GridRestProtocolHandler hnd;
 
     /** JDK marshaller. */
-    private final GridMarshaller jdkMarshaller = new GridJdkMarshaller();
+    private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller();
 
     /** Context. */
     private final GridKernalContext ctx;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
index 71ed4f3..26d62c2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -34,7 +34,7 @@ public class GridTcpRestParser implements GridNioParser {
     private static final Charset UTF_8 = Charset.forName("UTF-8");
 
     /** JDK marshaller. */
-    private final GridMarshaller jdkMarshaller = new GridJdkMarshaller();
+    private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller();
 
     /** {@inheritDoc} */
     @Nullable @Override public GridClientMessage decode(GridNioSession ses, ByteBuffer buf) throws IOException,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index 28dce35..42c1de9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -44,7 +44,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter {
     private GridNioServer<GridClientMessage> srv;
 
     /** JDK marshaller. */
-    private final GridMarshaller jdkMarshaller = new GridJdkMarshaller();
+    private final GridMarshaller jdkMarshaller = new IgniteJdkMarshaller();
 
     /** NIO server listener. */
     private GridTcpRestNioListener lsnr;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
index f1f8761..0706447 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
@@ -128,7 +128,7 @@ abstract class GridTcpDiscoverySpiAdapter extends GridSpiAdapter implements Grid
     protected volatile long gridStartTime;
 
     /** Marshaller. */
-    protected final GridMarshaller marsh = new GridJdkMarshaller();
+    protected final GridMarshaller marsh = new IgniteJdkMarshaller();
 
     /** Statistics. */
     protected final GridTcpDiscoveryStatistics stats = new GridTcpDiscoveryStatistics();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
index 792bdfc..eaf813f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
@@ -70,7 +70,7 @@ public class GridTcpDiscoveryMulticastIpFinder extends GridTcpDiscoveryVmIpFinde
     private static final byte[] MSG_ADDR_REQ_DATA = U.GG_HEADER;
 
     /** */
-    private static final GridMarshaller marsh = new GridJdkMarshaller();
+    private static final GridMarshaller marsh = new IgniteJdkMarshaller();
 
     /** Grid logger. */
     @IgniteLoggerResource

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
index faedd51..f3efc02 100644
--- a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
+++ b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
@@ -25,7 +25,7 @@ import static java.sql.Types.*;
  */
 public class GridJdbcUtils {
     /** Marshaller. */
-    private static final GridMarshaller MARSHALLER = new GridJdkMarshaller();
+    private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller();
 
     /**
      * Marshals task argument to byte array.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
index cc94418..b68ed28 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
@@ -25,7 +25,7 @@ public class GridExternalizableAbstractTest extends GridCommonAbstractTest {
     protected List<GridMarshaller> getMarshallers() {
         List<GridMarshaller> marshallers = new ArrayList<>();
 
-        marshallers.add(new GridJdkMarshaller());
+        marshallers.add(new IgniteJdkMarshaller());
         marshallers.add(new GridOptimizedMarshaller());
 
         return marshallers;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
index 1178e14..b5b6dbe 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
@@ -50,7 +50,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest {
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         ctx.config().setCommunicationSpi(new GridTcpCommunicationSpi());
-        ctx.config().setMarshaller(new GridJdkMarshaller());
+        ctx.config().setMarshaller(new IgniteJdkMarshaller());
 
         // Turn off peer class loading to simplify mocking.
         ctx.config().setPeerClassLoadingEnabled(false);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java
index 7a0ce0f..d076ad6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java
@@ -32,7 +32,7 @@ public class GridDeploymentManagerStopSelfTest extends GridCommonAbstractTest {
 
         GridTestKernalContext ctx = newContext();
 
-        ctx.config().setMarshaller(new GridJdkMarshaller());
+        ctx.config().setMarshaller(new IgniteJdkMarshaller());
         ctx.config().setDeploymentSpi(spi);
 
         GridResourceProcessor resProc = new GridResourceProcessor(ctx);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
index 5757f86..66c46b7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
@@ -66,7 +66,7 @@ public class GridCacheP2PUndeploySelfTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(spi);
 
-        cfg.setMarshaller(new GridJdkMarshaller());
+        cfg.setMarshaller(new IgniteJdkMarshaller());
 
         cfg.setSwapSpaceSpi(new GridFileSwapSpaceSpi());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 0f35995..b3ffa02 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
@@ -60,7 +60,7 @@ class GridMarshallerResourceBean implements Serializable {
      */
     GridMarshallerResourceBean() {
         log = new IgniteJavaLogger();
-        marshaller = new GridJdkMarshaller();
+        marshaller = new IgniteJdkMarshaller();
         mbeanSrv = ManagementFactory.getPlatformMBeanServer();
         ses = new GridTestTaskSession();
         execSvc = new GridThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
index 5920ff7..9cd31aa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
@@ -22,6 +22,6 @@ import org.gridgain.testframework.junits.common.*;
 public class GridJdkMarshallerSelfTest extends GridMarshallerAbstractTest {
     /** {@inheritDoc} */
     @Override protected GridMarshaller createMarshaller() {
-        return new GridJdkMarshaller();
+        return new IgniteJdkMarshaller();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index fe21efe..d16942c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -46,7 +46,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
     private GridCommunicationSpi commSpi;
 
     /** Marshaller used in test. */
-    private GridMarshaller marsh = new GridJdkMarshaller();
+    private GridMarshaller marsh = new IgniteJdkMarshaller();
 
     /**
      *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
index 04c368e..9fafe0d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
@@ -44,9 +44,9 @@ public class GridTcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractT
         cfg.setLocalHost("127.0.0.1");
 
         if (flag)
-            cfg.setMarshaller(new GridJdkMarshaller());
+            cfg.setMarshaller(new IgniteJdkMarshaller());
         else
-            cfg.setMarshaller(sameMarsh ? new GridJdkMarshaller() : new GridOptimizedMarshaller());
+            cfg.setMarshaller(sameMarsh ? new IgniteJdkMarshaller() : new GridOptimizedMarshaller());
 
         // Flip flag.
         flag = !flag;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cecd94bd/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 b41809e..95c9883 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
@@ -997,7 +997,7 @@ public abstract class GridAbstractTest extends TestCase {
      */
     @SuppressWarnings({"IfMayBeConditional", "deprecation"})
     protected String getDefaultCheckpointPath(GridMarshaller marshaller) {
-        if (marshaller instanceof GridJdkMarshaller)
+        if (marshaller instanceof IgniteJdkMarshaller)
             return GridSharedFsCheckpointSpi.DFLT_DIR_PATH + "/jdk/";
         else
             return GridSharedFsCheckpointSpi.DFLT_DIR_PATH + '/' + marshaller.getClass().getSimpleName() + '/';


[24/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3edf39ef/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties
new file mode 100644
index 0000000..9038b45
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.previous.properties
@@ -0,0 +1,30621 @@
+EDU.oswego.cs.dl.util.concurrent.BrokenBarrierException
+EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap
+EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap$Segment
+EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap
+EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap$BarrierLock
+EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList
+EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet
+EDU.oswego.cs.dl.util.concurrent.PropertyChangeMulticaster
+EDU.oswego.cs.dl.util.concurrent.TimeoutException
+EDU.oswego.cs.dl.util.concurrent.VetoableChangeMulticaster
+EDU.oswego.cs.dl.util.concurrent.misc.AClongRNG
+EDU.oswego.cs.dl.util.concurrent.misc.AllSynchRNG
+EDU.oswego.cs.dl.util.concurrent.misc.ChanRNG
+EDU.oswego.cs.dl.util.concurrent.misc.DirectExecutorRNG
+EDU.oswego.cs.dl.util.concurrent.misc.FIFORWlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.FifoRNG
+EDU.oswego.cs.dl.util.concurrent.misc.Fraction
+EDU.oswego.cs.dl.util.concurrent.misc.LockedSemRNG
+EDU.oswego.cs.dl.util.concurrent.misc.MutexRNG
+EDU.oswego.cs.dl.util.concurrent.misc.NoSynchRNG
+EDU.oswego.cs.dl.util.concurrent.misc.PooledExecutorRNG
+EDU.oswego.cs.dl.util.concurrent.misc.PrioritySemRNG
+EDU.oswego.cs.dl.util.concurrent.misc.PublicSynchRNG
+EDU.oswego.cs.dl.util.concurrent.misc.QueuedExecutorRNG
+EDU.oswego.cs.dl.util.concurrent.misc.RWLockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.ReaderPrefRWlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.ReentrantRWlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.RlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.SDelegatedRNG
+EDU.oswego.cs.dl.util.concurrent.misc.SemRNG
+EDU.oswego.cs.dl.util.concurrent.misc.SyncDelegatedRNG
+EDU.oswego.cs.dl.util.concurrent.misc.SynchLongRNG
+EDU.oswego.cs.dl.util.concurrent.misc.ThreadedExecutorRNG
+EDU.oswego.cs.dl.util.concurrent.misc.UpdateCommand
+EDU.oswego.cs.dl.util.concurrent.misc.WpRWlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.WpSemRNG
+antlr.ANTLRError
+antlr.ANTLRException
+antlr.CharStreamException
+antlr.CharStreamIOException
+antlr.CommonAST
+antlr.CommonASTWithHiddenTokens
+antlr.FileCopyException
+antlr.MismatchedCharException
+antlr.MismatchedTokenException
+antlr.NoViableAltException
+antlr.NoViableAltForCharException
+antlr.ParseTreeRule
+antlr.ParseTreeToken
+antlr.RecognitionException
+antlr.SemanticException
+antlr.TokenStreamException
+antlr.TokenStreamIOException
+antlr.TokenStreamRecognitionException
+antlr.TokenStreamRetryException
+antlr.debug.InputBufferEvent
+antlr.debug.MessageEvent
+antlr.debug.NewLineEvent
+antlr.debug.ParserMatchEvent
+antlr.debug.ParserTokenEvent
+antlr.debug.SemanticPredicateEvent
+antlr.debug.SyntacticPredicateEvent
+antlr.debug.TraceEvent
+antlr.debug.misc.ASTFrame
+antlr.debug.misc.JTreeASTPanel
+ch.epfl.lamp.compiler.msil.emit.ILGenerator$$anonfun$Emit$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anon$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$addPrimitive$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseILGenerator$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseOpCode$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseTypeBuilder$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$hasControlChars$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$pad$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printAssemblyBoilerplate$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printAttributes$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printHeader$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printSignature$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printSignature$2
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printTypeParams$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printTypeParams$1$$anonfun$apply$mcVI$sp$1
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseAssemblyBuilder$1
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseAssemblyBuilder$2
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$1
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$1$$anonfun$apply$mcVI$sp$1
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$2
+ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseAssemblyBuilder$1
+ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseAssemblyBuilder$2
+ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseModuleBuilder$1
+ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseModuleBuilder$2
+ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$constructorsEqual$1
+ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$methodsEqual$1
+ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$types2String$1
+ch.epfl.lamp.fjbg.JCode$OffsetTooBigException
+com.amazonaws.AmazonClientException
+com.amazonaws.AmazonServiceException
+com.amazonaws.AmazonServiceException$ErrorType
+com.amazonaws.HttpMethod
+com.amazonaws.Protocol
+com.amazonaws.auth.SignatureVersion
+com.amazonaws.auth.SigningAlgorithm
+com.amazonaws.auth.policy.Statement$Effect
+com.amazonaws.auth.policy.actions.CloudFormationActions
+com.amazonaws.auth.policy.actions.S3Actions
+com.amazonaws.auth.policy.actions.SNSActions
+com.amazonaws.auth.policy.actions.SQSActions
+com.amazonaws.auth.policy.conditions.ArnCondition$ArnComparisonType
+com.amazonaws.auth.policy.conditions.DateCondition$DateComparisonType
+com.amazonaws.auth.policy.conditions.IpAddressCondition$IpAddressComparisonType
+com.amazonaws.auth.policy.conditions.NumericCondition$NumericComparisonType
+com.amazonaws.auth.policy.conditions.StringCondition$StringComparisonType
+com.amazonaws.http.HttpMethodName
+com.amazonaws.services.autoscaling.model.AlreadyExistsException
+com.amazonaws.services.autoscaling.model.InvalidNextTokenException
+com.amazonaws.services.autoscaling.model.LifecycleState
+com.amazonaws.services.autoscaling.model.LimitExceededException
+com.amazonaws.services.autoscaling.model.ResourceInUseException
+com.amazonaws.services.autoscaling.model.ScalingActivityInProgressException
+com.amazonaws.services.autoscaling.model.ScalingActivityStatusCode
+com.amazonaws.services.cloudformation.model.AlreadyExistsException
+com.amazonaws.services.cloudformation.model.Capability
+com.amazonaws.services.cloudformation.model.InsufficientCapabilitiesException
+com.amazonaws.services.cloudformation.model.LimitExceededException
+com.amazonaws.services.cloudformation.model.OnFailure
+com.amazonaws.services.cloudformation.model.ResourceStatus
+com.amazonaws.services.cloudformation.model.StackStatus
+com.amazonaws.services.cloudfront.model.AccessDeniedException
+com.amazonaws.services.cloudfront.model.BatchTooLargeException
+com.amazonaws.services.cloudfront.model.CNAMEAlreadyExistsException
+com.amazonaws.services.cloudfront.model.CloudFrontOriginAccessIdentityAlreadyExistsException
+com.amazonaws.services.cloudfront.model.CloudFrontOriginAccessIdentityInUseException
+com.amazonaws.services.cloudfront.model.DistributionAlreadyExistsException
+com.amazonaws.services.cloudfront.model.DistributionNotDisabledException
+com.amazonaws.services.cloudfront.model.IllegalUpdateException
+com.amazonaws.services.cloudfront.model.InconsistentQuantitiesException
+com.amazonaws.services.cloudfront.model.InvalidArgumentException
+com.amazonaws.services.cloudfront.model.InvalidDefaultRootObjectException
+com.amazonaws.services.cloudfront.model.InvalidIfMatchVersionException
+com.amazonaws.services.cloudfront.model.InvalidOriginAccessIdentityException
+com.amazonaws.services.cloudfront.model.InvalidOriginException
+com.amazonaws.services.cloudfront.model.InvalidRequiredProtocolException
+com.amazonaws.services.cloudfront.model.MissingBodyException
+com.amazonaws.services.cloudfront.model.NoSuchCloudFrontOriginAccessIdentityException
+com.amazonaws.services.cloudfront.model.NoSuchDistributionException
+com.amazonaws.services.cloudfront.model.NoSuchInvalidationException
+com.amazonaws.services.cloudfront.model.NoSuchOriginException
+com.amazonaws.services.cloudfront.model.NoSuchStreamingDistributionException
+com.amazonaws.services.cloudfront.model.OriginProtocolPolicy
+com.amazonaws.services.cloudfront.model.PreconditionFailedException
+com.amazonaws.services.cloudfront.model.StreamingDistributionAlreadyExistsException
+com.amazonaws.services.cloudfront.model.StreamingDistributionNotDisabledException
+com.amazonaws.services.cloudfront.model.TooManyCacheBehaviorsException
+com.amazonaws.services.cloudfront.model.TooManyCloudFrontOriginAccessIdentitiesException
+com.amazonaws.services.cloudfront.model.TooManyDistributionCNAMEsException
+com.amazonaws.services.cloudfront.model.TooManyDistributionsException
+com.amazonaws.services.cloudfront.model.TooManyInvalidationsInProgressException
+com.amazonaws.services.cloudfront.model.TooManyOriginsException
+com.amazonaws.services.cloudfront.model.TooManyStreamingDistributionCNAMEsException
+com.amazonaws.services.cloudfront.model.TooManyStreamingDistributionsException
+com.amazonaws.services.cloudfront.model.TooManyTrustedSignersException
+com.amazonaws.services.cloudfront.model.TrustedSignerDoesNotExistException
+com.amazonaws.services.cloudfront.model.ViewerProtocolPolicy
+com.amazonaws.services.cloudfront_2012_03_15.model.AccessDeniedException
+com.amazonaws.services.cloudfront_2012_03_15.model.BatchTooLargeException
+com.amazonaws.services.cloudfront_2012_03_15.model.CNAMEAlreadyExistsException
+com.amazonaws.services.cloudfront_2012_03_15.model.CloudFrontOriginAccessIdentityAlreadyExistsException
+com.amazonaws.services.cloudfront_2012_03_15.model.CloudFrontOriginAccessIdentityInUseException
+com.amazonaws.services.cloudfront_2012_03_15.model.DistributionAlreadyExistsException
+com.amazonaws.services.cloudfront_2012_03_15.model.DistributionNotDisabledException
+com.amazonaws.services.cloudfront_2012_03_15.model.IllegalUpdateException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidArgumentException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidDefaultRootObjectException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidIfMatchVersionException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidOriginAccessIdentityException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidOriginException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidRequiredProtocolException
+com.amazonaws.services.cloudfront_2012_03_15.model.MissingBodyException
+com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchCloudFrontOriginAccessIdentityException
+com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchDistributionException
+com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchInvalidationException
+com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchStreamingDistributionException
+com.amazonaws.services.cloudfront_2012_03_15.model.OriginProtocolPolicy
+com.amazonaws.services.cloudfront_2012_03_15.model.PreconditionFailedException
+com.amazonaws.services.cloudfront_2012_03_15.model.StreamingDistributionAlreadyExistsException
+com.amazonaws.services.cloudfront_2012_03_15.model.StreamingDistributionNotDisabledException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyCloudFrontOriginAccessIdentitiesException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyDistributionCNAMEsException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyDistributionsException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyInvalidationsInProgressException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyStreamingDistributionCNAMEsException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyStreamingDistributionsException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyTrustedSignersException
+com.amazonaws.services.cloudfront_2012_03_15.model.TrustedSignerDoesNotExistException
+com.amazonaws.services.cloudsearch.model.BaseException
+com.amazonaws.services.cloudsearch.model.IndexFieldType
+com.amazonaws.services.cloudsearch.model.InternalException
+com.amazonaws.services.cloudsearch.model.InvalidTypeException
+com.amazonaws.services.cloudsearch.model.LimitExceededException
+com.amazonaws.services.cloudsearch.model.OptionState
+com.amazonaws.services.cloudsearch.model.ResourceNotFoundException
+com.amazonaws.services.cloudsearch.model.SearchInstanceType
+com.amazonaws.services.cloudsearch.model.SourceDataFunction
+com.amazonaws.services.cloudwatch.model.ComparisonOperator
+com.amazonaws.services.cloudwatch.model.HistoryItemType
+com.amazonaws.services.cloudwatch.model.InternalServiceException
+com.amazonaws.services.cloudwatch.model.InvalidFormatException
+com.amazonaws.services.cloudwatch.model.InvalidNextTokenException
+com.amazonaws.services.cloudwatch.model.InvalidParameterCombinationException
+com.amazonaws.services.cloudwatch.model.InvalidParameterValueException
+com.amazonaws.services.cloudwatch.model.LimitExceededException
+com.amazonaws.services.cloudwatch.model.MissingRequiredParameterException
+com.amazonaws.services.cloudwatch.model.ResourceNotFoundException
+com.amazonaws.services.cloudwatch.model.StandardUnit
+com.amazonaws.services.cloudwatch.model.StateValue
+com.amazonaws.services.cloudwatch.model.Statistic
+com.amazonaws.services.dynamodb.datamodeling.DynamoDBMapperConfig$ConsistentReads
+com.amazonaws.services.dynamodb.datamodeling.DynamoDBMapperConfig$SaveBehavior
+com.amazonaws.services.dynamodb.datamodeling.DynamoDBMappingException
+com.amazonaws.services.dynamodb.model.AttributeAction
+com.amazonaws.services.dynamodb.model.ComparisonOperator
+com.amazonaws.services.dynamodb.model.ConditionalCheckFailedException
+com.amazonaws.services.dynamodb.model.InternalServerErrorException
+com.amazonaws.services.dynamodb.model.LimitExceededException
+com.amazonaws.services.dynamodb.model.ProvisionedThroughputExceededException
+com.amazonaws.services.dynamodb.model.ResourceInUseException
+com.amazonaws.services.dynamodb.model.ResourceNotFoundException
+com.amazonaws.services.dynamodb.model.ReturnValue
+com.amazonaws.services.dynamodb.model.ScalarAttributeType
+com.amazonaws.services.dynamodb.model.TableStatus
+com.amazonaws.services.ec2.model.ContainerFormat
+com.amazonaws.services.ec2.model.DiskImageFormat
+com.amazonaws.services.ec2.model.DomainType
+com.amazonaws.services.ec2.model.ExportEnvironment
+com.amazonaws.services.ec2.model.HypervisorType
+com.amazonaws.services.ec2.model.ImageState
+com.amazonaws.services.ec2.model.InstanceAttributeName
+com.amazonaws.services.ec2.model.InstanceStateName
+com.amazonaws.services.ec2.model.InstanceType
+com.amazonaws.services.ec2.model.PlacementGroupState
+com.amazonaws.services.ec2.model.PlacementStrategy
+com.amazonaws.services.ec2.model.ResourceType
+com.amazonaws.services.ec2.model.RuleAction
+com.amazonaws.services.ec2.model.SnapshotAttributeName
+com.amazonaws.services.ec2.model.SnapshotState
+com.amazonaws.services.ec2.model.SpotInstanceType
+com.amazonaws.services.ec2.model.VirtualizationType
+com.amazonaws.services.ec2.model.VolumeAttachmentState
+com.amazonaws.services.ec2.model.VolumeAttributeName
+com.amazonaws.services.ec2.model.VolumeState
+com.amazonaws.services.ec2.model.VolumeType
+com.amazonaws.services.elasticache.model.AuthorizationAlreadyExistsException
+com.amazonaws.services.elasticache.model.AuthorizationNotFoundException
+com.amazonaws.services.elasticache.model.CacheClusterAlreadyExistsException
+com.amazonaws.services.elasticache.model.CacheClusterNotFoundException
+com.amazonaws.services.elasticache.model.CacheParameterGroupAlreadyExistsException
+com.amazonaws.services.elasticache.model.CacheParameterGroupNotFoundException
+com.amazonaws.services.elasticache.model.CacheParameterGroupQuotaExceededException
+com.amazonaws.services.elasticache.model.CacheSecurityGroupAlreadyExistsException
+com.amazonaws.services.elasticache.model.CacheSecurityGroupNotFoundException
+com.amazonaws.services.elasticache.model.CacheSecurityGroupQuotaExceededException
+com.amazonaws.services.elasticache.model.ClusterQuotaForCustomerExceededException
+com.amazonaws.services.elasticache.model.InsufficientCacheClusterCapacityException
+com.amazonaws.services.elasticache.model.InvalidCacheClusterStateException
+com.amazonaws.services.elasticache.model.InvalidCacheParameterGroupStateException
+com.amazonaws.services.elasticache.model.InvalidCacheSecurityGroupStateException
+com.amazonaws.services.elasticache.model.InvalidParameterCombinationException
+com.amazonaws.services.elasticache.model.InvalidParameterValueException
+com.amazonaws.services.elasticache.model.NodeQuotaForClusterExceededException
+com.amazonaws.services.elasticache.model.NodeQuotaForCustomerExceededException
+com.amazonaws.services.elasticache.model.ReservedCacheNodeAlreadyExistsException
+com.amazonaws.services.elasticache.model.ReservedCacheNodeNotFoundException
+com.amazonaws.services.elasticache.model.ReservedCacheNodeQuotaExceededException
+com.amazonaws.services.elasticache.model.ReservedCacheNodesOfferingNotFoundException
+com.amazonaws.services.elasticache.model.SourceType
+com.amazonaws.services.elasticbeanstalk.model.ConfigurationDeploymentStatus
+com.amazonaws.services.elasticbeanstalk.model.ConfigurationOptionValueType
+com.amazonaws.services.elasticbeanstalk.model.EnvironmentHealth
+com.amazonaws.services.elasticbeanstalk.model.EnvironmentInfoType
+com.amazonaws.services.elasticbeanstalk.model.EnvironmentStatus
+com.amazonaws.services.elasticbeanstalk.model.EventSeverity
+com.amazonaws.services.elasticbeanstalk.model.S3SubscriptionRequiredException
+com.amazonaws.services.elasticbeanstalk.model.SourceBundleDeletionException
+com.amazonaws.services.elasticbeanstalk.model.TooManyApplicationVersionsException
+com.amazonaws.services.elasticbeanstalk.model.TooManyApplicationsException
+com.amazonaws.services.elasticbeanstalk.model.TooManyBucketsException
+com.amazonaws.services.elasticbeanstalk.model.TooManyConfigurationTemplatesException
+com.amazonaws.services.elasticbeanstalk.model.TooManyEnvironmentsException
+com.amazonaws.services.elasticbeanstalk.model.ValidationSeverity
+com.amazonaws.services.elasticloadbalancing.model.CertificateNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.DuplicateListenerException
+com.amazonaws.services.elasticloadbalancing.model.DuplicateLoadBalancerNameException
+com.amazonaws.services.elasticloadbalancing.model.DuplicatePolicyNameException
+com.amazonaws.services.elasticloadbalancing.model.InvalidConfigurationRequestException
+com.amazonaws.services.elasticloadbalancing.model.InvalidInstanceException
+com.amazonaws.services.elasticloadbalancing.model.InvalidSchemeException
+com.amazonaws.services.elasticloadbalancing.model.InvalidSecurityGroupException
+com.amazonaws.services.elasticloadbalancing.model.InvalidSubnetException
+com.amazonaws.services.elasticloadbalancing.model.ListenerNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.LoadBalancerNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.PolicyNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.PolicyTypeNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.SubnetNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.TooManyLoadBalancersException
+com.amazonaws.services.elasticloadbalancing.model.TooManyPoliciesException
+com.amazonaws.services.elasticmapreduce.model.ActionOnFailure
+com.amazonaws.services.elasticmapreduce.model.InstanceGroupState
+com.amazonaws.services.elasticmapreduce.model.InstanceRoleType
+com.amazonaws.services.elasticmapreduce.model.InternalServerErrorException
+com.amazonaws.services.elasticmapreduce.model.JobFlowExecutionState
+com.amazonaws.services.elasticmapreduce.model.MarketType
+com.amazonaws.services.elasticmapreduce.model.StepExecutionState
+com.amazonaws.services.elasticmapreduce.util.BootstrapActions$ConfigFile
+com.amazonaws.services.elasticmapreduce.util.BootstrapActions$Daemon
+com.amazonaws.services.elasticmapreduce.util.ResizeJobFlowStep$OnArrested
+com.amazonaws.services.elasticmapreduce.util.ResizeJobFlowStep$OnFailure
+com.amazonaws.services.elasticmapreduce.util.StepFactory$HiveVersion
+com.amazonaws.services.glacier.model.ActionCode
+com.amazonaws.services.glacier.model.InvalidParameterValueException
+com.amazonaws.services.glacier.model.LimitExceededException
+com.amazonaws.services.glacier.model.MissingParameterValueException
+com.amazonaws.services.glacier.model.RequestTimeoutException
+com.amazonaws.services.glacier.model.ResourceNotFoundException
+com.amazonaws.services.glacier.model.ServiceUnavailableException
+com.amazonaws.services.glacier.model.StatusCode
+com.amazonaws.services.identitymanagement.model.AssignmentStatusType
+com.amazonaws.services.identitymanagement.model.DeleteConflictException
+com.amazonaws.services.identitymanagement.model.DuplicateCertificateException
+com.amazonaws.services.identitymanagement.model.EntityAlreadyExistsException
+com.amazonaws.services.identitymanagement.model.EntityTemporarilyUnmodifiableException
+com.amazonaws.services.identitymanagement.model.InvalidAuthenticationCodeException
+com.amazonaws.services.identitymanagement.model.InvalidCertificateException
+com.amazonaws.services.identitymanagement.model.InvalidUserTypeException
+com.amazonaws.services.identitymanagement.model.KeyPairMismatchException
+com.amazonaws.services.identitymanagement.model.LimitExceededException
+com.amazonaws.services.identitymanagement.model.MalformedCertificateException
+com.amazonaws.services.identitymanagement.model.MalformedPolicyDocumentException
+com.amazonaws.services.identitymanagement.model.NoSuchEntityException
+com.amazonaws.services.identitymanagement.model.PasswordPolicyViolationException
+com.amazonaws.services.identitymanagement.model.StatusType
+com.amazonaws.services.identitymanagement.model.SummaryKeyType
+com.amazonaws.services.importexport.model.BucketPermissionException
+com.amazonaws.services.importexport.model.CanceledJobIdException
+com.amazonaws.services.importexport.model.ExpiredJobIdException
+com.amazonaws.services.importexport.model.InvalidAccessKeyIdException
+com.amazonaws.services.importexport.model.InvalidAddressException
+com.amazonaws.services.importexport.model.InvalidCustomsException
+com.amazonaws.services.importexport.model.InvalidFileSystemException
+com.amazonaws.services.importexport.model.InvalidJobIdException
+com.amazonaws.services.importexport.model.InvalidManifestFieldException
+com.amazonaws.services.importexport.model.InvalidParameterException
+com.amazonaws.services.importexport.model.JobType
+com.amazonaws.services.importexport.model.MalformedManifestException
+com.amazonaws.services.importexport.model.MissingCustomsException
+com.amazonaws.services.importexport.model.MissingManifestFieldException
+com.amazonaws.services.importexport.model.MissingParameterException
+com.amazonaws.services.importexport.model.MultipleRegionsException
+com.amazonaws.services.importexport.model.NoSuchBucketException
+com.amazonaws.services.importexport.model.UnableToCancelJobIdException
+com.amazonaws.services.rds.model.ApplyMethod
+com.amazonaws.services.rds.model.AuthorizationAlreadyExistsException
+com.amazonaws.services.rds.model.AuthorizationNotFoundException
+com.amazonaws.services.rds.model.AuthorizationQuotaExceededException
+com.amazonaws.services.rds.model.DBInstanceAlreadyExistsException
+com.amazonaws.services.rds.model.DBInstanceNotFoundException
+com.amazonaws.services.rds.model.DBParameterGroupAlreadyExistsException
+com.amazonaws.services.rds.model.DBParameterGroupNotFoundException
+com.amazonaws.services.rds.model.DBParameterGroupQuotaExceededException
+com.amazonaws.services.rds.model.DBSecurityGroupAlreadyExistsException
+com.amazonaws.services.rds.model.DBSecurityGroupNotFoundException
+com.amazonaws.services.rds.model.DBSecurityGroupQuotaExceededException
+com.amazonaws.services.rds.model.DBSnapshotAlreadyExistsException
+com.amazonaws.services.rds.model.DBSnapshotNotFoundException
+com.amazonaws.services.rds.model.DBSubnetGroupAlreadyExistsException
+com.amazonaws.services.rds.model.DBSubnetGroupListDoesNotCoverAllAzException
+com.amazonaws.services.rds.model.DBSubnetGroupNotFoundException
+com.amazonaws.services.rds.model.DBSubnetGroupQuotaExceededException
+com.amazonaws.services.rds.model.DBSubnetQuotaExceededException
+com.amazonaws.services.rds.model.InstanceQuotaExceededException
+com.amazonaws.services.rds.model.InsufficientDBInstanceCapacityException
+com.amazonaws.services.rds.model.InvalidDBInstanceStateException
+com.amazonaws.services.rds.model.InvalidDBParameterGroupStateException
+com.amazonaws.services.rds.model.InvalidDBSecurityGroupStateException
+com.amazonaws.services.rds.model.InvalidDBSnapshotStateException
+com.amazonaws.services.rds.model.InvalidDBSubnetGroupStateException
+com.amazonaws.services.rds.model.InvalidDBSubnetStateException
+com.amazonaws.services.rds.model.InvalidOptionGroupStateException
+com.amazonaws.services.rds.model.InvalidRestoreException
+com.amazonaws.services.rds.model.InvalidSubnetException
+com.amazonaws.services.rds.model.InvalidVPCNetworkStateException
+com.amazonaws.services.rds.model.OptionGroupAlreadyExistsException
+com.amazonaws.services.rds.model.OptionGroupNotFoundException
+com.amazonaws.services.rds.model.OptionGroupQuotaExceededException
+com.amazonaws.services.rds.model.PointInTimeRestoreNotEnabledException
+com.amazonaws.services.rds.model.ReservedDBInstanceAlreadyExistsException
+com.amazonaws.services.rds.model.ReservedDBInstanceNotFoundException
+com.amazonaws.services.rds.model.ReservedDBInstanceQuotaExceededException
+com.amazonaws.services.rds.model.ReservedDBInstancesOfferingNotFoundException
+com.amazonaws.services.rds.model.SnapshotQuotaExceededException
+com.amazonaws.services.rds.model.SourceType
+com.amazonaws.services.rds.model.StorageQuotaExceededException
+com.amazonaws.services.rds.model.SubnetAlreadyInUseException
+com.amazonaws.services.route53.model.ChangeAction
+com.amazonaws.services.route53.model.ChangeStatus
+com.amazonaws.services.route53.model.DelegationSetNotAvailableException
+com.amazonaws.services.route53.model.HostedZoneAlreadyExistsException
+com.amazonaws.services.route53.model.HostedZoneNotEmptyException
+com.amazonaws.services.route53.model.InvalidChangeBatchException
+com.amazonaws.services.route53.model.InvalidDomainNameException
+com.amazonaws.services.route53.model.InvalidInputException
+com.amazonaws.services.route53.model.NoSuchChangeException
+com.amazonaws.services.route53.model.NoSuchHostedZoneException
+com.amazonaws.services.route53.model.RRType
+com.amazonaws.services.route53.model.ResourceRecordSetRegion
+com.amazonaws.services.route53.model.TooManyHostedZonesException
+com.amazonaws.services.s3.model.AccessControlList
+com.amazonaws.services.s3.model.AmazonS3Exception
+com.amazonaws.services.s3.model.CORSRule$AllowedMethods
+com.amazonaws.services.s3.model.CannedAccessControlList
+com.amazonaws.services.s3.model.CryptoStorageMode
+com.amazonaws.services.s3.model.GroupGrantee
+com.amazonaws.services.s3.model.MultiObjectDeleteException
+com.amazonaws.services.s3.model.Owner
+com.amazonaws.services.s3.model.Permission
+com.amazonaws.services.s3.model.Region
+com.amazonaws.services.s3.model.StorageClass
+com.amazonaws.services.s3.transfer.Transfer$TransferState
+com.amazonaws.services.securitytoken.model.MalformedPolicyDocumentException
+com.amazonaws.services.securitytoken.model.PackedPolicyTooLargeException
+com.amazonaws.services.simpledb.model.AttributeDoesNotExistException
+com.amazonaws.services.simpledb.model.DuplicateItemNameException
+com.amazonaws.services.simpledb.model.InvalidNextTokenException
+com.amazonaws.services.simpledb.model.InvalidNumberPredicatesException
+com.amazonaws.services.simpledb.model.InvalidNumberValueTestsException
+com.amazonaws.services.simpledb.model.InvalidParameterValueException
+com.amazonaws.services.simpledb.model.InvalidQueryExpressionException
+com.amazonaws.services.simpledb.model.MissingParameterException
+com.amazonaws.services.simpledb.model.NoSuchDomainException
+com.amazonaws.services.simpledb.model.NumberDomainAttributesExceededException
+com.amazonaws.services.simpledb.model.NumberDomainBytesExceededException
+com.amazonaws.services.simpledb.model.NumberDomainsExceededException
+com.amazonaws.services.simpledb.model.NumberItemAttributesExceededException
+com.amazonaws.services.simpledb.model.NumberSubmittedAttributesExceededException
+com.amazonaws.services.simpledb.model.NumberSubmittedItemsExceededException
+com.amazonaws.services.simpledb.model.RequestTimeoutException
+com.amazonaws.services.simpledb.model.TooManyRequestedAttributesException
+com.amazonaws.services.simpleemail.model.IdentityType
+com.amazonaws.services.simpleemail.model.MessageRejectedException
+com.amazonaws.services.simpleemail.model.NotificationType
+com.amazonaws.services.simpleemail.model.VerificationStatus
+com.amazonaws.services.simpleworkflow.flow.ActivityFailureException
+com.amazonaws.services.simpleworkflow.flow.ActivityTaskFailedException
+com.amazonaws.services.simpleworkflow.flow.ActivityTaskTimedOutException
+com.amazonaws.services.simpleworkflow.flow.ChildWorkflowFailedException
+com.amazonaws.services.simpleworkflow.flow.ChildWorkflowTerminatedException
+com.amazonaws.services.simpleworkflow.flow.ChildWorkflowTimedOutException
+com.amazonaws.services.simpleworkflow.flow.DataConverterException
+com.amazonaws.services.simpleworkflow.flow.ScheduleActivityTaskFailedException
+com.amazonaws.services.simpleworkflow.flow.SignalExternalWorkflowException
+com.amazonaws.services.simpleworkflow.flow.StartChildWorkflowFailedException
+com.amazonaws.services.simpleworkflow.flow.StartTimerFailedException
+com.amazonaws.services.simpleworkflow.flow.WorkflowException
+com.amazonaws.services.simpleworkflow.flow.common.FlowValueConstraint
+com.amazonaws.services.simpleworkflow.flow.core.TryCatchFinally$State
+com.amazonaws.services.simpleworkflow.flow.worker.DecisionState
+com.amazonaws.services.simpleworkflow.flow.worker.DecisionTarget
+com.amazonaws.services.simpleworkflow.model.ActivityTaskTimeoutType
+com.amazonaws.services.simpleworkflow.model.CancelTimerFailedCause
+com.amazonaws.services.simpleworkflow.model.CancelWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.ChildPolicy
+com.amazonaws.services.simpleworkflow.model.CloseStatus
+com.amazonaws.services.simpleworkflow.model.CompleteWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.ContinueAsNewWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.DecisionTaskTimeoutType
+com.amazonaws.services.simpleworkflow.model.DecisionType
+com.amazonaws.services.simpleworkflow.model.DefaultUndefinedException
+com.amazonaws.services.simpleworkflow.model.DomainAlreadyExistsException
+com.amazonaws.services.simpleworkflow.model.DomainDeprecatedException
+com.amazonaws.services.simpleworkflow.model.EventType
+com.amazonaws.services.simpleworkflow.model.ExecutionStatus
+com.amazonaws.services.simpleworkflow.model.FailWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.LimitExceededException
+com.amazonaws.services.simpleworkflow.model.OperationNotPermittedException
+com.amazonaws.services.simpleworkflow.model.PredefinedDuration
+com.amazonaws.services.simpleworkflow.model.RegistrationStatus
+com.amazonaws.services.simpleworkflow.model.RequestCancelActivityTaskFailedCause
+com.amazonaws.services.simpleworkflow.model.RequestCancelExternalWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.ScheduleActivityTaskFailedCause
+com.amazonaws.services.simpleworkflow.model.SignalExternalWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.StartChildWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.StartTimerFailedCause
+com.amazonaws.services.simpleworkflow.model.TypeAlreadyExistsException
+com.amazonaws.services.simpleworkflow.model.TypeDeprecatedException
+com.amazonaws.services.simpleworkflow.model.UnknownResourceException
+com.amazonaws.services.simpleworkflow.model.WorkflowExecutionAlreadyStartedException
+com.amazonaws.services.simpleworkflow.model.WorkflowExecutionCancelRequestedCause
+com.amazonaws.services.simpleworkflow.model.WorkflowExecutionTerminatedCause
+com.amazonaws.services.simpleworkflow.model.WorkflowExecutionTimeoutType
+com.amazonaws.services.sns.model.AuthorizationErrorException
+com.amazonaws.services.sns.model.InternalErrorException
+com.amazonaws.services.sns.model.InvalidParameterException
+com.amazonaws.services.sns.model.NotFoundException
+com.amazonaws.services.sns.model.SubscriptionLimitExceededException
+com.amazonaws.services.sns.model.TopicLimitExceededException
+com.amazonaws.services.sqs.model.BatchEntryIdsNotDistinctException
+com.amazonaws.services.sqs.model.BatchRequestTooLongException
+com.amazonaws.services.sqs.model.EmptyBatchRequestException
+com.amazonaws.services.sqs.model.InvalidAttributeNameException
+com.amazonaws.services.sqs.model.InvalidBatchEntryIdException
+com.amazonaws.services.sqs.model.InvalidIdFormatException
+com.amazonaws.services.sqs.model.InvalidMessageContentsException
+com.amazonaws.services.sqs.model.MessageNotInflightException
+com.amazonaws.services.sqs.model.OverLimitException
+com.amazonaws.services.sqs.model.QueueAttributeName
+com.amazonaws.services.sqs.model.QueueDeletedRecentlyException
+com.amazonaws.services.sqs.model.QueueDoesNotExistException
+com.amazonaws.services.sqs.model.QueueNameExistsException
+com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException
+com.amazonaws.services.sqs.model.TooManyEntriesInBatchRequestException
+com.amazonaws.services.storagegateway.model.BandwidthType
+com.amazonaws.services.storagegateway.model.DiskAllocationType
+com.amazonaws.services.storagegateway.model.ErrorCode
+com.amazonaws.services.storagegateway.model.GatewayState
+com.amazonaws.services.storagegateway.model.GatewayTimezone
+com.amazonaws.services.storagegateway.model.InternalServerErrorException
+com.amazonaws.services.storagegateway.model.InvalidGatewayRequestException
+com.amazonaws.services.storagegateway.model.VolumeStatus
+com.amazonaws.services.storagegateway.model.VolumeType
+com.amazonaws.util.AWSRequestMetrics$Field
+com.amazonaws.util.json.JSONException
+com.beust.jcommander.MissingCommandException
+com.beust.jcommander.ParameterException
+com.enterprisedt.BaseIOException
+com.enterprisedt.net.ftp.FTPException
+com.enterprisedt.net.ftp.FTPTransferCancelledException
+com.google.common.base.Absent
+com.google.common.base.AbstractIterator$State
+com.google.common.base.CaseFormat$1
+com.google.common.base.CaseFormat$2
+com.google.common.base.CaseFormat$3
+com.google.common.base.CaseFormat$4
+com.google.common.base.CaseFormat$5
+com.google.common.base.Enums$ValueOfFunction
+com.google.common.base.Equivalence$Equals
+com.google.common.base.Equivalence$EquivalentToPredicate
+com.google.common.base.Equivalence$Identity
+com.google.common.base.Equivalence$Wrapper
+com.google.common.base.FunctionalEquivalence
+com.google.common.base.Functions$ConstantFunction
+com.google.common.base.Functions$ForMapWithDefault
+com.google.common.base.Functions$FunctionComposition
+com.google.common.base.Functions$FunctionForMapNoDefault
+com.google.common.base.Functions$IdentityFunction
+com.google.common.base.Functions$PredicateFunction
+com.google.common.base.Functions$SupplierFunction
+com.google.common.base.Functions$ToStringFunction
+com.google.common.base.PairwiseEquivalence
+com.google.common.base.Predicates$AndPredicate
+com.google.common.base.Predicates$AssignableFromPredicate
+com.google.common.base.Predicates$CompositionPredicate
+com.google.common.base.Predicates$ContainsPatternPredicate
+com.google.common.base.Predicates$InPredicate
+com.google.common.base.Predicates$InstanceOfPredicate
+com.google.common.base.Predicates$IsEqualToPredicate
+com.google.common.base.Predicates$NotPredicate
+com.google.common.base.Predicates$ObjectPredicate$1
+com.google.common.base.Predicates$ObjectPredicate$2
+com.google.common.base.Predicates$ObjectPredicate$3
+com.google.common.base.Predicates$ObjectPredicate$4
+com.google.common.base.Predicates$OrPredicate
+com.google.common.base.Present
+com.google.common.base.Suppliers$ExpiringMemoizingSupplier
+com.google.common.base.Suppliers$MemoizingSupplier
+com.google.common.base.Suppliers$SupplierComposition
+com.google.common.base.Suppliers$SupplierFunction
+com.google.common.base.Suppliers$SupplierOfInstance
+com.google.common.base.Suppliers$ThreadSafeSupplier
+com.google.common.base.internal.Finalizer$ShutDown
+com.google.common.cache.CacheBuilder$NullListener
+com.google.common.cache.CacheBuilder$OneWeigher
+com.google.common.cache.CacheLoader$FunctionToCacheLoader
+com.google.common.cache.CacheLoader$InvalidCacheLoadException
+com.google.common.cache.CacheLoader$SupplierToCacheLoader
+com.google.common.cache.CacheLoader$UnsupportedLoadingOperationException
+com.google.common.cache.LocalCache$EntryFactory$1
+com.google.common.cache.LocalCache$EntryFactory$2
+com.google.common.cache.LocalCache$EntryFactory$3
+com.google.common.cache.LocalCache$EntryFactory$4
+com.google.common.cache.LocalCache$EntryFactory$5
+com.google.common.cache.LocalCache$EntryFactory$6
+com.google.common.cache.LocalCache$EntryFactory$7
+com.google.common.cache.LocalCache$EntryFactory$8
+com.google.common.cache.LocalCache$LoadingSerializationProxy
+com.google.common.cache.LocalCache$LocalLoadingCache
+com.google.common.cache.LocalCache$LocalManualCache
+com.google.common.cache.LocalCache$ManualSerializationProxy
+com.google.common.cache.LocalCache$NullEntry
+com.google.common.cache.LocalCache$Segment
+com.google.common.cache.LocalCache$Strength$1
+com.google.common.cache.LocalCache$Strength$2
+com.google.common.cache.LocalCache$Strength$3
+com.google.common.cache.LongAddables$PureJavaLongAddable
+com.google.common.cache.LongAdder
+com.google.common.cache.RemovalCause$1
+com.google.common.cache.RemovalCause$2
+com.google.common.cache.RemovalCause$3
+com.google.common.cache.RemovalCause$4
+com.google.common.cache.RemovalCause$5
+com.google.common.collect.AbstractBiMap$Inverse
+com.google.common.collect.AbstractIterator$State
+com.google.common.collect.AllEqualOrdering
+com.google.common.collect.ArrayListMultimap
+com.google.common.collect.ArrayTable
+com.google.common.collect.BoundType$1
+com.google.common.collect.BoundType$2
+com.google.common.collect.ByFunctionOrdering
+com.google.common.collect.CartesianList$1
+com.google.common.collect.ComparatorOrdering
+com.google.common.collect.CompoundOrdering
+com.google.common.collect.ComputationException
+com.google.common.collect.ComputingConcurrentHashMap
+com.google.common.collect.ComputingConcurrentHashMap$ComputingSegment
+com.google.common.collect.ComputingConcurrentHashMap$ComputingSerializationProxy
+com.google.common.collect.ConcurrentHashMultiset
+com.google.common.collect.Constraints$NotNullConstraint
+com.google.common.collect.Count
+com.google.common.collect.Cut$AboveAll
+com.google.common.collect.Cut$AboveValue
+com.google.common.collect.Cut$BelowAll
+com.google.common.collect.Cut$BelowValue
+com.google.common.collect.DescendingImmutableSortedMultiset
+com.google.common.collect.DescendingImmutableSortedMultiset$1
+com.google.common.collect.DescendingImmutableSortedSet
+com.google.common.collect.DiscreteDomain$BigIntegerDomain
+com.google.common.collect.DiscreteDomain$IntegerDomain
+com.google.common.collect.DiscreteDomain$LongDomain
+com.google.common.collect.EmptyContiguousSet
+com.google.common.collect.EmptyContiguousSet$SerializedForm
+com.google.common.collect.EmptyImmutableBiMap
+com.google.common.collect.EmptyImmutableList
+com.google.common.collect.EmptyImmutableListMultimap
+com.google.common.collect.EmptyImmutableMultiset
+com.google.common.collect.EmptyImmutableSet
+com.google.common.collect.EmptyImmutableSetMultimap
+com.google.common.collect.EmptyImmutableSortedMap
+com.google.common.collect.EmptyImmutableSortedMultiset
+com.google.common.collect.EmptyImmutableSortedSet
+com.google.common.collect.EnumBiMap
+com.google.common.collect.EnumHashBiMap
+com.google.common.collect.EnumMultiset
+com.google.common.collect.ExplicitOrdering
+com.google.common.collect.GeneralRange
+com.google.common.collect.GenericMapMaker$NullListener
+com.google.common.collect.HashBasedTable
+com.google.common.collect.HashBasedTable$Factory
+com.google.common.collect.HashBiMap
+com.google.common.collect.HashBiMap$Inverse
+com.google.common.collect.HashBiMap$InverseSerializedForm
+com.google.common.collect.HashMultimap
+com.google.common.collect.HashMultiset
+com.google.common.collect.ImmutableAsList$SerializedForm
+com.google.common.collect.ImmutableBiMap$SerializedForm
+com.google.common.collect.ImmutableCollection$ArrayImmutableCollection
+com.google.common.collect.ImmutableCollection$EmptyImmutableCollection
+com.google.common.collect.ImmutableCollection$SerializedForm
+com.google.common.collect.ImmutableEntry
+com.google.common.collect.ImmutableEnumMap
+com.google.common.collect.ImmutableEnumMap$1
+com.google.common.collect.ImmutableEnumMap$2
+com.google.common.collect.ImmutableEnumMap$EnumSerializedForm
+com.google.common.collect.ImmutableEnumSet
+com.google.common.collect.ImmutableEnumSet$EnumSerializedForm
+com.google.common.collect.ImmutableList$ReverseImmutableList
+com.google.common.collect.ImmutableList$SerializedForm
+com.google.common.collect.ImmutableList$SubList
+com.google.common.collect.ImmutableListMultimap
+com.google.common.collect.ImmutableMap$1MapViewOfValuesAsSingletonSets
+com.google.common.collect.ImmutableMap$1MapViewOfValuesAsSingletonSets$1
+com.google.common.collect.ImmutableMap$SerializedForm
+com.google.common.collect.ImmutableMapEntrySet$EntrySetSerializedForm
+com.google.common.collect.ImmutableMapKeySet
+com.google.common.collect.ImmutableMapKeySet$1
+com.google.common.collect.ImmutableMapKeySet$KeySetSerializedForm
+com.google.common.collect.ImmutableMapValues
+com.google.common.collect.ImmutableMapValues$1
+com.google.common.collect.ImmutableMapValues$SerializedForm
+com.google.common.collect.ImmutableMultimap$BuilderMultimap
+com.google.common.collect.ImmutableMultimap$EntryCollection
+com.google.common.collect.ImmutableMultimap$Keys
+com.google.common.collect.ImmutableMultimap$Keys$KeysEntrySet
+com.google.common.collect.ImmutableMultimap$Keys$KeysEntrySet$1
+com.google.common.collect.ImmutableMultimap$Values
+com.google.common.collect.ImmutableMultiset$EntrySetSerializedForm
+com.google.common.collect.ImmutableMultiset$SerializedForm
+com.google.common.collect.ImmutableRangeMap$1
+com.google.common.collect.ImmutableRangeSet
+com.google.common.collect.ImmutableRangeSet$1
+com.google.common.collect.ImmutableRangeSet$AsSet
+com.google.common.collect.ImmutableRangeSet$AsSetSerializedForm
+com.google.common.collect.ImmutableRangeSet$ComplementRanges
+com.google.common.collect.ImmutableRangeSet$SerializedForm
+com.google.common.collect.ImmutableSet$SerializedForm
+com.google.common.collect.ImmutableSetMultimap
+com.google.common.collect.ImmutableSetMultimap$BuilderMultimap
+com.google.common.collect.ImmutableSortedAsList
+com.google.common.collect.ImmutableSortedMap$SerializedForm
+com.google.common.collect.ImmutableSortedMultiset$SerializedForm
+com.google.common.collect.ImmutableSortedSet$SerializedForm
+com.google.common.collect.Interners$WeakInterner$Dummy
+com.google.common.collect.LexicographicalOrdering
+com.google.common.collect.LinkedHashMultimap
+com.google.common.collect.LinkedHashMultiset
+com.google.common.collect.LinkedListMultimap
+com.google.common.collect.Lists$OnePlusArrayList
+com.google.common.collect.Lists$StringAsImmutableList
+com.google.common.collect.Lists$TransformingRandomAccessList
+com.google.common.collect.Lists$TransformingSequentialList
+com.google.common.collect.Lists$TwoPlusArrayList
+com.google.common.collect.MapConstraints$ConstrainedListMultimap
+com.google.common.collect.MapConstraints$ConstrainedMultimap
+com.google.common.collect.MapConstraints$ConstrainedSetMultimap
+com.google.common.collect.MapConstraints$ConstrainedSortedSetMultimap
+com.google.common.collect.MapConstraints$NotNullMapConstraint
+com.google.common.collect.MapMaker$ComputingMapAdapter
+com.google.common.collect.MapMaker$NullComputingConcurrentMap
+com.google.common.collect.MapMaker$NullConcurrentMap
+com.google.common.collect.MapMaker$RemovalCause$1
+com.google.common.collect.MapMaker$RemovalCause$2
+com.google.common.collect.MapMaker$RemovalCause$3
+com.google.common.collect.MapMaker$RemovalCause$4
+com.google.common.collect.MapMaker$RemovalCause$5
+com.google.common.collect.MapMaker$RemovalNotification
+com.google.common.collect.MapMakerInternalMap
+com.google.common.collect.MapMakerInternalMap$EntryFactory$1
+com.google.common.collect.MapMakerInternalMap$EntryFactory$2
+com.google.common.collect.MapMakerInternalMap$EntryFactory$3
+com.google.common.collect.MapMakerInternalMap$EntryFactory$4
+com.google.common.collect.MapMakerInternalMap$EntryFactory$5
+com.google.common.collect.MapMakerInternalMap$EntryFactory$6
+com.google.common.collect.MapMakerInternalMap$EntryFactory$7
+com.google.common.collect.MapMakerInternalMap$EntryFactory$8
+com.google.common.collect.MapMakerInternalMap$NullEntry
+com.google.common.collect.MapMakerInternalMap$Segment
+com.google.common.collect.MapMakerInternalMap$SerializationProxy
+com.google.common.collect.MapMakerInternalMap$Strength$1
+com.google.common.collect.MapMakerInternalMap$Strength$2
+com.google.common.collect.MapMakerInternalMap$Strength$3
+com.google.common.collect.Maps$EntryFunction$1
+com.google.common.collect.Maps$EntryFunction$2
+com.google.common.collect.Maps$UnmodifiableBiMap
+com.google.common.collect.Maps$UnmodifiableNavigableMap
+com.google.common.collect.Multimaps$CustomListMultimap
+com.google.common.collect.Multimaps$CustomMultimap
+com.google.common.collect.Multimaps$CustomSetMultimap
+com.google.common.collect.Multimaps$CustomSortedSetMultimap
+com.google.common.collect.Multimaps$MapMultimap
+com.google.common.collect.Multimaps$UnmodifiableListMultimap
+com.google.common.collect.Multimaps$UnmodifiableMultimap
+com.google.common.collect.Multimaps$UnmodifiableSetMultimap
+com.google.common.collect.Multimaps$UnmodifiableSortedSetMultimap
+com.google.common.collect.Multisets$ImmutableEntry
+com.google.common.collect.Multisets$UnmodifiableMultiset
+com.google.common.collect.NaturalOrdering
+com.google.common.collect.NullsFirstOrdering
+com.google.common.collect.NullsLastOrdering
+com.google.common.collect.Ordering$IncomparableValueException
+com.google.common.collect.Range
+com.google.common.collect.RegularContiguousSet
+com.google.common.collect.RegularContiguousSet$SerializedForm
+com.google.common.collect.RegularImmutableAsList
+com.google.common.collect.RegularImmutableBiMap
+com.google.common.collect.RegularImmutableBiMap$1
+com.google.common.collect.RegularImmutableBiMap$BiMapEntry
+com.google.common.collect.RegularImmutableBiMap$Inverse
+com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet
+com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1
+com.google.common.collect.RegularImmutableBiMap$InverseSerializedForm
+com.google.common.collect.RegularImmutableBiMap$NonTerminalBiMapEntry
+com.google.common.collect.RegularImmutableList
+com.google.common.collect.RegularImmutableMap
+com.google.common.collect.RegularImmutableMap$EntrySet
+com.google.common.collect.RegularImmutableMap$NonTerminalEntry
+com.google.common.collect.RegularImmutableMap$TerminalEntry
+com.google.common.collect.RegularImmutableMultiset
+com.google.common.collect.RegularImmutableMultiset$EntrySet
+com.google.common.collect.RegularImmutableMultiset$EntrySet$1
+com.google.common.collect.RegularImmutableSet
+com.google.common.collect.RegularImmutableSortedMap
+com.google.common.collect.RegularImmutableSortedMap$EntrySet
+com.google.common.collect.RegularImmutableSortedMap$EntrySet$1
+com.google.common.collect.RegularImmutableSortedMultiset
+com.google.common.collect.RegularImmutableSortedMultiset$EntrySet
+com.google.common.collect.RegularImmutableSortedMultiset$EntrySet$1
+com.google.common.collect.RegularImmutableSortedSet
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$1
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$Column
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$ColumnMap
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$DenseCellSet
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$DenseCellSet$1
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$Row
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$RowMap
+com.google.common.collect.RegularImmutableTable$ImmutableArrayMap$1
+com.google.common.collect.RegularImmutableTable$ImmutableArrayMap$2
+com.google.common.collect.RegularImmutableTable$SparseImmutableTable$1
+com.google.common.collect.RegularImmutableTable$SparseImmutableTable$SparseCellSet
+com.google.common.collect.RegularImmutableTable$SparseImmutableTable$SparseCellSet$1
+com.google.common.collect.ReverseNaturalOrdering
+com.google.common.collect.ReverseOrdering
+com.google.common.collect.Sets$CartesianSet$1
+com.google.common.collect.Sets$SetFromMap
+com.google.common.collect.Sets$UnmodifiableNavigableSet
+com.google.common.collect.SingletonImmutableBiMap
+com.google.common.collect.SingletonImmutableList
+com.google.common.collect.SingletonImmutableSet
+com.google.common.collect.SortedLists$KeyAbsentBehavior$1
+com.google.common.collect.SortedLists$KeyAbsentBehavior$2
+com.google.common.collect.SortedLists$KeyAbsentBehavior$3
+com.google.common.collect.SortedLists$KeyPresentBehavior$1
+com.google.common.collect.SortedLists$KeyPresentBehavior$2
+com.google.common.collect.SortedLists$KeyPresentBehavior$3
+com.google.common.collect.SortedLists$KeyPresentBehavior$4
+com.google.common.collect.SortedLists$KeyPresentBehavior$5
+com.google.common.collect.StandardRowSortedTable
+com.google.common.collect.StandardTable
+com.google.common.collect.Synchronized$SynchronizedAsMap
+com.google.common.collect.Synchronized$SynchronizedAsMapEntries
+com.google.common.collect.Synchronized$SynchronizedAsMapValues
+com.google.common.collect.Synchronized$SynchronizedBiMap
+com.google.common.collect.Synchronized$SynchronizedCollection
+com.google.common.collect.Synchronized$SynchronizedEntry
+com.google.common.collect.Synchronized$SynchronizedList
+com.google.common.collect.Synchronized$SynchronizedListMultimap
+com.google.common.collect.Synchronized$SynchronizedMap
+com.google.common.collect.Synchronized$SynchronizedMultimap
+com.google.common.collect.Synchronized$SynchronizedMultiset
+com.google.common.collect.Synchronized$SynchronizedNavigableMap
+com.google.common.collect.Synchronized$SynchronizedNavigableSet
+com.google.common.collect.Synchronized$SynchronizedObject
+com.google.common.collect.Synchronized$SynchronizedQueue
+com.google.common.collect.Synchronized$SynchronizedRandomAccessList
+com.google.common.collect.Synchronized$SynchronizedSet
+com.google.common.collect.Synchronized$SynchronizedSetMultimap
+com.google.common.collect.Synchronized$SynchronizedSortedMap
+com.google.common.collect.Synchronized$SynchronizedSortedSet
+com.google.common.collect.Synchronized$SynchronizedSortedSetMultimap
+com.google.common.collect.Tables$ImmutableCell
+com.google.common.collect.Tables$UnmodifiableRowSortedMap
+com.google.common.collect.Tables$UnmodifiableTable
+com.google.common.collect.TreeBasedTable
+com.google.common.collect.TreeBasedTable$Factory
+com.google.common.collect.TreeMultimap
+com.google.common.collect.TreeMultiset
+com.google.common.collect.TreeMultiset$Aggregate$1
+com.google.common.collect.TreeMultiset$Aggregate$2
+com.google.common.collect.UnmodifiableSortedMultiset
+com.google.common.collect.UsingToStringOrdering
+com.google.common.hash.BloomFilter
+com.google.common.hash.BloomFilter$SerialForm
+com.google.common.hash.BloomFilterStrategies$1
+com.google.common.hash.ChecksumHashFunction
+com.google.common.hash.Funnels$ByteArrayFunnel
+com.google.common.hash.Funnels$IntegerFunnel
+com.google.common.hash.Funnels$LongFunnel
+com.google.common.hash.Funnels$StringFunnel
+com.google.common.hash.HashCodes$BytesHashCode
+com.google.common.hash.HashCodes$IntHashCode
+com.google.common.hash.HashCodes$LongHashCode
+com.google.common.hash.Hashing$ChecksumType$1
+com.google.common.hash.Hashing$ChecksumType$2
+com.google.common.hash.MessageDigestHashFunction
+com.google.common.hash.MessageDigestHashFunction$SerializedForm
+com.google.common.hash.Murmur3_128HashFunction
+com.google.common.hash.Murmur3_32HashFunction
+com.google.common.io.FileWriteMode
+com.google.common.net.HostAndPort
+com.google.common.primitives.Booleans$BooleanArrayAsList
+com.google.common.primitives.Booleans$LexicographicalComparator
+com.google.common.primitives.Bytes$ByteArrayAsList
+com.google.common.primitives.Chars$CharArrayAsList
+com.google.common.primitives.Chars$LexicographicalComparator
+com.google.common.primitives.Doubles$DoubleArrayAsList
+com.google.common.primitives.Doubles$LexicographicalComparator
+com.google.common.primitives.Floats$FloatArrayAsList
+com.google.common.primitives.Floats$LexicographicalComparator
+com.google.common.primitives.Ints$IntArrayAsList
+com.google.common.primitives.Ints$LexicographicalComparator
+com.google.common.primitives.Longs$LexicographicalComparator
+com.google.common.primitives.Longs$LongArrayAsList
+com.google.common.primitives.Shorts$LexicographicalComparator
+com.google.common.primitives.Shorts$ShortArrayAsList
+com.google.common.primitives.SignedBytes$LexicographicalComparator
+com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$PureJavaComparator
+com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator
+com.google.common.primitives.UnsignedInteger
+com.google.common.primitives.UnsignedInts$LexicographicalComparator
+com.google.common.primitives.UnsignedLong
+com.google.common.primitives.UnsignedLongs$LexicographicalComparator
+com.google.common.reflect.TypeToken$ClassSet
+com.google.common.reflect.TypeToken$InterfaceSet
+com.google.common.reflect.TypeToken$SimpleTypeToken
+com.google.common.reflect.TypeToken$TypeFilter$1
+com.google.common.reflect.TypeToken$TypeFilter$2
+com.google.common.reflect.TypeToken$TypeSet
+com.google.common.reflect.Types$ClassOwnership$1
+com.google.common.reflect.Types$ClassOwnership$2
+com.google.common.reflect.Types$GenericArrayTypeImpl
+com.google.common.reflect.Types$JavaVersion$2
+com.google.common.reflect.Types$JavaVersion$3
+com.google.common.reflect.Types$ParameterizedTypeImpl
+com.google.common.reflect.Types$WildcardTypeImpl
+com.google.common.util.concurrent.AbstractFuture$Sync
+com.google.common.util.concurrent.AtomicDouble
+com.google.common.util.concurrent.AtomicDoubleArray
+com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantLock
+com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantReadLock
+com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantReadWriteLock
+com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantWriteLock
+com.google.common.util.concurrent.CycleDetectingLockFactory$ExampleStackTrace
+com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$1
+com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$2
+com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$3
+com.google.common.util.concurrent.CycleDetectingLockFactory$PotentialDeadlockException
+com.google.common.util.concurrent.ExecutionError
+com.google.common.util.concurrent.Service$State
+com.google.common.util.concurrent.Striped$PaddedLock
+com.google.common.util.concurrent.Striped$PaddedSemaphore
+com.google.common.util.concurrent.UncheckedExecutionException
+com.google.common.util.concurrent.UncheckedTimeoutException
+com.google.protobuf.CodedOutputStream$OutOfSpaceException
+com.google.protobuf.DescriptorProtos$DescriptorProto
+com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange
+com.google.protobuf.DescriptorProtos$EnumDescriptorProto
+com.google.protobuf.DescriptorProtos$EnumOptions
+com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto
+com.google.protobuf.DescriptorProtos$EnumValueOptions
+com.google.protobuf.DescriptorProtos$FieldDescriptorProto
+com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label
+com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type
+com.google.protobuf.DescriptorProtos$FieldOptions
+com.google.protobuf.DescriptorProtos$FieldOptions$CType
+com.google.protobuf.DescriptorProtos$FileDescriptorProto
+com.google.protobuf.DescriptorProtos$FileDescriptorSet
+com.google.protobuf.DescriptorProtos$FileOptions
+com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode
+com.google.protobuf.DescriptorProtos$MessageOptions
+com.google.protobuf.DescriptorProtos$MethodDescriptorProto
+com.google.protobuf.DescriptorProtos$MethodOptions
+com.google.protobuf.DescriptorProtos$ServiceDescriptorProto
+com.google.protobuf.DescriptorProtos$ServiceOptions
+com.google.protobuf.DescriptorProtos$SourceCodeInfo
+com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location
+com.google.protobuf.DescriptorProtos$UninterpretedOption
+com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart
+com.google.protobuf.Descriptors$DescriptorValidationException
+com.google.protobuf.Descriptors$FieldDescriptor$JavaType
+com.google.protobuf.Descriptors$FieldDescriptor$Type
+com.google.protobuf.GeneratedMessageLite$SerializedForm
+com.google.protobuf.InvalidProtocolBufferException
+com.google.protobuf.RpcUtil$AlreadyCalledException
+com.google.protobuf.ServiceException
+com.google.protobuf.TextFormat$InvalidEscapeSequenceException
+com.google.protobuf.TextFormat$ParseException
+com.google.protobuf.UninitializedMessageException
+com.google.protobuf.WireFormat$FieldType
+com.google.protobuf.WireFormat$FieldType$1
+com.google.protobuf.WireFormat$FieldType$2
+com.google.protobuf.WireFormat$FieldType$3
+com.google.protobuf.WireFormat$FieldType$4
+com.google.protobuf.WireFormat$JavaType
+com.jcraft.jsch.ChannelSftp$RequestQueue$OutOfOrderException
+com.jcraft.jsch.JSchAuthCancelException
+com.jcraft.jsch.JSchException
+com.jcraft.jsch.JSchPartialAuthException
+com.jcraft.jsch.SftpException
+com.jidesoft.alert.Alert
+com.jidesoft.alert.InputPopup
+com.jidesoft.animation.CustomAnimation
+com.jidesoft.animation.CustomAnimation$n_
+com.jidesoft.awt.geom.Insets2D$Double
+com.jidesoft.awt.geom.Insets2D$Float
+com.jidesoft.chart.AboveBoundsException
+com.jidesoft.chart.BarLabelPlacement
+com.jidesoft.chart.BarResizePolicy
+com.jidesoft.chart.BelowBoundsException
+com.jidesoft.chart.Chart
+com.jidesoft.chart.ChartBoundsException
+com.jidesoft.chart.ChartException
+com.jidesoft.chart.ChartType
+com.jidesoft.chart.LabelPlacement
+com.jidesoft.chart.Legend
+com.jidesoft.chart.Legend$d_
+com.jidesoft.chart.Legend$e_
+com.jidesoft.chart.Meter
+com.jidesoft.chart.Orientation
+com.jidesoft.chart.PointShape
+com.jidesoft.chart.ShadowVisibility
+com.jidesoft.chart.a
+com.jidesoft.chart.annotation.Rotation
+com.jidesoft.chart.axis.AxisComponent
+com.jidesoft.chart.axis.AxisPlacement
+com.jidesoft.chart.axis.AxisQuantity
+com.jidesoft.chart.axis.AxisType
+com.jidesoft.chart.event.AxisZoomController
+com.jidesoft.chart.event.AxisZoomController$b_
+com.jidesoft.chart.event.ChartValueReporter
+com.jidesoft.chart.event.DirectionZoomEvent
+com.jidesoft.chart.event.ImageChangeEvent
+com.jidesoft.chart.event.PanEvent
+com.jidesoft.chart.event.PanIndicator$Placement
+com.jidesoft.chart.event.PointSelectionEvent
+com.jidesoft.chart.event.RectangleSelectionEvent
+com.jidesoft.chart.event.ZoomDirection
+com.jidesoft.chart.event.ZoomLocation
+com.jidesoft.chart.event.ZoomOrientation
+com.jidesoft.chart.l
+com.jidesoft.chart.model.ChartModelChangeEvent
+com.jidesoft.chart.model.ChartModelChangeType
+com.jidesoft.chart.model.ChartableTableModel
+com.jidesoft.chart.preference.ChartPreferencePanel
+com.jidesoft.chart.preference.LineWidthChooser
+com.jidesoft.chart.preference.PointShapeChooser
+com.jidesoft.chart.preference.PointShapeLabel
+com.jidesoft.chart.preference.PointSizeChooser
+com.jidesoft.chart.render.CandlestickChartType
+com.jidesoft.chart.render.ZAlignment
+com.jidesoft.chart.render.a
+com.jidesoft.chart.servlet.ChartServlet
+com.jidesoft.chart.servlet.ComponentServlet
+com.jidesoft.chart.servlet.JButtonServlet
+com.jidesoft.chart.util.Rotation
+com.jidesoft.combobox.AbstractComboBox$6
+com.jidesoft.combobox.AbstractComboBox$7
+com.jidesoft.combobox.AbstractComboBox$8
+com.jidesoft.combobox.AbstractComboBox$9
+com.jidesoft.combobox.AbstractComboBox$AccessibleJComboBox
+com.jidesoft.combobox.AbstractComboBox$ComboBoxSpinner
+com.jidesoft.combobox.AbstractComboBox$ComboBoxTextField
+com.jidesoft.combobox.AbstractComboBox$DefaultRendererComponent
+com.jidesoft.combobox.AbstractComboBox$DefaultTextFieldEditorComponent
+com.jidesoft.combobox.AbstractComboBox$EditorComponent$0
+com.jidesoft.combobox.AbstractComboBox$EditorComponent$1
+com.jidesoft.combobox.AbstractComboBox$EnterLazyDelegateAction
+com.jidesoft.combobox.AbstractComboBox$LazyDelegateAction
+com.jidesoft.combobox.AbstractComboBox$SpinnerEditorComponent
+com.jidesoft.combobox.AbstractComboBox$a_
+com.jidesoft.combobox.AbstractComboBox$a_$2
+com.jidesoft.combobox.AbstractComboBox$a_$3
+com.jidesoft.combobox.AbstractComboBox$a_$4
+com.jidesoft.combobox.CalculatorComboBox
+com.jidesoft.combobox.CalculatorComboBox$4
+com.jidesoft.combobox.CalculatorComboBox$4$0
+com.jidesoft.combobox.CalculatorComboBox$5
+com.jidesoft.combobox.CalculatorComboBox$5$0
+com.jidesoft.combobox.CalculatorComboBox$6
+com.jidesoft.combobox.CalculatorComboBox$a_
+com.jidesoft.combobox.CalculatorPopupPanel
+com.jidesoft.combobox.CalendarViewer
+com.jidesoft.combobox.CheckBoxListChooserPanel
+com.jidesoft.combobox.CheckBoxListChooserPanel$CheckBoxListWithResourceProvider
+com.jidesoft.combobox.CheckBoxListComboBox
+com.jidesoft.combobox.CheckBoxListComboBox$1
+com.jidesoft.combobox.CheckBoxListExComboBox
+com.jidesoft.combobox.CheckBoxListExComboBox$1
+com.jidesoft.combobox.CheckBoxTreeChooserPanel
+com.jidesoft.combobox.CheckBoxTreeChooserPanel$0
+com.jidesoft.combobox.CheckBoxTreeChooserPanel$d_
+com.jidesoft.combobox.CheckBoxTreeExComboBox
+com.jidesoft.combobox.CheckBoxTreeExComboBox$0
+com.jidesoft.combobox.ColorChooserPanel
+com.jidesoft.combobox.ColorChooserPanel$0
+com.jidesoft.combobox.ColorChooserPanel$10
+com.jidesoft.combobox.ColorChooserPanel$4
+com.jidesoft.combobox.ColorChooserPanel$5
+com.jidesoft.combobox.ColorChooserPanel$6
+com.jidesoft.combobox.ColorChooserPanel$7
+com.jidesoft.combobox.ColorChooserPanel$8
+com.jidesoft.combobox.ColorChooserPanel$9
+com.jidesoft.combobox.ColorChooserPanel$ColorButton
+com.jidesoft.combobox.ColorChooserPanel$b_
+com.jidesoft.combobox.ColorComboBox
+com.jidesoft.combobox.ColorComboBox$ColorEditorComponent
+com.jidesoft.combobox.ColorComboBox$ColorLabel
+com.jidesoft.combobox.ColorComboBox$ColorRendererComponent
+com.jidesoft.combobox.ColorExComboBox
+com.jidesoft.combobox.DateChooserPanel
+com.jidesoft.combobox.DateChooserPanel$0
+com.jidesoft.combobox.DateChooserPanel$1
+com.jidesoft.combobox.DateChooserPanel$16
+com.jidesoft.combobox.DateChooserPanel$17
+com.jidesoft.combobox.DateChooserPanel$18
+com.jidesoft.combobox.DateChooserPanel$19
+com.jidesoft.combobox.DateChooserPanel$2
+com.jidesoft.combobox.DateChooserPanel$20
+com.jidesoft.combobox.DateChooserPanel$21
+com.jidesoft.combobox.DateChooserPanel$22
+com.jidesoft.combobox.DateChooserPanel$23
+com.jidesoft.combobox.DateChooserPanel$24
+com.jidesoft.combobox.DateChooserPanel$25
+com.jidesoft.combobox.DateChooserPanel$26
+com.jidesoft.combobox.DateChooserPanel$27
+com.jidesoft.combobox.DateChooserPanel$4
+com.jidesoft.combobox.DateChooserPanel$d_
+com.jidesoft.combobox.DateComboBox
+com.jidesoft.combobox.DateComboBox$DateEditorComponent
+com.jidesoft.combobox.DateComboBox$DateRendererComponent
+com.jidesoft.combobox.DateExComboBox
+com.jidesoft.combobox.DateModelEvent
+com.jidesoft.combobox.DateSelectionEvent
+com.jidesoft.combobox.DateSpinnerComboBox
+com.jidesoft.combobox.DateSpinnerComboBox$0
+com.jidesoft.combobox.DateSpinnerComboBox$DateSpinnerEditorComponent
+com.jidesoft.combobox.DefaultComboBoxModelWrapper
+com.jidesoft.combobox.ExComboBox$0
+com.jidesoft.combobox.ExComboBox$1
+com.jidesoft.combobox.ExComboBox$2
+com.jidesoft.combobox.ExComboBox$3
+com.jidesoft.combobox.ExComboBox$LazyDelegateAction
+com.jidesoft.combobox.FileChooserComboBox
+com.jidesoft.combobox.FileChooserComboBox$0
+com.jidesoft.combobox.FileChooserComboBox$1
+com.jidesoft.combobox.FileChooserExComboBox
+com.jidesoft.combobox.FileChooserExComboBox$0
+com.jidesoft.combobox.FileChooserExComboBox$1
+com.jidesoft.combobox.FileChooserPanel
+com.jidesoft.combobox.FileNameChooserComboBox
+com.jidesoft.combobox.FileNameChooserComboBox$0
+com.jidesoft.combobox.FileNameChooserComboBox$1
+com.jidesoft.combobox.FileNameChooserExComboBox
+com.jidesoft.combobox.FileNameChooserExComboBox$0
+com.jidesoft.combobox.FileNameChooserExComboBox$1
+com.jidesoft.combobox.FileNameChooserPanel
+com.jidesoft.combobox.FilterableComboBoxModel
+com.jidesoft.combobox.FolderChooserComboBox
+com.jidesoft.combobox.FolderChooserExComboBox
+com.jidesoft.combobox.FolderChooserPanel
+com.jidesoft.combobox.FolderChooserPanel$0
+com.jidesoft.combobox.FolderNameChooserComboBox
+com.jidesoft.combobox.FolderNameChooserExComboBox
+com.jidesoft.combobox.FolderNameChooserPanel
+com.jidesoft.combobox.FontChooserPanel
+com.jidesoft.combobox.FontComboBox
+com.jidesoft.combobox.FontExComboBox
+com.jidesoft.combobox.FontListCellRenderer
+com.jidesoft.combobox.InsetsChooserPanel
+com.jidesoft.combobox.InsetsChooserPanel$1
+com.jidesoft.combobox.InsetsChooserPanel$2
+com.jidesoft.combobox.InsetsChooserPanel$d_
+com.jidesoft.combobox.InsetsComboBox
+com.jidesoft.combobox.InsetsExComboBox
+com.jidesoft.combobox.JideColorSplitButton
+com.jidesoft.combobox.JideColorSplitButton$2
+com.jidesoft.combobox.ListChooserPanel
+com.jidesoft.combobox.ListChooserPanel$2
+com.jidesoft.combobox.ListChooserPanel$Handler
+com.jidesoft.combobox.ListChooserPanel$d_
+com.jidesoft.combobox.ListComboBox
+com.jidesoft.combobox.ListComboBox$1
+com.jidesoft.combobox.ListComboBox$2
+com.jidesoft.combobox.ListComboBox$3
+com.jidesoft.combobox.ListComboBox$4
+com.jidesoft.combobox.ListComboBox$5
+com.jidesoft.combobox.ListComboBox$6
+com.jidesoft.combobox.ListComboBox$7
+com.jidesoft.combobox.ListComboBox$ListEditorComponent
+com.jidesoft.combobox.ListComboBox$ListRendererComponent
+com.jidesoft.combobox.ListExComboBox
+com.jidesoft.combobox.ListExComboBox$0
+com.jidesoft.combobox.MonthChooserPanel
+com.jidesoft.combobox.MonthChooserPanel$0
+com.jidesoft.combobox.MonthChooserPanel$1
+com.jidesoft.combobox.MonthChooserPanel$10
+com.jidesoft.combobox.MonthChooserPanel$11
+com.jidesoft.combobox.MonthChooserPanel$12
+com.jidesoft.combobox.MonthChooserPanel$4
+com.jidesoft.combobox.MonthChooserPanel$5
+com.jidesoft.combobox.MonthChooserPanel$6
+com.jidesoft.combobox.MonthChooserPanel$7
+com.jidesoft.combobox.MonthChooserPanel$8
+com.jidesoft.combobox.MonthChooserPanel$9
+com.jidesoft.combobox.MonthComboBox
+com.jidesoft.combobox.MonthExComboBox
+com.jidesoft.combobox.MultiSelectListChooserPanel
+com.jidesoft.combobox.MultiSelectListChooserPanel$2
+com.jidesoft.combobox.MultiSelectListChooserPanel$3
+com.jidesoft.combobox.MultiSelectListChooserPanel$Handler
+com.jidesoft.combobox.MultiSelectListComboBox
+com.jidesoft.combobox.MultiSelectListComboBox$1
+com.jidesoft.combobox.MultiSelectListExComboBox
+com.jidesoft.combobox.MultiSelectListExComboBox$1
+com.jidesoft.combobox.MultilineStringComboBox
+com.jidesoft.combobox.MultilineStringExComboBox
+com.jidesoft.combobox.MultilineStringPopupPanel
+com.jidesoft.combobox.NumberSpinnerComboBox$NumberSpinner
+com.jidesoft.combobox.NumberSpinnerComboBox$NumberSpinnerEditorComponent
+com.jidesoft.combobox.PopupPanel
+com.jidesoft.combobox.QuickComboBoxFilterField
+com.jidesoft.combobox.SortableComboBoxModel
+com.jidesoft.combobox.StringArrayComboBox
+com.jidesoft.combobox.StringArrayExComboBox
+com.jidesoft.combobox.StringArrayPopupPanel
+com.jidesoft.combobox.TableChooserPanel
+com.jidesoft.combobox.TableChooserPanel$3
+com.jidesoft.combobox.TableChooserPanel$c_
+com.jidesoft.combobox.TableComboBox
+com.jidesoft.combobox.TableComboBox$0
+com.jidesoft.combobox.TableComboBox$3
+com.jidesoft.combobox.TableComboBox$b_
+com.jidesoft.combobox.TableComboBox$b_$0
+com.jidesoft.combobox.TableComboBox$b_$1
+com.jidesoft.combobox.TableComboBox$c_
+com.jidesoft.combobox.TableComboBox$c_$1
+com.jidesoft.combobox.TableComboBox$c_$2
+com.jidesoft.combobox.TableExComboBox
+com.jidesoft.combobox.TableExComboBox$2
+com.jidesoft.combobox.TableExComboBox$b_
+com.jidesoft.combobox.TreeChooserPanel
+com.jidesoft.combobox.TreeChooserPanel$2
+com.jidesoft.combobox.TreeChooserPanel$3
+com.jidesoft.combobox.TreeChooserPanel$b_
+com.jidesoft.combobox.TreeComboBox
+com.jidesoft.combobox.TreeComboBox$0
+com.jidesoft.combobox.TreeComboBox$2
+com.jidesoft.combobox.TreeComboBox$b_
+com.jidesoft.combobox.TreeExComboBox
+com.jidesoft.combobox.TreeExComboBox$0
+com.jidesoft.comparator.CharSequenceComparator
+com.jidesoft.comparator.ComparableComparator
+com.jidesoft.comparator.ComparatorContext
+com.jidesoft.comparator.FastComparableComparator
+com.jidesoft.converter.ConverterContext
+com.jidesoft.converter.RegistrationEvent
+com.jidesoft.csv.CsvParseEvent
+com.jidesoft.csv.CsvParseEvent$EventType
+com.jidesoft.csv.a$a_
+com.jidesoft.dialog.BannerPanel
+com.jidesoft.dialog.BannerPanel$1
+com.jidesoft.dialog.BannerPanel$3
+com.jidesoft.dialog.ButtonEvent
+com.jidesoft.dialog.ButtonPanel
+com.jidesoft.dialog.ButtonPanelLayout
+com.jidesoft.dialog.DialogPageListCellRenderer
+com.jidesoft.dialog.DialogPageTreeCellRenderer
+com.jidesoft.dialog.JideOptionPane
+com.jidesoft.dialog.MultiplePageDialog
+com.jidesoft.dialog.MultiplePageDialog$1
+com.jidesoft.dialog.MultiplePageDialog$14
+com.jidesoft.dialog.MultiplePageDialog$16
+com.jidesoft.dialog.MultiplePageDialog$18
+com.jidesoft.dialog.MultiplePageDialog$2
+com.jidesoft.dialog.MultiplePageDialog$3
+com.jidesoft.dialog.MultiplePageDialogPane
+com.jidesoft.dialog.MultiplePageDialogPane$1
+com.jidesoft.dialog.MultiplePageDialogPane$12
+com.jidesoft.dialog.MultiplePageDialogPane$14
+com.jidesoft.dialog.MultiplePageDialogPane$16
+com.jidesoft.dialog.MutableTreeNodeEx
+com.jidesoft.dialog.PageEvent
+com.jidesoft.dialog.PageList
+com.jidesoft.dialog.ScrollableButtonPanel
+com.jidesoft.dialog.StandardDialog$2
+com.jidesoft.dialog.StandardDialog$3
+com.jidesoft.dialog.StandardDialog$DefaultStandardDialogPane
+com.jidesoft.dialog.StandardDialog$StandardDialogPropertyChangeListener$1
+com.jidesoft.dialog.StandardDialogPane$1
+com.jidesoft.dialog.StandardDialogPane$2
+com.jidesoft.document.DialogFloatingDocumentContainer
+com.jidesoft.document.DialogFloatingDocumentContainer$4
+com.jidesoft.document.DocumentComponentEvent
+com.jidesoft.document.DocumentPane
+com.jidesoft.document.DocumentPane$32
+com.jidesoft.document.DocumentPane$33
+com.jidesoft.document.DocumentPane$34
+com.jidesoft.document.FrameFloatingDocumentContainer
+com.jidesoft.document.FrameFloatingDocumentContainer$4
+com.jidesoft.document.TdiGroup
+com.jidesoft.document.a
+com.jidesoft.field.IPTextField
+com.jidesoft.field.IPTextField$a_
+com.jidesoft.field.IPTextField$b_
+com.jidesoft.field.IPTextField$c_
+com.jidesoft.field.IPTextField$d_
+com.jidesoft.field.IPTextField$e_
+com.jidesoft.field.IPTextField$k_
+com.jidesoft.field.creditcard.CreditCardTextField
+com.jidesoft.filter.AllFilter
+com.jidesoft.filter.AndFilter
+com.jidesoft.filter.BetweenFilter
+com.jidesoft.filter.CustomFilterEditor
+com.jidesoft.filter.CustomFilterEditor$3
+com.jidesoft.filter.EmptyFilter
+com.jidesoft.filter.EqualFilter
+com.jidesoft.filter.GreaterOrEqualFilter
+com.jidesoft.filter.GreaterThanFilter
+com.jidesoft.filter.InFilter
+com.jidesoft.filter.LastMonthFilter
+com.jidesoft.filter.LastQuarterFilter
+com.jidesoft.filter.LastWeekFilter
+com.jidesoft.filter.LastYearFilter
+com.jidesoft.filter.LessOrEqualFilter
+com.jidesoft.filter.LessThanFilter
+com.jidesoft.filter.LikeFilter
+com.jidesoft.filter.LikeFilter$0
+com.jidesoft.filter.MonthFilter
+com.jidesoft.filter.NextMonthFilter
+com.jidesoft.filter.NextQuarterFilter
+com.jidesoft.filter.NextWeekFilter
+com.jidesoft.filter.NextYearFilter
+com.jidesoft.filter.NoneFilter
+com.jidesoft.filter.NotBetweenFilter
+com.jidesoft.filter.NotEqualFilter
+com.jidesoft.filter.NotFilter
+com.jidesoft.filter.NotInFilter
+com.jidesoft.filter.NotLikeFilter
+com.jidesoft.filter.OrFilter
+com.jidesoft.filter.QuarterFilter
+com.jidesoft.filter.RegexFilter
+com.jidesoft.filter.ThisMonthFilter
+com.jidesoft.filter.ThisQuarterFilter
+com.jidesoft.filter.ThisWeekFilter
+com.jidesoft.filter.ThisYearFilter
+com.jidesoft.filter.TodayFilter
+com.jidesoft.filter.TomorrowFilter
+com.jidesoft.filter.ValueEditor
+com.jidesoft.filter.ValueEditor$2
+com.jidesoft.filter.WildcardFilter
+com.jidesoft.filter.YearFilter
+com.jidesoft.filter.YesterdayFilter
+com.jidesoft.gauge.Bullet
+com.jidesoft.gauge.BulletAxisPlacement
+com.jidesoft.gauge.BulletIndicatorLegendItem
+com.jidesoft.gauge.BulletIntervalMarkerLegendItem
+com.jidesoft.gauge.BulletLabel
+com.jidesoft.gauge.Clock
+com.jidesoft.gauge.Dial
+com.jidesoft.gauge.DialIntervalMarkerLegendItem
+com.jidesoft.gauge.DialLabelOrientation
+com.jidesoft.gauge.GaugeModelEvent
+com.jidesoft.gauge.LineLabelPlacement
+com.jidesoft.gauge.MarkerShape
+com.jidesoft.gauge.NeedleEndShape
+com.jidesoft.gauge.NeedleLegendItem
+com.jidesoft.gauge.PointerIndicatorPlacement
+com.jidesoft.gauge.PointerLabelPlacement
+com.jidesoft.grid.AutoFilterBox
+com.jidesoft.grid.AutoFilterBox$10
+com.jidesoft.grid.AutoFilterBox$7
+com.jidesoft.grid.AutoFilterBox$9
+com.jidesoft.grid.AutoFilterBox$AutoFilterBoxFilterField
+com.jidesoft.grid.AutoFilterBox$AutoFilterBoxFilterField$a_
+com.jidesoft.grid.AutoFilterTableHeader
+com.jidesoft.grid.AutoFilterTableHeader$0
+com.jidesoft.grid.AutoFilterTableHeader$1
+com.jidesoft.grid.AutoFilterTableHeaderEditor
+com.jidesoft.grid.AutoFilterTableHeaderRenderer
+com.jidesoft.grid.AutoFilterUtils$5
+com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTable
+com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTable$1
+com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTableModel
+com.jidesoft.grid.AutoFilterUtils$TableWildcardFilter
+com.jidesoft.grid.AutoResizePopupMenuCustomizer$0
+com.jidesoft.grid.AutoResizePopupMenuCustomizer$1
+com.jidesoft.grid.BasicTableModel
+com.jidesoft.grid.BeanTableModel
+com.jidesoft.grid.BooleanCellEditor
+com.jidesoft.grid.BooleanCheckBoxCellEditor
+com.jidesoft.grid.BooleanCheckBoxCellRenderer
+com.jidesoft.grid.ButtonTableCellEditorRenderer
+com.jidesoft.grid.ByteCellEditor
+com.jidesoft.grid.CachedTableModel
+com.jidesoft.grid.CalculatorCellEditor
+com.jidesoft.grid.CalculatorCellEditor$0
+com.jidesoft.grid.CalculatorCellEditor$0$1
+com.jidesoft.grid.CategorizedTable
+com.jidesoft.grid.CellChangeEvent
+com.jidesoft.grid.CellRendererPaneEx
+com.jidesoft.grid.CellSpanTable
+com.jidesoft.grid.CellSpanTable$DelegateAction
+com.jidesoft.grid.CellStyleEditor
+com.jidesoft.grid.CellStyleEditor$1
+com.jidesoft.grid.CellStyleTable
+com.jidesoft.grid.CellStyleTableHeader
+com.jidesoft.grid.CheckBoxListComboBoxCellEditor
+com.jidesoft.grid.CheckBoxTreeComboBoxCellEditor
+com.jidesoft.grid.ColorCellEditor
+com.jidesoft.grid.ColorCellRenderer
+com.jidesoft.grid.ComboBoxShrinkSearchableSupport$0
+com.jidesoft.grid.CompoundTableModelEvent
+com.jidesoft.grid.ContextSensitiveCellRenderer
+com.jidesoft.grid.ContextSensitiveTable
+com.jidesoft.grid.ContextSensitiveTable$0
+com.jidesoft.grid.ContextSensitiveTableTransferHandler
+com.jidesoft.grid.CustomFilterEditorDialog
+com.jidesoft.grid.CustomValueFilterListSelectionModel
+com.jidesoft.grid.DateCellEditor
+com.jidesoft.grid.DefaultColumnTableModelWrapper
+com.jidesoft.grid.DefaultContextSensitiveTableModel
+com.jidesoft.grid.DefaultGroupTableModel
+com.jidesoft.grid.DefaultGroupableTableModel
+com.jidesoft.grid.DefaultMultiTableModel
+com.jidesoft.grid.DefaultNavigableTableModel
+com.jidesoft.grid.DefaultProperty
+com.jidesoft.grid.DefaultSpanTableModel
+com.jidesoft.grid.DefaultStyleTableModel
+com.jidesoft.grid.DefaultTableModelWrapper
+com.jidesoft.grid.DefaultTableSelectionModel
+com.jidesoft.grid.DefaultUndoableTableModel
+com.jidesoft.grid.DimensionCellEditor
+com.jidesoft.grid.DoubleCellEditor
+com.jidesoft.grid.DraggingTableHeader
+com.jidesoft.grid.DualTable
+com.jidesoft.grid.DualTable$4
+com.jidesoft.grid.DualTable$5
+com.jidesoft.grid.DualTable$6
+com.jidesoft.grid.DualTable$7
+com.jidesoft.grid.DualTable$8
+com.jidesoft.grid.DualTable$d_
+com.jidesoft.grid.EditableTableHeader
+com.jidesoft.grid.EditableTableHeader$4
+com.jidesoft.grid.EditableTableHeader$4$0
+com.jidesoft.grid.EditingNotStoppedException
+com.jidesoft.grid.EditorContext
+com.jidesoft.grid.EnumCellEditor
+com.jidesoft.grid.EnumCellRenderer
+com.jidesoft.grid.ExpandablePanel
+com.jidesoft.grid.ExpandableTableCellRenderer
+com.jidesoft.grid.Field
+com.jidesoft.grid.FileCellEditor
+com.jidesoft.grid.FileNameCellEditor
+com.jidesoft.grid.FilterEvent
+com.jidesoft.grid.FilterListCellRenderer
+com.jidesoft.grid.FilterableTableModel
+com.jidesoft.grid.FilterableTableModel$0
+com.jidesoft.grid.FilterableTableModel$1
+com.jidesoft.grid.FilterableTableModelEvent
+com.jidesoft.grid.FilterableTreeTableModel
+com.jidesoft.grid.FloatCellEditor
+com.jidesoft.grid.FolderCellEditor
+com.jidesoft.grid.FolderNameCellEditor
+com.jidesoft.grid.FontCellEditor
+com.jidesoft.grid.FontNameCellEditor
+com.jidesoft.grid.FontNameCellEditor$a_
+com.jidesoft.grid.FormattedTextFieldCellEditor
+com.jidesoft.grid.FormattedTextFieldCellEditor$0
+com.jidesoft.grid.FormattedTextFieldCellEditor$1
+com.jidesoft.grid.GroupTable
+com.jidesoft.grid.GroupTableHeader
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$0
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$1
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$2
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$3
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$4
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$5
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$6
+com.jidesoft.grid.HierarchicalPanel
+com.jidesoft.grid.HierarchicalPanel$c_
+com.jidesoft.grid.HierarchicalTable
+com.jidesoft.grid.HierarchicalTable$HierarchicalTableAction
+com.jidesoft.grid.HierarchicalTableCellRenderer
+com.jidesoft.grid.HyperlinkTableCellEditorRenderer
+com.jidesoft.grid.IFilterableTableModel$FilterItem
+com.jidesoft.grid.IPAddressCellEditor
+com.jidesoft.grid.ISortableTableModel$SortItem
+com.jidesoft.grid.IconCellRenderer
+com.jidesoft.grid.IconRenderer
+com.jidesoft.grid.IndexChangeEvent
+com.jidesoft.grid.IndexChangeListenerHelper
+com.jidesoft.grid.InsetsCellEditor
+com.jidesoft.grid.IntegerCellEditor
+com.jidesoft.grid.JideTable
+com.jidesoft.grid.JideTable$10
+com.jidesoft.grid.JideTable$22
+com.jidesoft.grid.JideTable$23
+com.jidesoft.grid.JideTable$24
+com.jidesoft.grid.JideTable$25
+com.jidesoft.grid.JideTable$26
+com.jidesoft.grid.JideTable$27
+com.jidesoft.grid.JideTable$NonContiguousTransferHandler
+com.jidesoft.grid.JideTable$s_
+com.jidesoft.grid.JideTable$t_
+com.jidesoft.grid.JideTable$u_
+com.jidesoft.grid.JideTableTransferHandler
+com.jidesoft.grid.JoinTableModel
+com.jidesoft.grid.LegacyBooleanCellEditor
+com.jidesoft.grid.LegacyCheckBoxListComboBoxCellEditor
+com.jidesoft.grid.LegacyColorCellEditor
+com.jidesoft.grid.LegacyColorCellRenderer
+com.jidesoft.grid.LegacyDateCellEditor
+com.jidesoft.grid.LegacyEnumCellEditor
+com.jidesoft.grid.LegacyEnumCellRenderer
+com.jidesoft.grid.LegacyFileCellEditor
+com.jidesoft.grid.LegacyFileNameCellEditor
+com.jidesoft.grid.LegacyFolderCellEditor
+com.jidesoft.grid.LegacyFolderNameCellEditor
+com.jidesoft.grid.LegacyFontNameCellEditor
+com.jidesoft.grid.LegacyFontNameCellEditor$a_
+com.jidesoft.grid.LegacyInsetsCellEditor
+com.jidesoft.grid.LegacyListComboBoxCellEditor
+com.jidesoft.grid.LegacyMonthCellEditor
+com.jidesoft.grid.LegacyMultilineStringCellEditor
+com.jidesoft.grid.LegacySortableTableHeader
+com.jidesoft.grid.LegacyStringArrayCellEditor
+com.jidesoft.grid.LegacyTableComboBoxCellEditor
+com.jidesoft.grid.LegacyTreeComboBoxCellEditor
+com.jidesoft.grid.ListComboBoxCellEditor
+com.jidesoft.grid.ListComboBoxShrinkSearchableSupport$0
+com.jidesoft.grid.ListSelectionModelGroup
+com.jidesoft.grid.ListShrinkSearchableSupport$0
+com.jidesoft.grid.ListTableModelAdapter
+com.jidesoft.grid.LongCellEditor
+com.jidesoft.grid.MarginExpandablePanel
+com.jidesoft.grid.MixedTableSelectionModelGroup
+com.jidesoft.grid.MixedTableSelectionModelGroup$0
+com.jidesoft.grid.MonthCellEditor
+com.jidesoft.grid.MultiValuedMap
+com.jidesoft.grid.MultilineStringCellEditor
+com.jidesoft.grid.MultilineStringCellRenderer
+com.jidesoft.grid.MultilineTableCellEditor
+com.jidesoft.grid.MultilineTableCellRenderer
+com.jidesoft.grid.MultilineTableCellRenderer$UIResource
+com.jidesoft.grid.MultipleEnumCellEditor
+com.jidesoft.grid.MultipleValuesFilter
+com.jidesoft.grid.NavigableTable
+com.jidesoft.grid.NavigationHierarchicalTable
+com.jidesoft.grid.NavigationSortableTable
+com.jidesoft.grid.NavigationTreeTable
+com.jidesoft.grid.NestedSortableTableHeader
+com.jidesoft.grid.NestedTableHeader
+com.jidesoft.grid.NumberCellEditor
+com.jidesoft.grid.NumberCellRenderer
+com.jidesoft.grid.PasswordCellEditor
+com.jidesoft.grid.PasswordCellRenderer
+com.jidesoft.grid.PointCellEditor
+com.jidesoft.grid.PropertyPane
+com.jidesoft.grid.PropertyPane$0
+com.jidesoft.grid.PropertyPane$3
+com.jidesoft.grid.PropertyPane$4
+com.jidesoft.grid.PropertyPane$5
+com.jidesoft.grid.PropertyPane$6
+com.jidesoft.grid.PropertyPane$7
+com.jidesoft.grid.PropertyTable
+com.jidesoft.grid.PropertyTable$0
+com.jidesoft.grid.PropertyTableCellRenderer
+com.jidesoft.grid.PropertyTableModel
+com.jidesoft.grid.QuickFilterField$1
+com.jidesoft.grid.QuickFilterField$2
+com.jidesoft.grid.QuickFilterField$3
+com.jidesoft.grid.QuickFilterField$4
+com.jidesoft.grid.QuickFilterField$5
+com.jidesoft.grid.QuickFilterField$6
+com.jidesoft.grid.QuickFilterField$7
+com.jidesoft.grid.QuickFilterField$8
+com.jidesoft.grid.QuickFilterField$9
+com.jidesoft.grid.QuickFilterField$FieldFilter
+com.jidesoft.grid.QuickFilterPane
+com.jidesoft.grid.QuickFilterPane$0
+com.jidesoft.grid.QuickFilterPane$1
+com.jidesoft.grid.QuickFilterPane$2
+com.jidesoft.grid.QuickFilterPane$QuickFilterCheckBoxList
+com.jidesoft.grid.QuickFilterPane$QuickFilterList
+com.jidesoft.grid.QuickTableFilterField
+com.jidesoft.grid.QuickTableFilterField$0
+com.jidesoft.grid.QuickTableFilterField$0$1
+com.jidesoft.grid.QuickTableFilterField$1
+com.jidesoft.grid.QuickTableFilterField$1$0
+com.jidesoft.grid.QuickTableFilterField$10
+com.jidesoft.grid.QuickTableFilterField$3
+com.jidesoft.grid.QuickTableFilterField$4
+com.jidesoft.grid.QuickTableFilterField$5
+com.jidesoft.grid.QuickTableFilterField$6
+com.jidesoft.grid.QuickTableFilterField$7
+com.jidesoft.grid.QuickTableFilterField$8
+com.jidesoft.grid.QuickTableFilterField$9
+com.jidesoft.grid.QuickTableFilterField$FieldTableFilter
+com.jidesoft.grid.QuickTableFilterField$c_
+com.jidesoft.grid.RectangleCellEditor
+com.jidesoft.grid.RowHeightChangeEvent
+com.jidesoft.grid.SelectTablePopupMenuCustomizer$0
+com.jidesoft.grid.SelectTablePopupMenuCustomizer$1
+com.jidesoft.grid.ShortCellEditor
+com.jidesoft.grid.SingleValueFilter
+com.jidesoft.grid.SliderCellEditor
+com.jidesoft.grid.SortEvent
+com.jidesoft.grid.SortItemEditor
+com.jidesoft.grid.SortOrderEditor
+com.jidesoft.grid.SortTableHeaderRenderer$a_
+com.jidesoft.grid.SortTableHeaderRenderer$b_
+com.jidesoft.grid.SortableTable
+com.jidesoft.grid.SortableTableHeader
+com.jidesoft.grid.SortableTableModel
+com.jidesoft.grid.SortableTableModel$1
+com.jidesoft.grid.SortableTableModel$2
+com.jidesoft.grid.SortableTableModel$3
+com.jidesoft.grid.SortableTreeTableModel
+com.jidesoft.grid.SpanModelEvent
+com.jidesoft.grid.SpinnerCellEditor
+com.jidesoft.grid.SpinnerCellEditor$0
+com.jidesoft.grid.SpinnerCellEditor$0$1
+com.jidesoft.grid.SpinnerCellEditor$0$2
+com.jidesoft.grid.SpinnerCellEditor$0$3
+com.jidesoft.grid.SpinnerCellEditor$0$4
+com.jidesoft.grid.StringArrayCellEditor
+com.jidesoft.grid.StringCellEditor
+com.jidesoft.grid.StyledTableCellRenderer
+com.jidesoft.grid.StyledTableCellRenderer$UIResource
+com.jidesoft.grid.TableCellStyleEditor
+com.jidesoft.grid.TableColumnChooser$0
+com.jidesoft.grid.TableColumnChooser$1
+com.jidesoft.grid.TableColumnChooser$2
+com.jidesoft.grid.TableColumnChooser$3
+com.jidesoft.grid.TableColumnChooser$4
+com.jidesoft.grid.TableColumnChooser$5
+com.jidesoft.grid.TableColumnChooserDialog
+com.jidesoft.grid.TableColumnChooserDialog$0
+com.jidesoft.grid.TableColumnChooserDialog$1
+com.jidesoft.grid.TableColumnChooserDialog$5
+com.jidesoft.grid.TableColumnChooserDialog$6
+com.jidesoft.grid.TableColumnChooserDialog$7
+com.jidesoft.grid.TableColumnChooserDialog$8
+com.jidesoft.grid.TableColumnChooserDialog$j_
+com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$2
+com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$3
+com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$4
+com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$5
+com.jidesoft.grid.TableColumnGroup
+com.jidesoft.grid.TableComboBoxCellEditor
+com.jidesoft.grid.TableComboBoxShrinkSearchableSupport$0
+com.jidesoft.grid.TableCustomFilterEditor
+com.jidesoft.grid.TableCustomFilterEditor$0
+com.jidesoft.grid.TableCustomFilterEditor$10
+com.jidesoft.grid.TableCustomFilterEditor$11
+com.jidesoft.grid.TableCustomFilterEditor$5
+com.jidesoft.grid.TableCustomFilterEditor$6
+com.jidesoft.grid.TableCustomFilterEditor$7
+com.jidesoft.grid.TableCustomFilterEditor$8
+com.jidesoft.grid.TableCustomFilterEditor$9
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$2
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$3
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$4
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$5
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$6
+com.jidesoft.grid.TableModelWrapperImpl
+com.jidesoft.grid.TableScrollPane
+com.jidesoft.grid.TableSelectionEvent
+com.jidesoft.grid.TableSelectionModelGroup
+com.jidesoft.grid.TableSelectionModelGroup$0
+com.jidesoft.grid.TableShrinkSearchableSupport$0
+com.jidesoft.grid.TableSortItemEditor
+com.jidesoft.grid.TableSortItemEditor$2
+com.jidesoft.grid.TableSplitPane
+com.jidesoft.grid.TableSplitPane$0
+com.jidesoft.grid.TableUtils$ab_
+com.jidesoft.grid.TableUtils$bb_
+com.jidesoft.grid.TableUtils$cb_
+com.jidesoft.grid.TableUtils$s_
+com.jidesoft.grid.TableUtils$t_
+com.jidesoft.grid.TableUtils$u_
+com.jidesoft.grid.TableUtils$v_
+com.jidesoft.grid.TableUtils$w_
+com.jidesoft.grid.TableUtils$x_
+com.jidesoft.grid.TableUtils$y_
+com.jidesoft.grid.TableUtils$z_
+com.jidesoft.grid.TextFieldCellEditor
+com.jidesoft.grid.TextFieldCellEditor$0
+com.jidesoft.grid.TransposeTableModel
+com.jidesoft.grid.TreeComboBoxCellEditor
+com.jidesoft.grid.TreeExpandablePanel
+com.jidesoft.grid.TreeLikeHierarchicalPanel
+com.jidesoft.grid.TreeTable
+com.jidesoft.grid.TreeTable$TreeTableAction
+com.jidesoft.grid.TreeTableCellRenderer
+com.jidesoft.grid.TreeTableModel$b_
+com.jidesoft.grid.TristateCheckBoxCellEditor
+com.jidesoft.grid.TristateCheckBoxCellRenderer
+com.jidesoft.grid.UndoableTableModelEvent
+com.jidesoft.grid.ValueFilterListSelectionModel
+com.jidesoft.grid.VerticalContextSensitiveCellRenderer
+com.jidesoft.grid.VerticalTableCellRenderer
+com.jidesoft.grid.VerticalTableCellRenderer$UIResource
+com.jidesoft.grid.a
+com.jidesoft.grid.j
+com.jidesoft.grid.k
+com.jidesoft.grid.l
+com.jidesoft.grid.l$0
+com.jidesoft.grid.m
+com.jidesoft.grid.m$a_
+com.jidesoft.grid.n
+com.jidesoft.grid.o
+com.jidesoft.grouper.GrouperContext
+com.jidesoft.hints.AbstractIntelliHints$3


<TRUNCATED>

[09/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: ee5e27b2fd9719d62b4ee16de2cb8698d91e8e92
Parents: ba7a05d
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:46:25 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:46:25 2014 +0300

----------------------------------------------------------------------
 .../singlesplit/GridSingleSplitsLoadTest.java   |   2 +-
 .../gridify/GridifySingleSplitLoadTest.java     |   2 +-
 .../router/GridTcpRouterAbstractSelfTest.java   |   2 +-
 .../router/GridTcpRouterMultiNodeSelfTest.java  |   2 +-
 .../src/test/resources/spring-router-ssl.xml    |   2 +-
 .../src/test/resources/spring-router.xml        |   2 +-
 .../src/test/resources/spring-server-node.xml   |   2 +-
 .../test/resources/spring-server-ssl-node.xml   |   2 +-
 .../child/GridHadoopExternalProcessStarter.java |   2 +-
 .../GridLog4jDailyRollingFileAppender.java      |  69 +++
 .../GridLog4jExternallyRolledFileAppender.java  |  55 ++
 .../logger/log4j/GridLog4jFileAppender.java     |  99 ++++
 .../ignite/logger/log4j/GridLog4jFileAware.java |  24 +
 .../ignite/logger/log4j/GridLog4jLogger.java    | 516 +++++++++++++++++++
 .../logger/log4j/GridLog4jNodeIdFilePath.java   |  56 ++
 .../log4j/GridLog4jRollingFileAppender.java     |  82 +++
 .../org/apache/ignite/logger/log4j/package.html |  15 +
 .../GridLog4jDailyRollingFileAppender.java      |  69 ---
 .../GridLog4jExternallyRolledFileAppender.java  |  55 --
 .../logger/log4j/GridLog4jFileAppender.java     |  99 ----
 .../grid/logger/log4j/GridLog4jFileAware.java   |  24 -
 .../grid/logger/log4j/GridLog4jLogger.java      | 516 -------------------
 .../logger/log4j/GridLog4jNodeIdFilePath.java   |  56 --
 .../log4j/GridLog4jRollingFileAppender.java     |  82 ---
 .../org/gridgain/grid/logger/log4j/package.html |  15 -
 .../log4j/GridLog4jCorrectFileNameTest.java     |   1 +
 .../logger/log4j/GridLog4jInitializedTest.java  |   1 +
 .../logger/log4j/GridLog4jLoggingFileTest.java  |   1 +
 .../logger/log4j/GridLog4jLoggingPathTest.java  |   1 +
 .../logger/log4j/GridLog4jLoggingUrlTest.java   |   1 +
 .../log4j/GridLog4jNotInitializedTest.java      |   1 +
 31 files changed, 931 insertions(+), 925 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java
index 20137db..75fce32 100644
--- a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java
+++ b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java
@@ -12,10 +12,10 @@ package org.gridgain.loadtests.direct.singlesplit;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.logger.log4j.*;
 import org.apache.log4j.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.loadtest.*;
-import org.gridgain.grid.logger.log4j.*;
 import org.gridgain.grid.spi.communication.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java
index 51187b1..5c53ebb 100644
--- a/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java
+++ b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java
@@ -11,9 +11,9 @@ package org.gridgain.loadtests.gridify;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.logger.log4j.*;
 import org.apache.log4j.*;
 import org.gridgain.grid.loadtest.*;
-import org.gridgain.grid.logger.log4j.*;
 import org.gridgain.grid.spi.communication.*;
 import org.gridgain.grid.spi.communication.tcp.*;
 import org.gridgain.grid.spi.discovery.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java
index ad024d5..76aaac0 100644
--- a/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.client.router;
 
+import org.apache.ignite.logger.log4j.*;
 import org.gridgain.client.*;
 import org.gridgain.client.integration.*;
 import org.gridgain.client.router.impl.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.log4j.*;
 import org.gridgain.grid.util.typedef.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java
index 10d0c6c..e71dc0b 100644
--- a/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java
@@ -1,10 +1,10 @@
 package org.gridgain.client.router;
 
+import org.apache.ignite.logger.log4j.*;
 import org.gridgain.client.*;
 import org.gridgain.client.integration.*;
 import org.gridgain.client.router.impl.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.log4j.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/clients/src/test/resources/spring-router-ssl.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-router-ssl.xml b/modules/clients/src/test/resources/spring-router-ssl.xml
index acb48f9..fd10411 100644
--- a/modules/clients/src/test/resources/spring-router-ssl.xml
+++ b/modules/clients/src/test/resources/spring-router-ssl.xml
@@ -92,7 +92,7 @@
     <!--
         Logger with the same configuration as in default grid instances.
     -->
-    <bean id="router.log" class="org.gridgain.grid.logger.log4j.GridLog4jLogger">
+    <bean id="router.log" class="org.apache.ignite.logger.log4j.GridLog4jLogger">
         <constructor-arg type="java.lang.String" value="modules/clients/src/test/resources/log4j.xml"/>
     </bean>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/clients/src/test/resources/spring-router.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-router.xml b/modules/clients/src/test/resources/spring-router.xml
index 822946b..671ade5 100644
--- a/modules/clients/src/test/resources/spring-router.xml
+++ b/modules/clients/src/test/resources/spring-router.xml
@@ -81,7 +81,7 @@
     <!--
         Logger with the same configuration as in default grid instances.
     -->
-    <bean id="router.log" class="org.gridgain.grid.logger.log4j.GridLog4jLogger">
+    <bean id="router.log" class="org.apache.ignite.logger.log4j.GridLog4jLogger">
         <constructor-arg type="java.lang.String" value="modules/clients/src/test/resources/log4j.xml"/>
     </bean>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index 13df6ac..0068277 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -309,7 +309,7 @@
             Logger to use.
         -->
         <property name="gridLogger">
-            <bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger">
+            <bean class="org.apache.ignite.logger.log4j.GridLog4jLogger">
                 <constructor-arg type="java.lang.String" value="modules/clients/src/test/resources/log4j.xml"/>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index 648ca1a..c2255b4 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -276,7 +276,7 @@
             Logger to use.
         -->
         <property name="gridLogger">
-            <bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger">
+            <bean class="org.apache.ignite.logger.log4j.GridLog4jLogger">
                 <constructor-arg type="java.lang.String" value="modules/clients/src/test/resources/log4j.xml"/>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/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 8e0851f..d6bf914 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
@@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.child;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.logger.log4j.*;
 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.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/ee5e27b2/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jDailyRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jDailyRollingFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jDailyRollingFileAppender.java
new file mode 100644
index 0000000..39722f0
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jDailyRollingFileAppender.java
@@ -0,0 +1,69 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.apache.log4j.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Log4J {@link DailyRollingFileAppender} with added support for grid node IDs.
+ */
+public class GridLog4jDailyRollingFileAppender extends DailyRollingFileAppender implements GridLog4jFileAware {
+    /** Basic log file name. */
+    private String baseFileName;
+
+    /**
+     * Default constructor (does not do anything).
+     */
+    public GridLog4jDailyRollingFileAppender() {
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @param datePtrn Date pattern.
+     * @throws IOException If failed.
+     */
+    public GridLog4jDailyRollingFileAppender(Layout layout, String filename, String datePtrn) throws IOException {
+        super(layout, filename, datePtrn);
+
+        init();
+    }
+
+    /**
+     *
+     */
+    private void init() {
+        GridLog4jLogger.addAppender(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        if (baseFileName == null)
+            baseFileName = fileName;
+
+        fileName = filePathClos.apply(baseFileName);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
+        throws IOException {
+        if (baseFileName != null)
+            super.setFile(fileName, fileAppend, bufIO, bufSize);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jExternallyRolledFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jExternallyRolledFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jExternallyRolledFileAppender.java
new file mode 100644
index 0000000..95d7da9
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jExternallyRolledFileAppender.java
@@ -0,0 +1,55 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.apache.log4j.varia.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Log4J {@link ExternallyRolledFileAppender} with added support for grid node IDs.
+ */
+public class GridLog4jExternallyRolledFileAppender extends ExternallyRolledFileAppender implements GridLog4jFileAware {
+    /** Basic log file name. */
+    private String baseFileName;
+
+    /**
+     * Default constructor (does not do anything).
+     */
+    public GridLog4jExternallyRolledFileAppender() {
+        init();
+    }
+
+    /**
+     *
+     */
+    private void init() {
+        GridLog4jLogger.addAppender(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        if (baseFileName == null)
+            baseFileName = fileName;
+
+        fileName = filePathClos.apply(baseFileName);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
+        throws IOException {
+        if (baseFileName != null)
+            super.setFile(fileName, fileAppend, bufIO, bufSize);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAppender.java
new file mode 100644
index 0000000..f6a0aba
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAppender.java
@@ -0,0 +1,99 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.apache.log4j.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Log4J {@link FileAppender} with added support for grid node IDs.
+ */
+public class GridLog4jFileAppender extends FileAppender implements GridLog4jFileAware {
+    /** Basic log file name. */
+    private String baseFileName;
+
+    /**
+     * Default constructor (does not do anything).
+     */
+    public GridLog4jFileAppender() {
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @throws IOException If failed.
+     */
+    public GridLog4jFileAppender(Layout layout, String filename) throws IOException {
+        super(layout, filename);
+
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @param append Append flag.
+     * @throws IOException If failed.
+     */
+    public GridLog4jFileAppender(Layout layout, String filename, boolean append) throws IOException {
+        super(layout, filename, append);
+
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @param append Append flag.
+     * @param bufIO Buffered IO flag.
+     * @param bufSize Buffer size.
+     * @throws IOException If failed.
+     */
+    public GridLog4jFileAppender(Layout layout, String filename, boolean append, boolean bufIO, int bufSize)
+        throws IOException {
+        super(layout, filename, append, bufIO, bufSize);
+
+        init();
+    }
+
+    /**
+     *
+     */
+    private void init() {
+        GridLog4jLogger.addAppender(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
+        throws IOException {
+        if (baseFileName != null)
+            super.setFile(fileName, fileAppend, bufIO, bufSize);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        if (baseFileName == null)
+            baseFileName = fileName;
+
+        fileName = filePathClos.apply(baseFileName);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAware.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAware.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAware.java
new file mode 100644
index 0000000..4e9dc4c
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAware.java
@@ -0,0 +1,24 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+
+/**
+ * Interface for those loggers and appenders that evaluate their file paths lazily.
+ */
+interface GridLog4jFileAware {
+    /**
+     * Sets closure that later evaluate file path.
+     *
+     * @param filePathClos Closure that generates actual file path.
+     */
+    void updateFilePath(IgniteClosure<String, String> filePathClos);
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jLogger.java
new file mode 100644
index 0000000..56e7e05
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jLogger.java
@@ -0,0 +1,516 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.logger.*;
+import org.apache.log4j.*;
+import org.apache.log4j.varia.*;
+import org.apache.log4j.xml.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.lang.*;
+import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import static org.gridgain.grid.GridSystemProperties.*;
+
+/**
+ * Log4j-based implementation for logging. This logger should be used
+ * by loaders that have prefer <a target=_new href="http://logging.apache.org/log4j/docs/">log4j</a>-based logging.
+ * <p>
+ * Here is a typical example of configuring log4j logger in GridGain configuration file:
+ * <pre name="code" class="xml">
+ *      &lt;property name="gridLogger"&gt;
+ *          &lt;bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"&gt;
+ *              &lt;constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/&gt;
+ *          &lt;/bean>
+ *      &lt;/property&gt;
+ * </pre>
+ * and from your code:
+ * <pre name="code" class="java">
+ *      GridConfiguration cfg = new GridConfiguration();
+ *      ...
+ *      URL xml = U.resolveGridGainUrl("config/custom-log4j.xml");
+ *      GridLogger log = new GridLog4jLogger(xml);
+ *      ...
+ *      cfg.setGridLogger(log);
+ * </pre>
+ *
+ * Please take a look at <a target=_new href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4j 1.2</a>
+ * for additional information.
+ * <p>
+ * It's recommended to use GridGain logger injection instead of using/instantiating
+ * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
+ * injection.
+ */
+public class GridLog4jLogger extends GridMetadataAwareAdapter implements IgniteLogger, IgniteLoggerNodeIdAware,
+    GridLog4jFileAware {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Appenders. */
+    private static Collection<FileAppender> fileAppenders = new GridConcurrentHashSet<>();
+
+    /** */
+    private static volatile boolean inited;
+
+    /** */
+    private static volatile boolean quiet0;
+
+    /** */
+    private static final Object mux = new Object();
+
+    /** Logger implementation. */
+    @GridToStringExclude
+    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+    private Logger impl;
+
+    /** Path to configuration file. */
+    private final String path;
+
+    /** Quiet flag. */
+    private final boolean quiet;
+
+    /** Node ID. */
+    private UUID nodeId;
+
+    /**
+     * Creates new logger and automatically detects if root logger already
+     * has appenders configured. If it does not, the root logger will be
+     * configured with default appender (analogous to calling
+     * {@link #GridLog4jLogger(boolean) GridLog4jLogger(boolean)}
+     * with parameter {@code true}, otherwise, existing appenders will be used (analogous
+     * to calling {@link #GridLog4jLogger(boolean) GridLog4jLogger(boolean)}
+     * with parameter {@code false}).
+     */
+    public GridLog4jLogger() {
+        this(!isConfigured());
+    }
+
+    /**
+     * Creates new logger. If initialize parameter is {@code true} the Log4j
+     * logger will be initialized with default console appender and {@code INFO}
+     * log level.
+     *
+     * @param init If {@code true}, then a default console appender with
+     *      following pattern layout will be created: {@code %d{ABSOLUTE} %-5p [%c{1}] %m%n}.
+     *      If {@code false}, then no implicit initialization will take place,
+     *      and {@code Log4j} should be configured prior to calling this
+     *      constructor.
+     */
+    public GridLog4jLogger(boolean init) {
+        impl = Logger.getRootLogger();
+
+        if (init) {
+            // Implementation has already been inited, passing NULL.
+            addConsoleAppenderIfNeeded(Level.INFO, null);
+
+            quiet = quiet0;
+        }
+        else
+            quiet = true;
+
+        path = null;
+    }
+
+    /**
+     * Creates new logger with given implementation.
+     *
+     * @param impl Log4j implementation to use.
+     */
+    public GridLog4jLogger(final Logger impl) {
+        assert impl != null;
+
+        path = null;
+
+        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
+            @Override public Logger apply(Boolean init) {
+                return impl;
+            }
+        });
+
+        quiet = quiet0;
+    }
+
+    /**
+     * Creates new logger with given configuration {@code path}.
+     *
+     * @param path Path to log4j configuration XML file.
+     * @throws GridException Thrown in case logger can't be created.
+     */
+    public GridLog4jLogger(String path) throws GridException {
+        if (path == null)
+            throw new GridException("Configuration XML file for Log4j must be specified.");
+
+        this.path = path;
+
+        final URL cfgUrl = U.resolveGridGainUrl(path);
+
+        if (cfgUrl == null)
+            throw new GridException("Log4j configuration path was not found: " + path);
+
+        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
+            @Override public Logger apply(Boolean init) {
+                if (init)
+                    DOMConfigurator.configure(cfgUrl);
+
+                return Logger.getRootLogger();
+            }
+        });
+
+        quiet = quiet0;
+    }
+
+    /**
+     * Creates new logger with given configuration {@code cfgFile}.
+     *
+     * @param cfgFile Log4j configuration XML file.
+     * @throws GridException Thrown in case logger can't be created.
+     */
+    public GridLog4jLogger(File cfgFile) throws GridException {
+        if (cfgFile == null)
+            throw new GridException("Configuration XML file for Log4j must be specified.");
+
+        if (!cfgFile.exists() || cfgFile.isDirectory())
+            throw new GridException("Log4j configuration path was not found or is a directory: " + cfgFile);
+
+        path = cfgFile.getAbsolutePath();
+
+        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
+            @Override public Logger apply(Boolean init) {
+                if (init)
+                    DOMConfigurator.configure(path);
+
+                return Logger.getRootLogger();
+            }
+        });
+
+        quiet = quiet0;
+    }
+
+    /**
+     * Creates new logger with given configuration {@code cfgUrl}.
+     *
+     * @param cfgUrl URL for Log4j configuration XML file.
+     * @throws GridException Thrown in case logger can't be created.
+     */
+    public GridLog4jLogger(final URL cfgUrl) throws GridException {
+        if (cfgUrl == null)
+            throw new GridException("Configuration XML file for Log4j must be specified.");
+
+        path = null;
+
+        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
+            @Override public Logger apply(Boolean init) {
+                if (init)
+                    DOMConfigurator.configure(cfgUrl);
+
+                return Logger.getRootLogger();
+            }
+        });
+
+        quiet = quiet0;
+    }
+
+    /**
+     * Checks if Log4j is already configured within this VM or not.
+     *
+     * @return {@code True} if log4j was already configured, {@code false} otherwise.
+     */
+    public static boolean isConfigured() {
+        return Logger.getRootLogger().getAllAppenders().hasMoreElements();
+    }
+
+    /**
+     * Sets level for internal log4j implementation.
+     *
+     * @param level Log level to set.
+     */
+    public void setLevel(Level level) {
+        impl.setLevel(level);
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public String fileName() {
+        FileAppender fapp = F.first(fileAppenders);
+
+        return fapp != null ? fapp.getFile() : null;
+    }
+
+    /**
+     * Adds console appender when needed with some default logging settings.
+     *
+     * @param logLevel Optional log level.
+     * @param implInitC Optional log implementation init closure.
+     */
+    private void addConsoleAppenderIfNeeded(@Nullable Level logLevel,
+        @Nullable IgniteClosure<Boolean, Logger> implInitC) {
+        if (inited) {
+            if (implInitC != null)
+                // Do not init.
+                impl = implInitC.apply(false);
+
+            return;
+        }
+
+        synchronized (mux) {
+            if (inited) {
+                if (implInitC != null)
+                    // Do not init.
+                    impl = implInitC.apply(false);
+
+                return;
+            }
+
+            if (implInitC != null)
+                // Init logger impl.
+                impl = implInitC.apply(true);
+
+            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
+
+            boolean consoleAppenderFound = false;
+            Category rootCategory = null;
+            ConsoleAppender errAppender = null;
+
+            for (Category l = impl; l != null; ) {
+                if (!consoleAppenderFound) {
+                    for (Enumeration appenders = l.getAllAppenders(); appenders.hasMoreElements(); ) {
+                        Appender appender = (Appender)appenders.nextElement();
+
+                        if (appender instanceof ConsoleAppender) {
+                            if ("CONSOLE_ERR".equals(appender.getName())) {
+                                // Treat CONSOLE_ERR appender as a system one and don't count it.
+                                errAppender = (ConsoleAppender)appender;
+
+                                continue;
+                            }
+
+                            consoleAppenderFound = true;
+
+                            break;
+                        }
+                    }
+                }
+
+                if (l.getParent() == null) {
+                    rootCategory = l;
+
+                    break;
+                }
+                else
+                    l = l.getParent();
+            }
+
+            if (consoleAppenderFound && quiet)
+                // User configured console appender, but log is quiet.
+                quiet = false;
+
+            if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"))) {
+                // Console appender not found => we've looked through all categories up to root.
+                assert rootCategory != null;
+
+                // User launched gridgain in verbose mode and did not add console appender with INFO level
+                // to configuration and did not set GG_CONSOLE_APPENDER to false.
+                if (errAppender != null) {
+                    rootCategory.addAppender(createConsoleAppender(Level.INFO));
+
+                    if (errAppender.getThreshold() == Level.ERROR)
+                        errAppender.setThreshold(Level.WARN);
+                }
+                else
+                    // No error console appender => create console appender with no level limit.
+                    rootCategory.addAppender(createConsoleAppender(Level.OFF));
+
+                if (logLevel != null)
+                    impl.setLevel(logLevel);
+            }
+
+            quiet0 = quiet;
+            inited = true;
+        }
+    }
+
+    /**
+     * Creates console appender with some reasonable default logging settings.
+     *
+     * @param maxLevel Max logging level.
+     * @return New console appender.
+     */
+    private Appender createConsoleAppender(Level maxLevel) {
+        String fmt = "[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n";
+
+        // Configure output that should go to System.out
+        Appender app = new ConsoleAppender(new PatternLayout(fmt), ConsoleAppender.SYSTEM_OUT);
+
+        LevelRangeFilter lvlFilter = new LevelRangeFilter();
+
+        lvlFilter.setLevelMin(Level.TRACE);
+        lvlFilter.setLevelMax(maxLevel);
+
+        app.addFilter(lvlFilter);
+
+        return app;
+    }
+
+    /**
+     * Adds file appender.
+     *
+     * @param a Appender.
+     */
+    public static void addAppender(FileAppender a) {
+        A.notNull(a, "a");
+
+        fileAppenders.add(a);
+    }
+
+    /**
+     * Removes file appender.
+     *
+     * @param a Appender.
+     */
+    public static void removeAppender(FileAppender a) {
+        A.notNull(a, "a");
+
+        fileAppenders.remove(a);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void setNodeId(UUID nodeId) {
+        A.notNull(nodeId, "nodeId");
+
+        this.nodeId = nodeId;
+
+        updateFilePath(new GridLog4jNodeIdFilePath(nodeId));
+    }
+
+    /** {@inheritDoc} */
+    @Override public UUID getNodeId() {
+        return nodeId;
+    }
+
+    /**
+     * Gets files for all registered file appenders.
+     *
+     * @return List of files.
+     */
+    public static Collection<String> logFiles() {
+        Collection<String> res = new ArrayList<>(fileAppenders.size());
+
+        for (FileAppender a : fileAppenders)
+            res.add(a.getFile());
+
+        return res;
+    }
+
+    /**
+     * 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.apache.ignite.IgniteLogger} wrapper around log4j logger.
+     */
+    @Override public GridLog4jLogger getLogger(Object ctgr) {
+        return new GridLog4jLogger(ctgr == null ? Logger.getRootLogger() :
+            ctgr instanceof Class ? Logger.getLogger(((Class<?>)ctgr).getName()) :
+                Logger.getLogger(ctgr.toString()));
+    }
+
+    /** {@inheritDoc} */
+    @Override public void trace(String msg) {
+        if (!impl.isTraceEnabled())
+            warning("Logging at TRACE level without checking if TRACE level is enabled: " + msg);
+
+        impl.trace(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void debug(String msg) {
+        if (!impl.isDebugEnabled())
+            warning("Logging at DEBUG level without checking if DEBUG level is enabled: " + msg);
+
+        impl.debug(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void info(String msg) {
+        if (!impl.isInfoEnabled())
+            warning("Logging at INFO level without checking if INFO level is enabled: " + msg);
+
+        impl.info(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg) {
+        impl.warn(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg, @Nullable Throwable e) {
+        impl.warn(msg, e);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg) {
+        impl.error(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg, @Nullable Throwable e) {
+        impl.error(msg, e);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isTraceEnabled() {
+        return impl.isTraceEnabled();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isDebugEnabled() {
+        return impl.isDebugEnabled();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isInfoEnabled() {
+        return impl.isInfoEnabled();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isQuiet() {
+        return quiet;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(GridLog4jLogger.class, this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        for (FileAppender a : fileAppenders) {
+            if (a instanceof GridLog4jFileAware) {
+                ((GridLog4jFileAware)a).updateFilePath(filePathClos);
+
+                a.activateOptions();
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jNodeIdFilePath.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jNodeIdFilePath.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jNodeIdFilePath.java
new file mode 100644
index 0000000..b741808
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jNodeIdFilePath.java
@@ -0,0 +1,56 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Closure that generates file path adding node id to filename as a suffix.
+ */
+class GridLog4jNodeIdFilePath implements IgniteClosure<String, String> {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Node id. */
+    private final UUID nodeId;
+
+    /**
+     * Creates new instance.
+     *
+     * @param id Node id.
+     */
+    GridLog4jNodeIdFilePath(UUID id) {
+        nodeId = id;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String apply(String oldPath) {
+        if (!F.isEmpty(U.GRIDGAIN_LOG_DIR))
+            return U.nodeIdLogFileName(nodeId, new File(U.GRIDGAIN_LOG_DIR, "gridgain.log").getAbsolutePath());
+
+        if (oldPath != null) // fileName could be null if GRIDGAIN_HOME is not defined.
+            return U.nodeIdLogFileName(nodeId, oldPath);
+
+        String tmpDir = GridSystemProperties.getString("java.io.tmpdir");
+
+        if (tmpDir != null)
+            return U.nodeIdLogFileName(nodeId, new File(tmpDir, "gridgain.log").getAbsolutePath());
+
+        System.err.println("Failed to get tmp directory for log file.");
+
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jRollingFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jRollingFileAppender.java
new file mode 100644
index 0000000..cb00de8
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jRollingFileAppender.java
@@ -0,0 +1,82 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.apache.log4j.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Log4J {@link RollingFileAppender} with added support for grid node IDs.
+ */
+public class GridLog4jRollingFileAppender extends RollingFileAppender implements GridLog4jFileAware {
+    /** Basic log file name. */
+    private String baseFileName;
+
+    /**
+     * Default constructor (does not do anything).
+     */
+    public GridLog4jRollingFileAppender() {
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @throws IOException If failed.
+     */
+    public GridLog4jRollingFileAppender(Layout layout, String filename) throws IOException {
+        super(layout, filename);
+
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @param append Append flag.
+     * @throws IOException If failed.
+     */
+    public GridLog4jRollingFileAppender(Layout layout, String filename, boolean append) throws IOException {
+        super(layout, filename, append);
+
+        init();
+    }
+
+    /**
+     * Initializes appender.
+     */
+    private void init() {
+        GridLog4jLogger.addAppender(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        if (baseFileName == null)
+            baseFileName = fileName;
+
+        fileName = filePathClos.apply(baseFileName);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
+        throws IOException {
+        if (baseFileName != null)
+            super.setFile(fileName, fileAppend, bufIO, bufSize);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/package.html
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/package.html b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/package.html
new file mode 100644
index 0000000..e6e24ee
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains <b>default</b> Log4j implementation for logging.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jDailyRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jDailyRollingFileAppender.java b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jDailyRollingFileAppender.java
deleted file mode 100644
index 9320eaf..0000000
--- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jDailyRollingFileAppender.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.apache.log4j.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Log4J {@link DailyRollingFileAppender} with added support for grid node IDs.
- */
-public class GridLog4jDailyRollingFileAppender extends DailyRollingFileAppender implements GridLog4jFileAware {
-    /** Basic log file name. */
-    private String baseFileName;
-
-    /**
-     * Default constructor (does not do anything).
-     */
-    public GridLog4jDailyRollingFileAppender() {
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @param datePtrn Date pattern.
-     * @throws IOException If failed.
-     */
-    public GridLog4jDailyRollingFileAppender(Layout layout, String filename, String datePtrn) throws IOException {
-        super(layout, filename, datePtrn);
-
-        init();
-    }
-
-    /**
-     *
-     */
-    private void init() {
-        GridLog4jLogger.addAppender(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        if (baseFileName == null)
-            baseFileName = fileName;
-
-        fileName = filePathClos.apply(baseFileName);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
-        throws IOException {
-        if (baseFileName != null)
-            super.setFile(fileName, fileAppend, bufIO, bufSize);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jExternallyRolledFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jExternallyRolledFileAppender.java b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jExternallyRolledFileAppender.java
deleted file mode 100644
index 76269d1..0000000
--- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jExternallyRolledFileAppender.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.apache.log4j.varia.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Log4J {@link ExternallyRolledFileAppender} with added support for grid node IDs.
- */
-public class GridLog4jExternallyRolledFileAppender extends ExternallyRolledFileAppender implements GridLog4jFileAware {
-    /** Basic log file name. */
-    private String baseFileName;
-
-    /**
-     * Default constructor (does not do anything).
-     */
-    public GridLog4jExternallyRolledFileAppender() {
-        init();
-    }
-
-    /**
-     *
-     */
-    private void init() {
-        GridLog4jLogger.addAppender(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        if (baseFileName == null)
-            baseFileName = fileName;
-
-        fileName = filePathClos.apply(baseFileName);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
-        throws IOException {
-        if (baseFileName != null)
-            super.setFile(fileName, fileAppend, bufIO, bufSize);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jFileAppender.java b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jFileAppender.java
deleted file mode 100644
index a54b54d..0000000
--- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jFileAppender.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.apache.log4j.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Log4J {@link FileAppender} with added support for grid node IDs.
- */
-public class GridLog4jFileAppender extends FileAppender implements GridLog4jFileAware {
-    /** Basic log file name. */
-    private String baseFileName;
-
-    /**
-     * Default constructor (does not do anything).
-     */
-    public GridLog4jFileAppender() {
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @throws IOException If failed.
-     */
-    public GridLog4jFileAppender(Layout layout, String filename) throws IOException {
-        super(layout, filename);
-
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @param append Append flag.
-     * @throws IOException If failed.
-     */
-    public GridLog4jFileAppender(Layout layout, String filename, boolean append) throws IOException {
-        super(layout, filename, append);
-
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @param append Append flag.
-     * @param bufIO Buffered IO flag.
-     * @param bufSize Buffer size.
-     * @throws IOException If failed.
-     */
-    public GridLog4jFileAppender(Layout layout, String filename, boolean append, boolean bufIO, int bufSize)
-        throws IOException {
-        super(layout, filename, append, bufIO, bufSize);
-
-        init();
-    }
-
-    /**
-     *
-     */
-    private void init() {
-        GridLog4jLogger.addAppender(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
-        throws IOException {
-        if (baseFileName != null)
-            super.setFile(fileName, fileAppend, bufIO, bufSize);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        if (baseFileName == null)
-            baseFileName = fileName;
-
-        fileName = filePathClos.apply(baseFileName);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jFileAware.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jFileAware.java b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jFileAware.java
deleted file mode 100644
index 63b89e2..0000000
--- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jFileAware.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.log4j;
-
-import org.apache.ignite.lang.*;
-
-/**
- * Interface for those loggers and appenders that evaluate their file paths lazily.
- */
-interface GridLog4jFileAware {
-    /**
-     * Sets closure that later evaluate file path.
-     *
-     * @param filePathClos Closure that generates actual file path.
-     */
-    void updateFilePath(IgniteClosure<String, String> filePathClos);
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/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
deleted file mode 100644
index c0bbdaa..0000000
--- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jLogger.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.log4j;
-
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.logger.*;
-import org.apache.log4j.*;
-import org.apache.log4j.varia.*;
-import org.apache.log4j.xml.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.lang.*;
-import org.gridgain.grid.util.tostring.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import static org.gridgain.grid.GridSystemProperties.*;
-
-/**
- * Log4j-based implementation for logging. This logger should be used
- * by loaders that have prefer <a target=_new href="http://logging.apache.org/log4j/docs/">log4j</a>-based logging.
- * <p>
- * Here is a typical example of configuring log4j logger in GridGain configuration file:
- * <pre name="code" class="xml">
- *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"&gt;
- *              &lt;constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/&gt;
- *          &lt;/bean>
- *      &lt;/property&gt;
- * </pre>
- * and from your code:
- * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
- *      ...
- *      URL xml = U.resolveGridGainUrl("config/custom-log4j.xml");
- *      GridLogger log = new GridLog4jLogger(xml);
- *      ...
- *      cfg.setGridLogger(log);
- * </pre>
- *
- * Please take a look at <a target=_new href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4j 1.2</a>
- * for additional information.
- * <p>
- * It's recommended to use GridGain logger injection instead of using/instantiating
- * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
- * injection.
- */
-public class GridLog4jLogger extends GridMetadataAwareAdapter implements IgniteLogger, IgniteLoggerNodeIdAware,
-    GridLog4jFileAware {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Appenders. */
-    private static Collection<FileAppender> fileAppenders = new GridConcurrentHashSet<>();
-
-    /** */
-    private static volatile boolean inited;
-
-    /** */
-    private static volatile boolean quiet0;
-
-    /** */
-    private static final Object mux = new Object();
-
-    /** Logger implementation. */
-    @GridToStringExclude
-    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-    private Logger impl;
-
-    /** Path to configuration file. */
-    private final String path;
-
-    /** Quiet flag. */
-    private final boolean quiet;
-
-    /** Node ID. */
-    private UUID nodeId;
-
-    /**
-     * Creates new logger and automatically detects if root logger already
-     * has appenders configured. If it does not, the root logger will be
-     * configured with default appender (analogous to calling
-     * {@link #GridLog4jLogger(boolean) GridLog4jLogger(boolean)}
-     * with parameter {@code true}, otherwise, existing appenders will be used (analogous
-     * to calling {@link #GridLog4jLogger(boolean) GridLog4jLogger(boolean)}
-     * with parameter {@code false}).
-     */
-    public GridLog4jLogger() {
-        this(!isConfigured());
-    }
-
-    /**
-     * Creates new logger. If initialize parameter is {@code true} the Log4j
-     * logger will be initialized with default console appender and {@code INFO}
-     * log level.
-     *
-     * @param init If {@code true}, then a default console appender with
-     *      following pattern layout will be created: {@code %d{ABSOLUTE} %-5p [%c{1}] %m%n}.
-     *      If {@code false}, then no implicit initialization will take place,
-     *      and {@code Log4j} should be configured prior to calling this
-     *      constructor.
-     */
-    public GridLog4jLogger(boolean init) {
-        impl = Logger.getRootLogger();
-
-        if (init) {
-            // Implementation has already been inited, passing NULL.
-            addConsoleAppenderIfNeeded(Level.INFO, null);
-
-            quiet = quiet0;
-        }
-        else
-            quiet = true;
-
-        path = null;
-    }
-
-    /**
-     * Creates new logger with given implementation.
-     *
-     * @param impl Log4j implementation to use.
-     */
-    public GridLog4jLogger(final Logger impl) {
-        assert impl != null;
-
-        path = null;
-
-        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
-            @Override public Logger apply(Boolean init) {
-                return impl;
-            }
-        });
-
-        quiet = quiet0;
-    }
-
-    /**
-     * Creates new logger with given configuration {@code path}.
-     *
-     * @param path Path to log4j configuration XML file.
-     * @throws GridException Thrown in case logger can't be created.
-     */
-    public GridLog4jLogger(String path) throws GridException {
-        if (path == null)
-            throw new GridException("Configuration XML file for Log4j must be specified.");
-
-        this.path = path;
-
-        final URL cfgUrl = U.resolveGridGainUrl(path);
-
-        if (cfgUrl == null)
-            throw new GridException("Log4j configuration path was not found: " + path);
-
-        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
-            @Override public Logger apply(Boolean init) {
-                if (init)
-                    DOMConfigurator.configure(cfgUrl);
-
-                return Logger.getRootLogger();
-            }
-        });
-
-        quiet = quiet0;
-    }
-
-    /**
-     * Creates new logger with given configuration {@code cfgFile}.
-     *
-     * @param cfgFile Log4j configuration XML file.
-     * @throws GridException Thrown in case logger can't be created.
-     */
-    public GridLog4jLogger(File cfgFile) throws GridException {
-        if (cfgFile == null)
-            throw new GridException("Configuration XML file for Log4j must be specified.");
-
-        if (!cfgFile.exists() || cfgFile.isDirectory())
-            throw new GridException("Log4j configuration path was not found or is a directory: " + cfgFile);
-
-        path = cfgFile.getAbsolutePath();
-
-        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
-            @Override public Logger apply(Boolean init) {
-                if (init)
-                    DOMConfigurator.configure(path);
-
-                return Logger.getRootLogger();
-            }
-        });
-
-        quiet = quiet0;
-    }
-
-    /**
-     * Creates new logger with given configuration {@code cfgUrl}.
-     *
-     * @param cfgUrl URL for Log4j configuration XML file.
-     * @throws GridException Thrown in case logger can't be created.
-     */
-    public GridLog4jLogger(final URL cfgUrl) throws GridException {
-        if (cfgUrl == null)
-            throw new GridException("Configuration XML file for Log4j must be specified.");
-
-        path = null;
-
-        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
-            @Override public Logger apply(Boolean init) {
-                if (init)
-                    DOMConfigurator.configure(cfgUrl);
-
-                return Logger.getRootLogger();
-            }
-        });
-
-        quiet = quiet0;
-    }
-
-    /**
-     * Checks if Log4j is already configured within this VM or not.
-     *
-     * @return {@code True} if log4j was already configured, {@code false} otherwise.
-     */
-    public static boolean isConfigured() {
-        return Logger.getRootLogger().getAllAppenders().hasMoreElements();
-    }
-
-    /**
-     * Sets level for internal log4j implementation.
-     *
-     * @param level Log level to set.
-     */
-    public void setLevel(Level level) {
-        impl.setLevel(level);
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public String fileName() {
-        FileAppender fapp = F.first(fileAppenders);
-
-        return fapp != null ? fapp.getFile() : null;
-    }
-
-    /**
-     * Adds console appender when needed with some default logging settings.
-     *
-     * @param logLevel Optional log level.
-     * @param implInitC Optional log implementation init closure.
-     */
-    private void addConsoleAppenderIfNeeded(@Nullable Level logLevel,
-        @Nullable IgniteClosure<Boolean, Logger> implInitC) {
-        if (inited) {
-            if (implInitC != null)
-                // Do not init.
-                impl = implInitC.apply(false);
-
-            return;
-        }
-
-        synchronized (mux) {
-            if (inited) {
-                if (implInitC != null)
-                    // Do not init.
-                    impl = implInitC.apply(false);
-
-                return;
-            }
-
-            if (implInitC != null)
-                // Init logger impl.
-                impl = implInitC.apply(true);
-
-            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
-
-            boolean consoleAppenderFound = false;
-            Category rootCategory = null;
-            ConsoleAppender errAppender = null;
-
-            for (Category l = impl; l != null; ) {
-                if (!consoleAppenderFound) {
-                    for (Enumeration appenders = l.getAllAppenders(); appenders.hasMoreElements(); ) {
-                        Appender appender = (Appender)appenders.nextElement();
-
-                        if (appender instanceof ConsoleAppender) {
-                            if ("CONSOLE_ERR".equals(appender.getName())) {
-                                // Treat CONSOLE_ERR appender as a system one and don't count it.
-                                errAppender = (ConsoleAppender)appender;
-
-                                continue;
-                            }
-
-                            consoleAppenderFound = true;
-
-                            break;
-                        }
-                    }
-                }
-
-                if (l.getParent() == null) {
-                    rootCategory = l;
-
-                    break;
-                }
-                else
-                    l = l.getParent();
-            }
-
-            if (consoleAppenderFound && quiet)
-                // User configured console appender, but log is quiet.
-                quiet = false;
-
-            if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"))) {
-                // Console appender not found => we've looked through all categories up to root.
-                assert rootCategory != null;
-
-                // User launched gridgain in verbose mode and did not add console appender with INFO level
-                // to configuration and did not set GG_CONSOLE_APPENDER to false.
-                if (errAppender != null) {
-                    rootCategory.addAppender(createConsoleAppender(Level.INFO));
-
-                    if (errAppender.getThreshold() == Level.ERROR)
-                        errAppender.setThreshold(Level.WARN);
-                }
-                else
-                    // No error console appender => create console appender with no level limit.
-                    rootCategory.addAppender(createConsoleAppender(Level.OFF));
-
-                if (logLevel != null)
-                    impl.setLevel(logLevel);
-            }
-
-            quiet0 = quiet;
-            inited = true;
-        }
-    }
-
-    /**
-     * Creates console appender with some reasonable default logging settings.
-     *
-     * @param maxLevel Max logging level.
-     * @return New console appender.
-     */
-    private Appender createConsoleAppender(Level maxLevel) {
-        String fmt = "[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n";
-
-        // Configure output that should go to System.out
-        Appender app = new ConsoleAppender(new PatternLayout(fmt), ConsoleAppender.SYSTEM_OUT);
-
-        LevelRangeFilter lvlFilter = new LevelRangeFilter();
-
-        lvlFilter.setLevelMin(Level.TRACE);
-        lvlFilter.setLevelMax(maxLevel);
-
-        app.addFilter(lvlFilter);
-
-        return app;
-    }
-
-    /**
-     * Adds file appender.
-     *
-     * @param a Appender.
-     */
-    public static void addAppender(FileAppender a) {
-        A.notNull(a, "a");
-
-        fileAppenders.add(a);
-    }
-
-    /**
-     * Removes file appender.
-     *
-     * @param a Appender.
-     */
-    public static void removeAppender(FileAppender a) {
-        A.notNull(a, "a");
-
-        fileAppenders.remove(a);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void setNodeId(UUID nodeId) {
-        A.notNull(nodeId, "nodeId");
-
-        this.nodeId = nodeId;
-
-        updateFilePath(new GridLog4jNodeIdFilePath(nodeId));
-    }
-
-    /** {@inheritDoc} */
-    @Override public UUID getNodeId() {
-        return nodeId;
-    }
-
-    /**
-     * Gets files for all registered file appenders.
-     *
-     * @return List of files.
-     */
-    public static Collection<String> logFiles() {
-        Collection<String> res = new ArrayList<>(fileAppenders.size());
-
-        for (FileAppender a : fileAppenders)
-            res.add(a.getFile());
-
-        return res;
-    }
-
-    /**
-     * 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.apache.ignite.IgniteLogger} wrapper around log4j logger.
-     */
-    @Override public GridLog4jLogger getLogger(Object ctgr) {
-        return new GridLog4jLogger(ctgr == null ? Logger.getRootLogger() :
-            ctgr instanceof Class ? Logger.getLogger(((Class<?>)ctgr).getName()) :
-                Logger.getLogger(ctgr.toString()));
-    }
-
-    /** {@inheritDoc} */
-    @Override public void trace(String msg) {
-        if (!impl.isTraceEnabled())
-            warning("Logging at TRACE level without checking if TRACE level is enabled: " + msg);
-
-        impl.trace(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void debug(String msg) {
-        if (!impl.isDebugEnabled())
-            warning("Logging at DEBUG level without checking if DEBUG level is enabled: " + msg);
-
-        impl.debug(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void info(String msg) {
-        if (!impl.isInfoEnabled())
-            warning("Logging at INFO level without checking if INFO level is enabled: " + msg);
-
-        impl.info(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg) {
-        impl.warn(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg, @Nullable Throwable e) {
-        impl.warn(msg, e);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg) {
-        impl.error(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg, @Nullable Throwable e) {
-        impl.error(msg, e);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isTraceEnabled() {
-        return impl.isTraceEnabled();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isDebugEnabled() {
-        return impl.isDebugEnabled();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isInfoEnabled() {
-        return impl.isInfoEnabled();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isQuiet() {
-        return quiet;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridLog4jLogger.class, this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        for (FileAppender a : fileAppenders) {
-            if (a instanceof GridLog4jFileAware) {
-                ((GridLog4jFileAware)a).updateFilePath(filePathClos);
-
-                a.activateOptions();
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jNodeIdFilePath.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jNodeIdFilePath.java b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jNodeIdFilePath.java
deleted file mode 100644
index 7d6c3dd..0000000
--- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jNodeIdFilePath.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Closure that generates file path adding node id to filename as a suffix.
- */
-class GridLog4jNodeIdFilePath implements IgniteClosure<String, String> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Node id. */
-    private final UUID nodeId;
-
-    /**
-     * Creates new instance.
-     *
-     * @param id Node id.
-     */
-    GridLog4jNodeIdFilePath(UUID id) {
-        nodeId = id;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String apply(String oldPath) {
-        if (!F.isEmpty(U.GRIDGAIN_LOG_DIR))
-            return U.nodeIdLogFileName(nodeId, new File(U.GRIDGAIN_LOG_DIR, "gridgain.log").getAbsolutePath());
-
-        if (oldPath != null) // fileName could be null if GRIDGAIN_HOME is not defined.
-            return U.nodeIdLogFileName(nodeId, oldPath);
-
-        String tmpDir = GridSystemProperties.getString("java.io.tmpdir");
-
-        if (tmpDir != null)
-            return U.nodeIdLogFileName(nodeId, new File(tmpDir, "gridgain.log").getAbsolutePath());
-
-        System.err.println("Failed to get tmp directory for log file.");
-
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jRollingFileAppender.java b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jRollingFileAppender.java
deleted file mode 100644
index 91e8672..0000000
--- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/GridLog4jRollingFileAppender.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.apache.log4j.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Log4J {@link RollingFileAppender} with added support for grid node IDs.
- */
-public class GridLog4jRollingFileAppender extends RollingFileAppender implements GridLog4jFileAware {
-    /** Basic log file name. */
-    private String baseFileName;
-
-    /**
-     * Default constructor (does not do anything).
-     */
-    public GridLog4jRollingFileAppender() {
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @throws IOException If failed.
-     */
-    public GridLog4jRollingFileAppender(Layout layout, String filename) throws IOException {
-        super(layout, filename);
-
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @param append Append flag.
-     * @throws IOException If failed.
-     */
-    public GridLog4jRollingFileAppender(Layout layout, String filename, boolean append) throws IOException {
-        super(layout, filename, append);
-
-        init();
-    }
-
-    /**
-     * Initializes appender.
-     */
-    private void init() {
-        GridLog4jLogger.addAppender(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        if (baseFileName == null)
-            baseFileName = fileName;
-
-        fileName = filePathClos.apply(baseFileName);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
-        throws IOException {
-        if (baseFileName != null)
-            super.setFile(fileName, fileAppend, bufIO, bufSize);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/package.html
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/package.html b/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/package.html
deleted file mode 100644
index e6e24ee..0000000
--- a/modules/log4j/src/main/java/org/gridgain/grid/logger/log4j/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains <b>default</b> Log4j implementation for logging.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java
index 357e552..83a5d3b 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java
@@ -12,6 +12,7 @@ package org.gridgain.grid.logger.log4j;
 import junit.framework.*;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.logger.log4j.*;
 import org.apache.log4j.*;
 import org.apache.log4j.varia.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/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 c092abe..54ea5c1 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
@@ -11,6 +11,7 @@ package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
 import org.apache.ignite.*;
+import org.apache.ignite.logger.log4j.*;
 import org.apache.log4j.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
index 32f0355..fa82eb1 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
 import org.apache.ignite.*;
+import org.apache.ignite.logger.log4j.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
index 27780f7..0457d54 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
 import org.apache.ignite.*;
+import org.apache.ignite.logger.log4j.*;
 import org.gridgain.testframework.junits.common.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
index 0cf5590..951b920 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
 import org.apache.ignite.*;
+import org.apache.ignite.logger.log4j.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ee5e27b2/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
index 1c89be9..2b5a0a9 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.logger.log4j;
 
 import junit.framework.*;
 import org.apache.ignite.*;
+import org.apache.ignite.logger.log4j.*;
 import org.gridgain.testframework.junits.common.*;
 
 /**


[52/53] [abbrv] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into gg-9470-rename-1

Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into gg-9470-rename-1


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

Branch: refs/heads/master
Commit: e81613481d1f62c0a3cd589b564228e128e4ea98
Parents: 2d0728e 96aa517
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 01:09:38 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 01:09:38 2014 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------



[29/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: f997c33bd6578111731ef0476cfaf46e5310bd05
Parents: 40cf54f
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:11:47 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:11:47 2014 +0300

----------------------------------------------------------------------
 .../scala/org/gridgain/scalar/ScalarConversions.scala     |  2 --
 .../org/gridgain/scalar/lang/ScalarAbsPredicateX.scala    |  1 -
 .../scala/org/gridgain/scalar/lang/ScalarClosure2X.scala  |  1 -
 .../scala/org/gridgain/scalar/lang/ScalarClosure3X.scala  |  1 -
 .../scala/org/gridgain/scalar/lang/ScalarClosureX.scala   |  1 -
 .../org/gridgain/scalar/lang/ScalarInClosure2X.scala      |  1 -
 .../org/gridgain/scalar/lang/ScalarInClosure3X.scala      |  1 -
 .../scala/org/gridgain/scalar/lang/ScalarInClosureX.scala |  1 -
 .../org/gridgain/scalar/lang/ScalarOutClosureX.scala      |  1 -
 .../org/gridgain/scalar/lang/ScalarPredicate2X.scala      |  1 -
 .../org/gridgain/scalar/lang/ScalarPredicate3X.scala      |  1 -
 .../scala/org/gridgain/scalar/lang/ScalarPredicateX.scala |  1 -
 .../gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala |  1 -
 .../org/gridgain/scalar/pimps/ScalarProjectionPimp.scala  |  1 -
 .../scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala |  1 -
 .../org/gridgain/scalar/tests/ScalarConversionsSpec.scala |  1 -
 .../gridgain/visor/commands/alert/VisorAlertCommand.scala |  1 -
 .../src/main/scala/org/gridgain/visor/visor.scala         | 10 +++++-----
 .../scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala   |  1 +
 .../visor/commands/alert/VisorAlertCommandSpec.scala      |  1 +
 .../visor/commands/cache/VisorCacheClearCommandSpec.scala |  1 +
 .../visor/commands/cache/VisorCacheCommandSpec.scala      |  1 +
 .../commands/cache/VisorCacheCompactCommandSpec.scala     |  1 +
 .../visor/commands/cswap/VisorCacheSwapCommandSpec.scala  |  1 +
 .../visor/commands/disco/VisorDiscoveryCommandSpec.scala  |  1 +
 .../visor/commands/tasks/VisorTasksCommandSpec.scala      |  2 +-
 26 files changed, 13 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala
index 377a4e5..edb5093 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala
@@ -15,9 +15,7 @@ import org.apache.ignite.Ignite
 import org.apache.ignite.cluster.ClusterGroup
 import org.apache.ignite.compute.ComputeJob
 import org.apache.ignite.lang._
-import org.gridgain.grid.lang._
 import org.gridgain.grid.cache._
-import org.gridgain.grid._
 import org.gridgain.scalar.lang._
 import org.gridgain.scalar.pimps._
 import org.jetbrains.annotations._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala
index 3e3147a..a161249 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.GridAbsPredicateX
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala
index 53dc324..6702e61 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.IgniteClosure2X
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala
index 3bbbb94..15e4745 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.GridClosure3X
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala
index 9e994f7..e1cf7c5 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.IgniteClosureX
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala
index 14ea4c2..481d358 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.IgniteInClosure2X
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala
index 2c8a6f8..f70d09b 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.GridInClosure3X
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala
index b593298..7ac6a69 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.IgniteInClosureX
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala
index 09a6eee..f036e24 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala
@@ -12,7 +12,6 @@
 package org.gridgain.scalar.lang
 
 import org.gridgain.grid._
-import lang._
 import org.gridgain.grid.util.lang.IgniteOutClosureX
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala
index b482912..b24190e 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.IgnitePredicate2X
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala
index 3a1ab65..21db9ac 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.GridPredicate3X
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala
index 7b9cebe..e0fffff 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala
@@ -11,7 +11,6 @@
 
 package org.gridgain.scalar.lang
 
-import org.gridgain.grid.lang._
 import org.gridgain.grid._
 import org.gridgain.grid.util.lang.IgnitePredicateX
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala
index f77b306..fbd2190 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala
@@ -19,7 +19,6 @@ import collection.JavaConversions._
 import org.jetbrains.annotations.Nullable
 import org.gridgain.grid._
 import org.gridgain.grid.cache._
-import org.gridgain.grid.lang._
 import org.gridgain.grid.util.lang.{GridFunc => F}
 import org.gridgain.grid.util.scala.impl
 import org.gridgain.scalar._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala
index 98df863..325e63a 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala
@@ -14,7 +14,6 @@ package org.gridgain.scalar.pimps
 import org.apache.ignite.cluster.{ClusterGroup, ClusterNode}
 import org.apache.ignite.lang.{IgniteFutureCancelledException, IgniteFuture, IgnitePredicate}
 import org.gridgain.grid._
-import org.gridgain.grid.lang._
 import org.jetbrains.annotations._
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala
index 4b727cd..85c6860 100644
--- a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala
+++ b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala
@@ -18,7 +18,6 @@ import scalar._
 import org.scalatest.matchers._
 import org.scalatest._
 import junit.JUnitRunner
-import org.gridgain.grid.events.GridEventType
 import IgniteEventType._
 import collection.JavaConversions._
 import org.junit.runner.RunWith

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala
index 032d02d..1156ad6 100644
--- a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala
+++ b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala
@@ -16,7 +16,6 @@ import org.scalatest.FlatSpec
 import org.scalatest.matchers.ShouldMatchers
 import org.gridgain.scalar._
 import scalar._
-import org.gridgain.grid.lang._
 import java.util.concurrent.atomic._
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala
index af0e607..18b9b40 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala
@@ -15,7 +15,6 @@ import org.apache.ignite.cluster.ClusterNode
 import org.apache.ignite.events.{IgniteEvent, IgniteDiscoveryEvent, IgniteEventType}
 import org.apache.ignite.lang.IgnitePredicate
 import org.gridgain.grid._
-import org.gridgain.grid.events._
 import IgniteEventType._
 import org.gridgain.grid.util.lang.{GridFunc => F}
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
index be44cae..32d25d5 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala
@@ -11,6 +11,7 @@
 
 package org.gridgain.visor
 
+import org.apache.ignite.{IgniteState, Ignition}
 import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode}
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.apache.ignite.events.{IgniteEvent, IgniteDiscoveryEvent, IgniteEventType}
@@ -26,7 +27,6 @@ import java.util.{HashSet => JHashSet, _}
 
 import org.gridgain.grid.GridSystemProperties._
 import IgniteEventType._
-import org.gridgain.grid.events._
 import org.gridgain.grid.kernal.GridComponentType._
 import org.gridgain.grid.kernal.GridNodeAttributes._
 import org.gridgain.grid.kernal.processors.spring.GridSpringProcessor
@@ -37,7 +37,7 @@ import org.gridgain.grid.thread._
 import org.gridgain.grid.util.lang.{GridFunc => F}
 import org.gridgain.grid.util.typedef._
 import org.gridgain.grid.util.{GridConfigurationFinder, GridUtils => U}
-import org.gridgain.grid.GridException
+import org.gridgain.grid._
 import org.gridgain.visor.commands.{VisorConsoleCommand, VisorTextTable}
 import org.jetbrains.annotations.Nullable
 
@@ -1701,8 +1701,8 @@ object visor extends VisorTag {
         grid.events().localListen(nodeSegLsnr, EVT_NODE_SEGMENTED)
 
         nodeStopLsnr = new GridGainListener {
-            def onStateChange(name: String, state: GridGainState) {
-                if (name == grid.name && state == GridGainState.STOPPED) {
+            def onStateChange(name: String, state: IgniteState) {
+                if (name == grid.name && state == IgniteState.STOPPED) {
                     warn("Closing Visor console due to stopping of host grid instance.")
 
                     nl()
@@ -2155,7 +2155,7 @@ object visor extends VisorTag {
             // Call all close callbacks.
             cbs foreach(_.apply())
 
-            if (grid != null && Ignition.state(grid.name) == GridGainState.STARTED) {
+            if (grid != null && Ignition.state(grid.name) == IgniteState.STARTED) {
                 if (nodeJoinLsnr != null)
                     grid.events().stopLocalListen(nodeJoinLsnr)
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala
index 7a0f68e..6ce7a87 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala
@@ -10,6 +10,7 @@
  */
 package org.gridgain.visor
 
+import org.apache.ignite.Ignition
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.gridgain.grid.{_}
 import org.scalatest._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala
index 7fea730..5e5559b 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala
@@ -13,6 +13,7 @@ package org.gridgain.visor.commands.alert
 
 import java.util.regex.Pattern
 
+import org.apache.ignite.Ignition
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.gridgain.grid.spi.discovery.GridDiscoverySpi
 import org.gridgain.grid.spi.discovery.tcp.GridTcpDiscoverySpi

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala
index a558aef..a2e0035 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala
@@ -11,6 +11,7 @@
 
 package org.gridgain.visor.commands.cache
 
+import org.apache.ignite.Ignition
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.gridgain.grid.cache.GridCacheAtomicityMode._
 import org.gridgain.grid.cache.GridCacheMode._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala
index 1c83196..f837959 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala
@@ -11,6 +11,7 @@
 
 package org.gridgain.visor.commands.cache
 
+import org.apache.ignite.Ignition
 import org.gridgain.grid.cache.query.GridCacheQuerySqlField
 import org.gridgain.visor._
 import org.gridgain.visor.commands.cache.VisorCacheCommand._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala
index 7a24808..6758cef 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala
@@ -11,6 +11,7 @@
 
 package org.gridgain.visor.commands.cache
 
+import org.apache.ignite.Ignition
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.gridgain.grid.cache.GridCacheMode._
 import org.gridgain.grid.cache._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
index 6c81932..cf5a8a3 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala
@@ -11,6 +11,7 @@
 
 package org.gridgain.visor.commands.cswap
 
+import org.apache.ignite.Ignition
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.gridgain.grid.cache.{GridCacheConfiguration, GridCacheMode}
 import org.gridgain.grid.spi.discovery.tcp.GridTcpDiscoverySpi

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala
index 8844a28..d6d04e0 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala
@@ -11,6 +11,7 @@
 
 package org.gridgain.visor.commands.disco
 
+import org.apache.ignite.Ignition
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.gridgain.grid.{_}
 import org.gridgain.visor._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala
index 75b4d24..3837253 100644
--- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala
@@ -13,10 +13,10 @@ package org.gridgain.visor.commands.tasks
 
 import java.util
 
+import org.apache.ignite.Ignition
 import org.apache.ignite.compute.{ComputeJobAdapter, ComputeTaskSplitAdapter, ComputeJob, ComputeJobResult}
 import org.apache.ignite.configuration.IgniteConfiguration
 import org.apache.ignite.events.IgniteEventType
-import org.gridgain.grid.compute.GridComputeJobAdapter
 import IgniteEventType._
 import org.gridgain.visor._
 import org.gridgain.visor.commands.tasks.VisorTasksCommand._


[25/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 3edf39ef5ccad7cf6e61ad71ed79ed1908b7a8cf
Parents: a50fccd
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:56:31 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:56:31 2014 +0300

----------------------------------------------------------------------
 .../optimized-classnames.previous.properties    | 30621 +++++++++++++++++
 .../optimized/optimized-classnames.properties   | 30621 +++++++++++++++++
 .../ignite/marshaller/optimized/package.html    |    15 +
 .../GridCacheAtomicReference.java               |     1 -
 .../cache/eviction/GridCacheEvictionFilter.java |     1 -
 .../optimized-classnames.previous.properties    | 30621 -----------------
 .../optimized/optimized-classnames.properties   | 30621 -----------------
 .../grid/marshaller/optimized/package.html      |    15 -
 8 files changed, 61257 insertions(+), 61259 deletions(-)
----------------------------------------------------------------------



[34/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
index 8cfaca8..de90035 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
@@ -22,10 +22,10 @@ import java.security.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.marshaller.optimized.GridOptimizedMarshallable.*;
+import static org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshallable.*;
 
 /**
- * Miscellaneous utility methods to facilitate {@link GridOptimizedMarshaller}.
+ * Miscellaneous utility methods to facilitate {@link IgniteOptimizedMarshaller}.
  */
 class GridOptimizedMarshallerUtils {
     /** Unsafe. */
@@ -44,7 +44,7 @@ class GridOptimizedMarshallerUtils {
     static final Charset UTF_8 = Charset.forName("UTF-8");
 
     /** Class descriptors cache. */
-    private static final ConcurrentMap<Class<?>, GridOptimizedClassDescriptor> CLS_DESC_CACHE =
+    private static final ConcurrentMap<Class<?>, IgniteOptimizedClassDescriptor> CLS_DESC_CACHE =
         new ConcurrentHashMap8<>(256);
 
     /** Classes cache by name. */
@@ -105,21 +105,21 @@ class GridOptimizedMarshallerUtils {
      * @return Descriptor.
      * @throws IOException In case of error.
      */
-    static GridOptimizedClassDescriptor classDescriptor(Class<?> cls, @Nullable Object obj) throws IOException {
+    static IgniteOptimizedClassDescriptor classDescriptor(Class<?> cls, @Nullable Object obj) throws IOException {
         if (obj != null) {
-            if (obj instanceof GridOptimizedMarshallable) {
-                GridOptimizedMarshallable m = (GridOptimizedMarshallable)obj;
+            if (obj instanceof IgniteOptimizedMarshallable) {
+                IgniteOptimizedMarshallable m = (IgniteOptimizedMarshallable)obj;
 
                 Object clsId = m.ggClassId();
 
-                if (clsId != null && !(clsId instanceof GridOptimizedClassDescriptor))
+                if (clsId != null && !(clsId instanceof IgniteOptimizedClassDescriptor))
                     throw new IOException("Method '" + obj.getClass().getName() + ".ggClassId() must return " +
                         "the value of the field '" + CLS_ID_FIELD_NAME + "'.");
 
-                GridOptimizedClassDescriptor desc = (GridOptimizedClassDescriptor)clsId;
+                IgniteOptimizedClassDescriptor desc = (IgniteOptimizedClassDescriptor)clsId;
 
                 if (desc == null) {
-                    desc = new GridOptimizedClassDescriptor(cls);
+                    desc = new IgniteOptimizedClassDescriptor(cls);
 
                     try {
                         Field field = obj.getClass().getDeclaredField(CLS_ID_FIELD_NAME);
@@ -140,7 +140,7 @@ class GridOptimizedMarshallerUtils {
                                     "return the value of the field '" + CLS_ID_FIELD_NAME + "': "
                                     + obj.getClass().getName());
                         }
-                        else if (!(o instanceof GridOptimizedClassDescriptor))
+                        else if (!(o instanceof IgniteOptimizedClassDescriptor))
                             throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared with " +
                                 "null value: " + obj.getClass().getName());
                     }
@@ -158,11 +158,11 @@ class GridOptimizedMarshallerUtils {
             }
         }
 
-        GridOptimizedClassDescriptor desc = CLS_DESC_CACHE.get(cls);
+        IgniteOptimizedClassDescriptor desc = CLS_DESC_CACHE.get(cls);
 
         if (desc == null) {
-            GridOptimizedClassDescriptor existing = CLS_DESC_CACHE.putIfAbsent(cls,
-                desc = new GridOptimizedClassDescriptor(cls));
+            IgniteOptimizedClassDescriptor existing = CLS_DESC_CACHE.putIfAbsent(cls,
+                desc = new IgniteOptimizedClassDescriptor(cls));
 
             if (existing != null)
                 desc = existing;
@@ -201,7 +201,7 @@ class GridOptimizedMarshallerUtils {
         X.println(">>> GridOptimizedMarshallerUtils memory stats:");
         X.println(" Cache size: " + CLS_DESC_CACHE.size());
 
-        for (Map.Entry<Class<?>, GridOptimizedClassDescriptor> e : CLS_DESC_CACHE.entrySet())
+        for (Map.Entry<Class<?>, IgniteOptimizedClassDescriptor> e : CLS_DESC_CACHE.entrySet())
             X.println(" " + e.getKey() + " : " + e.getValue());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
index 384b643..9aae0ab 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
@@ -45,13 +45,13 @@ class GridOptimizedObjectInputStream extends ObjectInputStream {
     private Object curObj;
 
     /** */
-    private List<T2<GridOptimizedFieldType, Long>> curFields;
+    private List<T2<IgniteOptimizedFieldType, Long>> curFields;
 
     /** */
-    private List<IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoList;
+    private List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoList;
 
     /** */
-    private Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoMap;
+    private Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoMap;
 
     /** */
     private Class<?> curCls;
@@ -133,7 +133,7 @@ class GridOptimizedObjectInputStream extends ObjectInputStream {
                 return handles.lookup(readInt());
 
             case OBJECT:
-                GridOptimizedClassDescriptor desc = GridOptimizedClassResolver.readClass(this, clsLdr);
+                IgniteOptimizedClassDescriptor desc = IgniteOptimizedClassResolver.readClass(this, clsLdr);
 
                 curCls = desc.describedClass();
 
@@ -220,10 +220,10 @@ class GridOptimizedObjectInputStream extends ObjectInputStream {
      * @throws IOException In case of error.
      */
     @SuppressWarnings("ForLoopReplaceableByForEach")
-    void readFields(Object obj, List<T2<GridOptimizedFieldType, Long>> fieldOffs) throws ClassNotFoundException,
+    void readFields(Object obj, List<T2<IgniteOptimizedFieldType, Long>> fieldOffs) throws ClassNotFoundException,
         IOException {
         for (int i = 0; i < fieldOffs.size(); i++) {
-            T2<GridOptimizedFieldType, Long> t = fieldOffs.get(i);
+            T2<IgniteOptimizedFieldType, Long> t = fieldOffs.get(i);
 
             switch ((t.get1())) {
                 case BYTE:
@@ -325,7 +325,7 @@ class GridOptimizedObjectInputStream extends ObjectInputStream {
      */
     @SuppressWarnings("ForLoopReplaceableByForEach")
     Object readSerializable(Class<?> cls, List<Method> mtds, Method readResolveMtd,
-        GridOptimizedClassDescriptor.Fields fields) throws ClassNotFoundException, IOException {
+        IgniteOptimizedClassDescriptor.Fields fields) throws ClassNotFoundException, IOException {
         Object obj;
 
         try {
@@ -869,7 +869,7 @@ class GridOptimizedObjectInputStream extends ObjectInputStream {
      */
     private static class GetFieldImpl extends GetField {
         /** Field info map. */
-        private final Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap;
+        private final Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoMap;
 
         /** Values. */
         private final Object[] objs;
@@ -883,12 +883,12 @@ class GridOptimizedObjectInputStream extends ObjectInputStream {
         private GetFieldImpl(GridOptimizedObjectInputStream in) throws IOException, ClassNotFoundException {
             fieldInfoMap = in.curFieldInfoMap;
 
-            List<IgniteBiTuple<Integer, GridOptimizedFieldType>> infos = in.curFieldInfoList;
+            List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>> infos = in.curFieldInfoList;
 
             objs = new Object[infos.size()];
 
             for (int i = 0; i < infos.size(); i++) {
-                IgniteBiTuple<Integer, GridOptimizedFieldType> t = infos.get(i);
+                IgniteBiTuple<Integer, IgniteOptimizedFieldType> t = infos.get(i);
 
                 Object obj = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
index 55125e3..bd78c36 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
@@ -44,10 +44,10 @@ class GridOptimizedObjectOutputStream extends ObjectOutputStream {
     private Object curObj;
 
     /** */
-    private List<T2<GridOptimizedFieldType, Long>> curFields;
+    private List<T2<IgniteOptimizedFieldType, Long>> curFields;
 
     /** */
-    private Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoMap;
+    private Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoMap;
 
     /** */
     private PutFieldImpl curPut;
@@ -148,7 +148,7 @@ class GridOptimizedObjectOutputStream extends ObjectOutputStream {
         else {
             Class<?> cls = obj.getClass();
 
-            GridOptimizedClassDescriptor desc = classDescriptor(cls, obj);
+            IgniteOptimizedClassDescriptor desc = classDescriptor(cls, obj);
 
             if (desc.excluded()) {
                 writeByte(NULL);
@@ -182,7 +182,7 @@ class GridOptimizedObjectOutputStream extends ObjectOutputStream {
             else {
                 writeByte(OBJECT);
 
-                GridOptimizedClassResolver.writeClass(this, desc);
+                IgniteOptimizedClassResolver.writeClass(this, desc);
 
                 desc.write(this, obj);
             }
@@ -268,7 +268,7 @@ class GridOptimizedObjectOutputStream extends ObjectOutputStream {
      * @throws IOException In case of error.
      */
     @SuppressWarnings("ForLoopReplaceableByForEach")
-    void writeSerializable(Object obj, List<Method> mtds, GridOptimizedClassDescriptor.Fields fields)
+    void writeSerializable(Object obj, List<Method> mtds, IgniteOptimizedClassDescriptor.Fields fields)
         throws IOException {
         for (int i = 0; i < mtds.size(); i++) {
             Method mtd = mtds.get(i);
@@ -422,9 +422,9 @@ class GridOptimizedObjectOutputStream extends ObjectOutputStream {
      * @throws IOException In case of error.
      */
     @SuppressWarnings("ForLoopReplaceableByForEach")
-    private void writeFields(Object obj, List<T2<GridOptimizedFieldType, Long>> fieldOffs) throws IOException {
+    private void writeFields(Object obj, List<T2<IgniteOptimizedFieldType, Long>> fieldOffs) throws IOException {
         for (int i = 0; i < fieldOffs.size(); i++) {
-            T2<GridOptimizedFieldType, Long> t = fieldOffs.get(i);
+            T2<IgniteOptimizedFieldType, Long> t = fieldOffs.get(i);
 
             switch (t.get1()) {
                 case BYTE:
@@ -660,7 +660,7 @@ class GridOptimizedObjectOutputStream extends ObjectOutputStream {
         if (curPut == null)
             throw new NotActiveException("putFields() was not called.");
 
-        for (IgniteBiTuple<GridOptimizedFieldType, Object> t : curPut.objs) {
+        for (IgniteBiTuple<IgniteOptimizedFieldType, Object> t : curPut.objs) {
             switch (t.get1()) {
                 case BYTE:
                     writeByte((Byte)t.get2());
@@ -747,10 +747,10 @@ class GridOptimizedObjectOutputStream extends ObjectOutputStream {
         private final GridOptimizedObjectOutputStream out;
 
         /** Field info map. */
-        private final Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap;
+        private final Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoMap;
 
         /** Values. */
-        private final IgniteBiTuple<GridOptimizedFieldType, Object>[] objs;
+        private final IgniteBiTuple<IgniteOptimizedFieldType, Object>[] objs;
 
         /**
          * @param out Output stream.
@@ -823,7 +823,7 @@ class GridOptimizedObjectOutputStream extends ObjectOutputStream {
          * @param val Value.
          */
         private void value(String name, Object val) {
-            IgniteBiTuple<Integer, GridOptimizedFieldType> info = fieldInfoMap.get(name);
+            IgniteBiTuple<Integer, IgniteOptimizedFieldType> info = fieldInfoMap.get(name);
 
             objs[info.get1()] = F.t(info.get2(), val);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
new file mode 100644
index 0000000..eafa113
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
@@ -0,0 +1,1032 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.*;
+import sun.misc.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import static java.lang.reflect.Modifier.*;
+
+/**
+ * Class descriptor.
+ */
+class IgniteOptimizedClassDescriptor {
+    /** Unsafe. */
+    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
+
+    /** */
+    private static final int TYPE_BYTE = 1;
+
+    /** */
+    private static final int TYPE_SHORT = 2;
+
+    /** */
+    private static final int TYPE_INT = 3;
+
+    /** */
+    private static final int TYPE_LONG = 4;
+
+    /** */
+    private static final int TYPE_FLOAT = 5;
+
+    /** */
+    private static final int TYPE_DOUBLE = 6;
+
+    /** */
+    private static final int TYPE_CHAR = 7;
+
+    /** */
+    private static final int TYPE_BOOLEAN = 8;
+
+    /** */
+    private static final int TYPE_BYTE_ARR = 9;
+
+    /** */
+    private static final int TYPE_SHORT_ARR = 10;
+
+    /** */
+    private static final int TYPE_INT_ARR = 11;
+
+    /** */
+    private static final int TYPE_LONG_ARR = 12;
+
+    /** */
+    private static final int TYPE_FLOAT_ARR = 13;
+
+    /** */
+    private static final int TYPE_DOUBLE_ARR = 14;
+
+    /** */
+    private static final int TYPE_CHAR_ARR = 15;
+
+    /** */
+    private static final int TYPE_BOOLEAN_ARR = 16;
+
+    /** */
+    private static final int TYPE_OBJ_ARR = 17;
+
+    /** */
+    private static final int TYPE_STR = 18;
+
+    /** */
+    private static final int TYPE_ENUM = 19;
+
+    /** */
+    private static final int TYPE_UUID = 20;
+
+    /** */
+    private static final int TYPE_PROPS = 21;
+
+    /** */
+    private static final int TYPE_ARRAY_LIST = 22;
+
+    /** */
+    private static final int TYPE_HASH_MAP = 23;
+
+    /** */
+    private static final int TYPE_HASH_SET = 24;
+
+    /** */
+    private static final int TYPE_LINKED_LIST = 25;
+
+    /** */
+    private static final int TYPE_LINKED_HASH_MAP = 26;
+
+    /** */
+    private static final int TYPE_LINKED_HASH_SET = 27;
+
+    /** */
+    private static final int TYPE_DATE = 28;
+
+    /** */
+    private static final int TYPE_CLS = 29;
+
+    /** */
+    private static final int TYPE_EXTERNALIZABLE = 50;
+
+    /** */
+    private static final int TYPE_SERIALIZABLE = 51;
+
+    /** Class. */
+    private Class<?> cls;
+
+    /** Header. */
+    private Integer hdr;
+
+    /** ID. */
+    private Integer id;
+
+    /** Short ID. */
+    private Short shortId;
+
+    /** Class name. */
+    private String name;
+
+    /** Class type. */
+    private int type;
+
+    /** Primitive flag. */
+    private boolean isPrimitive;
+
+    /** Enum flag. */
+    private boolean isEnum;
+
+    /** Serializable flag. */
+    private boolean isSerial;
+
+    /** Excluded flag. */
+    private final boolean excluded;
+
+    /** {@code True} if descriptor is for {@link Class}. */
+    private boolean isCls;
+
+    /** Array component type. */
+    private Class<?> arrCompType;
+
+    /** Enumeration values. */
+    private Object[] enumVals;
+
+    /** Constructor. */
+    private Constructor<?> constructor;
+
+    /** Fields. */
+    private Fields fields;
+
+    /** {@code writeObject} methods. */
+    private List<Method> writeObjMtds;
+
+    /** {@code writeReplace} method. */
+    private Method writeReplaceMtd;
+
+    /** {@code readObject} methods. */
+    private List<Method> readObjMtds;
+
+    /** {@code readResolve} method. */
+    private Method readResolveMtd;
+
+    /** Defaults field offset. */
+    private long dfltsFieldOff;
+
+    /** Load factor field offset. */
+    private long loadFactorFieldOff;
+
+    /** Map field offset. */
+    private long mapFieldOff;
+
+    /** Access order field offset. */
+    private long accessOrderFieldOff;
+
+    /**
+     * Creates descriptor for class.
+     *
+     * @param cls Class.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings({"ForLoopReplaceableByForEach", "MapReplaceableByEnumMap"})
+    IgniteOptimizedClassDescriptor(Class<?> cls) throws IOException {
+        this.cls = cls;
+
+        excluded = GridMarshallerExclusions.isExcluded(cls);
+
+        T2<Integer, Integer> t = IgniteOptimizedClassResolver.writeClassData(cls);
+
+        hdr = t.get1();
+        id = t.get2();
+        name = cls.getName();
+
+        if (!excluded) {
+            Class<?> parent;
+
+            if (cls == byte.class || cls == Byte.class) {
+                type = TYPE_BYTE;
+
+                isPrimitive = true;
+            }
+            else if (cls == short.class || cls == Short.class) {
+                type = TYPE_SHORT;
+
+                isPrimitive = true;
+            }
+            else if (cls == int.class || cls == Integer.class) {
+                type = TYPE_INT;
+
+                isPrimitive = true;
+            }
+            else if (cls == long.class || cls == Long.class) {
+                type = TYPE_LONG;
+
+                isPrimitive = true;
+            }
+            else if (cls == float.class || cls == Float.class) {
+                type = TYPE_FLOAT;
+
+                isPrimitive = true;
+            }
+            else if (cls == double.class || cls == Double.class) {
+                type = TYPE_DOUBLE;
+
+                isPrimitive = true;
+            }
+            else if (cls == char.class || cls == Character.class) {
+                type = TYPE_CHAR;
+
+                isPrimitive = true;
+            }
+            else if (cls == boolean.class || cls == Boolean.class) {
+                type = TYPE_BOOLEAN;
+
+                isPrimitive = true;
+            }
+            else if (cls == byte[].class)
+                type = TYPE_BYTE_ARR;
+            else if (cls == short[].class)
+                type = TYPE_SHORT_ARR;
+            else if (cls == int[].class)
+                type = TYPE_INT_ARR;
+            else if (cls == long[].class)
+                type = TYPE_LONG_ARR;
+            else if (cls == float[].class)
+                type = TYPE_FLOAT_ARR;
+            else if (cls == double[].class)
+                type = TYPE_DOUBLE_ARR;
+            else if (cls == char[].class)
+                type = TYPE_CHAR_ARR;
+            else if (cls == boolean[].class)
+                type = TYPE_BOOLEAN_ARR;
+            else if (cls.isArray()) {
+                type = TYPE_OBJ_ARR;
+
+                arrCompType = cls.getComponentType();
+            }
+            else if (cls == String.class)
+                type = TYPE_STR;
+            else if (cls.isEnum()) {
+                type = TYPE_ENUM;
+
+                isEnum = true;
+                enumVals = cls.getEnumConstants();
+            }
+            // Support for enum constants, based on anonymous children classes.
+            else if ((parent = cls.getSuperclass()) != null && parent.isEnum()) {
+                type = TYPE_ENUM;
+
+                isEnum = true;
+                enumVals = parent.getEnumConstants();
+            }
+            else if (cls == UUID.class)
+                type = TYPE_UUID;
+            else if (cls == Properties.class) {
+                type = TYPE_PROPS;
+
+                try {
+                    dfltsFieldOff = UNSAFE.objectFieldOffset(Properties.class.getDeclaredField("defaults"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == ArrayList.class)
+                type = TYPE_ARRAY_LIST;
+            else if (cls == HashMap.class) {
+                type = TYPE_HASH_MAP;
+
+                try {
+                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == HashSet.class) {
+                type = TYPE_HASH_SET;
+
+                try {
+                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+                    mapFieldOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == LinkedList.class)
+                type = TYPE_LINKED_LIST;
+            else if (cls == LinkedHashMap.class) {
+                type = TYPE_LINKED_HASH_MAP;
+
+                try {
+                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+                    accessOrderFieldOff = UNSAFE.objectFieldOffset(LinkedHashMap.class.getDeclaredField("accessOrder"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == LinkedHashSet.class) {
+                type = TYPE_LINKED_HASH_SET;
+
+                try {
+                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
+                    mapFieldOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
+                }
+                catch (NoSuchFieldException e) {
+                    throw new IOException(e);
+                }
+            }
+            else if (cls == Date.class)
+                type = TYPE_DATE;
+            else if (cls == Class.class) {
+                type = TYPE_CLS;
+
+                isCls = true;
+            }
+            else {
+                Class<?> c = cls;
+
+                while ((writeReplaceMtd == null || readResolveMtd == null) && c != null && !c.equals(Object.class)) {
+                    if (writeReplaceMtd == null) {
+                        try {
+                            writeReplaceMtd = c.getDeclaredMethod("writeReplace");
+
+                            if (!isStatic(writeReplaceMtd.getModifiers()) &&
+                                !(isPrivate(writeReplaceMtd.getModifiers()) && c != cls) &&
+                                writeReplaceMtd.getReturnType().equals(Object.class))
+                                writeReplaceMtd.setAccessible(true);
+                            else
+                                // Set method back to null if it has incorrect signature.
+                                writeReplaceMtd = null;
+                        }
+                        catch (NoSuchMethodException ignored) {
+                            // No-op.
+                        }
+                    }
+
+                    if (readResolveMtd == null) {
+                        try {
+                            readResolveMtd = c.getDeclaredMethod("readResolve");
+
+                            if (!isStatic(readResolveMtd.getModifiers()) &&
+                                !(isPrivate(readResolveMtd.getModifiers()) && c != cls) &&
+                                readResolveMtd.getReturnType().equals(Object.class))
+                                readResolveMtd.setAccessible(true);
+                            else
+                                // Set method back to null if it has incorrect signature.
+                                readResolveMtd = null;
+                        }
+                        catch (NoSuchMethodException ignored) {
+                            // No-op.
+                        }
+                    }
+
+                    c = c.getSuperclass();
+                }
+
+                if (Externalizable.class.isAssignableFrom(cls)) {
+                    type = TYPE_EXTERNALIZABLE;
+
+                    try {
+                        constructor = cls.getDeclaredConstructor();
+
+                        constructor.setAccessible(true);
+                    }
+                    catch (NoSuchMethodException e) {
+                        throw new IOException("Externalizable class doesn't have default constructor: " + cls, e);
+                    }
+                }
+                else {
+                    type = TYPE_SERIALIZABLE;
+
+                    isSerial = Serializable.class.isAssignableFrom(cls);
+
+                    writeObjMtds = new ArrayList<>();
+                    readObjMtds = new ArrayList<>();
+                    List<List<Field>> fields = new ArrayList<>();
+                    List<List<T2<IgniteOptimizedFieldType, Long>>> fieldOffs = new ArrayList<>();
+                    List<Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>>> fieldInfoMaps = new ArrayList<>();
+                    List<List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>>> fieldInfoLists = new ArrayList<>();
+
+                    for (c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
+                        Method mtd;
+
+                        try {
+                            mtd = c.getDeclaredMethod("writeObject", ObjectOutputStream.class);
+
+                            int mod = mtd.getModifiers();
+
+                            if (!isStatic(mod) && isPrivate(mod) && mtd.getReturnType() == Void.TYPE)
+                                mtd.setAccessible(true);
+                            else
+                                // Set method back to null if it has incorrect signature.
+                                mtd = null;
+                        }
+                        catch (NoSuchMethodException ignored) {
+                            mtd = null;
+                        }
+
+                        writeObjMtds.add(mtd);
+
+                        try {
+                            mtd = c.getDeclaredMethod("readObject", ObjectInputStream.class);
+
+                            int mod = mtd.getModifiers();
+
+                            if (!isStatic(mod) && isPrivate(mod) && mtd.getReturnType() == Void.TYPE)
+                                mtd.setAccessible(true);
+                            else
+                                // Set method back to null if it has incorrect signature.
+                                mtd = null;
+                        }
+                        catch (NoSuchMethodException ignored) {
+                            mtd = null;
+                        }
+
+                        readObjMtds.add(mtd);
+
+                        Field[] clsFields0 = c.getDeclaredFields();
+
+                        Arrays.sort(clsFields0, new Comparator<Field>() {
+                            @Override public int compare(Field f1, Field f2) {
+                                return f1.getName().compareTo(f2.getName());
+                            }
+                        });
+
+                        List<Field> clsFields = new ArrayList<>(clsFields0.length);
+                        List<T2<IgniteOptimizedFieldType, Long>> clsFieldOffs =
+                            new ArrayList<>(clsFields0.length);
+
+                        for (int i = 0; i < clsFields0.length; i++) {
+                            Field f = clsFields0[i];
+
+                            int mod = f.getModifiers();
+
+                            if (!isStatic(mod) && !isTransient(mod)) {
+                                IgniteOptimizedFieldType type = fieldType(f.getType());
+
+                                clsFields.add(f);
+                                clsFieldOffs.add(new T2<>(type, UNSAFE.objectFieldOffset(f)));
+                            }
+                        }
+
+                        fields.add(clsFields);
+                        fieldOffs.add(clsFieldOffs);
+
+                        Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoMap = null;
+
+                        try {
+                            Field serFieldsDesc = c.getDeclaredField("serialPersistentFields");
+
+                            int mod = serFieldsDesc.getModifiers();
+
+                            if (serFieldsDesc.getType() == ObjectStreamField[].class &&
+                                isPrivate(mod) && isStatic(mod) && isFinal(mod)) {
+                                serFieldsDesc.setAccessible(true);
+
+                                ObjectStreamField[] serFields = (ObjectStreamField[])serFieldsDesc.get(null);
+
+                                fieldInfoMap = new HashMap<>();
+
+                                for (int i = 0; i < serFields.length; i++) {
+                                    ObjectStreamField serField = serFields[i];
+
+                                    fieldInfoMap.put(serField.getName(), F.t(i, fieldType(serField.getType())));
+                                }
+                            }
+                        }
+                        catch (NoSuchFieldException ignored) {
+                            // No-op.
+                        }
+                        catch (IllegalAccessException e) {
+                            throw new IOException("Failed to get value of 'serialPersistentFields' field in class: " +
+                                cls.getName(), e);
+                        }
+
+                        if (fieldInfoMap == null) {
+                            fieldInfoMap = new HashMap<>();
+
+                            for (int i = 0; i < clsFields.size(); i++) {
+                                Field f = clsFields.get(i);
+
+                                fieldInfoMap.put(f.getName(), F.t(i, fieldType(f.getType())));
+                            }
+                        }
+
+                        fieldInfoMaps.add(fieldInfoMap);
+
+                        List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoList =
+                            new ArrayList<>(fieldInfoMap.values());
+
+                        Collections.sort(fieldInfoList, new Comparator<IgniteBiTuple<Integer, IgniteOptimizedFieldType>>() {
+                            @Override public int compare(IgniteBiTuple<Integer, IgniteOptimizedFieldType> t1,
+                                IgniteBiTuple<Integer, IgniteOptimizedFieldType> t2) {
+                                return t1.get1().compareTo(t2.get1());
+                            }
+                        });
+
+                        fieldInfoLists.add(fieldInfoList);
+                    }
+
+                    Collections.reverse(writeObjMtds);
+                    Collections.reverse(readObjMtds);
+                    Collections.reverse(fields);
+                    Collections.reverse(fieldOffs);
+                    Collections.reverse(fieldInfoMaps);
+                    Collections.reverse(fieldInfoLists);
+
+                    this.fields = new Fields(fields, fieldOffs, fieldInfoLists, fieldInfoMaps);
+                }
+            }
+        }
+
+        shortId = GridOptimizedMarshallerUtils.computeSerialVersionUid(cls, fields != null ? fields.ownFields() : null).shortValue();
+    }
+
+    /**
+     * @return Excluded flag.
+     */
+    boolean excluded() {
+        return excluded;
+    }
+
+    /**
+     * @return Class.
+     */
+    Class<?> describedClass() {
+        return cls;
+    }
+
+    /**
+     * @return Header.
+     */
+    Integer header() {
+        return hdr;
+    }
+
+    /**
+     * @return ID.
+     */
+    Integer id() {
+        return id;
+    }
+
+    /**
+     * @return Short ID.
+     */
+    Short shortId() {
+        return shortId;
+    }
+
+    /**
+     * @return Class name.
+     */
+    String name() {
+        return name;
+    }
+
+    /**
+     * @return Array component type.
+     */
+    Class<?> componentType() {
+        return arrCompType;
+    }
+
+    /**
+     * @return Primitive flag.
+     */
+    boolean isPrimitive() {
+        return isPrimitive;
+    }
+
+    /**
+     * @return Enum flag.
+     */
+    boolean isEnum() {
+        return isEnum;
+    }
+
+    /**
+     * @return {@code True} if descriptor is for {@link Class}.
+     */
+    boolean isClass() {
+        return isCls;
+    }
+
+    /**
+     * Replaces object.
+     *
+     * @param obj Object.
+     * @return Replaced object or {@code null} if there is no {@code writeReplace} method.
+     * @throws IOException In case of error.
+     */
+    Object replace(Object obj) throws IOException {
+        if (writeReplaceMtd != null) {
+            try {
+                return writeReplaceMtd.invoke(obj);
+            }
+            catch (IllegalAccessException | InvocationTargetException e) {
+                throw new IOException(e);
+            }
+        }
+
+        return obj;
+    }
+
+    /**
+     * Writes object to stream.
+     *
+     * @param out Output stream.
+     * @param obj Object.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    void write(GridOptimizedObjectOutputStream out, Object obj) throws IOException {
+        switch (type) {
+            case TYPE_BYTE:
+                out.writeByte((Byte)obj);
+
+                break;
+
+            case TYPE_SHORT:
+                out.writeShort((Short)obj);
+
+                break;
+
+            case TYPE_INT:
+                out.writeInt((Integer)obj);
+
+                break;
+
+            case TYPE_LONG:
+                out.writeLong((Long)obj);
+
+                break;
+
+            case TYPE_FLOAT:
+                out.writeFloat((Float)obj);
+
+                break;
+
+            case TYPE_DOUBLE:
+                out.writeDouble((Double)obj);
+
+                break;
+
+            case TYPE_CHAR:
+                out.writeChar((Character)obj);
+
+                break;
+
+            case TYPE_BOOLEAN:
+                out.writeBoolean((Boolean)obj);
+
+                break;
+
+            case TYPE_BYTE_ARR:
+                out.writeByteArray((byte[])obj);
+
+                break;
+
+            case TYPE_SHORT_ARR:
+                out.writeShortArray((short[])obj);
+
+                break;
+
+            case TYPE_INT_ARR:
+                out.writeIntArray((int[])obj);
+
+                break;
+
+            case TYPE_LONG_ARR:
+                out.writeLongArray((long[])obj);
+
+                break;
+
+            case TYPE_FLOAT_ARR:
+                out.writeFloatArray((float[])obj);
+
+                break;
+
+            case TYPE_DOUBLE_ARR:
+                out.writeDoubleArray((double[])obj);
+
+                break;
+
+            case TYPE_CHAR_ARR:
+                out.writeCharArray((char[])obj);
+
+                break;
+
+            case TYPE_BOOLEAN_ARR:
+                out.writeBooleanArray((boolean[])obj);
+
+                break;
+
+            case TYPE_OBJ_ARR:
+                out.writeArray((Object[])obj);
+
+                break;
+
+            case TYPE_STR:
+                out.writeString((String)obj);
+
+                break;
+
+            case TYPE_ENUM:
+                out.writeInt(((Enum)obj).ordinal());
+
+                break;
+
+            case TYPE_UUID:
+                out.writeUuid((UUID)obj);
+
+                break;
+
+            case TYPE_PROPS:
+                out.writeProperties((Properties)obj, dfltsFieldOff);
+
+                break;
+
+            case TYPE_ARRAY_LIST:
+                out.writeArrayList((ArrayList<?>)obj);
+
+                break;
+
+            case TYPE_HASH_MAP:
+                out.writeHashMap((HashMap<?, ?>)obj, loadFactorFieldOff, false);
+
+                break;
+
+            case TYPE_HASH_SET:
+                out.writeHashSet((HashSet<?>)obj, mapFieldOff, loadFactorFieldOff);
+
+                break;
+
+            case TYPE_LINKED_LIST:
+                out.writeLinkedList((LinkedList<?>)obj);
+
+                break;
+
+            case TYPE_LINKED_HASH_MAP:
+                out.writeLinkedHashMap((LinkedHashMap<?, ?>)obj, loadFactorFieldOff, accessOrderFieldOff, false);
+
+                break;
+
+            case TYPE_LINKED_HASH_SET:
+                out.writeLinkedHashSet((LinkedHashSet<?>)obj, mapFieldOff, loadFactorFieldOff);
+
+                break;
+
+            case TYPE_DATE:
+                out.writeDate((Date)obj);
+
+                break;
+
+            case TYPE_CLS:
+                IgniteOptimizedClassResolver.writeClass(out, GridOptimizedMarshallerUtils.classDescriptor((Class<?>) obj, obj));
+
+                break;
+
+            case TYPE_EXTERNALIZABLE:
+                out.writeExternalizable(obj);
+
+                break;
+
+            case TYPE_SERIALIZABLE:
+                if (out.requireSerializable() && !isSerial)
+                    throw new NotSerializableException("Must implement java.io.Serializable or " +
+                        "set GridOptimizedMarshaller.setRequireSerializable() to false " +
+                        "(note that performance may degrade if object is not Serializable): " + name);
+
+                out.writeSerializable(obj, writeObjMtds, fields);
+
+                break;
+
+            default:
+                throw new IllegalStateException("Invalid class type: " + type);
+        }
+    }
+
+    /**
+     * Reads object from stream.
+     *
+     * @param in Input stream.
+     * @return Object.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    Object read(GridOptimizedObjectInputStream in) throws ClassNotFoundException, IOException {
+        switch (type) {
+            case TYPE_BYTE:
+                return in.readByte();
+
+            case TYPE_SHORT:
+                return in.readShort();
+
+            case TYPE_INT:
+                return in.readInt();
+
+            case TYPE_LONG:
+                return in.readLong();
+
+            case TYPE_FLOAT:
+                return in.readFloat();
+
+            case TYPE_DOUBLE:
+                return in.readDouble();
+
+            case TYPE_CHAR:
+                return in.readChar();
+
+            case TYPE_BOOLEAN:
+                return in.readBoolean();
+
+            case TYPE_BYTE_ARR:
+                return in.readByteArray();
+
+            case TYPE_SHORT_ARR:
+                return in.readShortArray();
+
+            case TYPE_INT_ARR:
+                return in.readIntArray();
+
+            case TYPE_LONG_ARR:
+                return in.readLongArray();
+
+            case TYPE_FLOAT_ARR:
+                return in.readFloatArray();
+
+            case TYPE_DOUBLE_ARR:
+                return in.readDoubleArray();
+
+            case TYPE_CHAR_ARR:
+                return in.readCharArray();
+
+            case TYPE_BOOLEAN_ARR:
+                return in.readBooleanArray();
+
+            case TYPE_OBJ_ARR:
+                return in.readArray(arrCompType);
+
+            case TYPE_STR:
+                return in.readString();
+
+            case TYPE_ENUM:
+                return enumVals[in.readInt()];
+
+            case TYPE_UUID:
+                return in.readUuid();
+
+            case TYPE_PROPS:
+                return in.readProperties();
+
+            case TYPE_ARRAY_LIST:
+                return in.readArrayList();
+
+            case TYPE_HASH_MAP:
+                return in.readHashMap(false);
+
+            case TYPE_HASH_SET:
+                return in.readHashSet(mapFieldOff);
+
+            case TYPE_LINKED_LIST:
+                return in.readLinkedList();
+
+            case TYPE_LINKED_HASH_MAP:
+                return in.readLinkedHashMap(false);
+
+            case TYPE_LINKED_HASH_SET:
+                return in.readLinkedHashSet(mapFieldOff);
+
+            case TYPE_DATE:
+                return in.readDate();
+
+            case TYPE_CLS:
+                return IgniteOptimizedClassResolver.readClass(in, in.classLoader()).describedClass();
+
+            case TYPE_EXTERNALIZABLE:
+                return in.readExternalizable(constructor, readResolveMtd);
+
+            case TYPE_SERIALIZABLE:
+                return in.readSerializable(cls, readObjMtds, readResolveMtd, fields);
+
+            default:
+                throw new IllegalStateException("Invalid class type: " + type);
+        }
+    }
+
+    /**
+     * @param cls Class.
+     * @return Type.
+     */
+    @SuppressWarnings("IfMayBeConditional")
+    private IgniteOptimizedFieldType fieldType(Class<?> cls) {
+        IgniteOptimizedFieldType type;
+
+        if (cls == byte.class)
+            type = IgniteOptimizedFieldType.BYTE;
+        else if (cls == short.class)
+            type = IgniteOptimizedFieldType.SHORT;
+        else if (cls == int.class)
+            type = IgniteOptimizedFieldType.INT;
+        else if (cls == long.class)
+            type = IgniteOptimizedFieldType.LONG;
+        else if (cls == float.class)
+            type = IgniteOptimizedFieldType.FLOAT;
+        else if (cls == double.class)
+            type = IgniteOptimizedFieldType.DOUBLE;
+        else if (cls == char.class)
+            type = IgniteOptimizedFieldType.CHAR;
+        else if (cls == boolean.class)
+            type = IgniteOptimizedFieldType.BOOLEAN;
+        else
+            type = IgniteOptimizedFieldType.OTHER;
+
+        return type;
+    }
+
+    /**
+     * Encapsulates data about class fields.
+     */
+    @SuppressWarnings("PackageVisibleInnerClass")
+    static class Fields {
+        /** Fields. */
+        private final List<List<Field>> fields;
+
+        /** Fields offsets. */
+        private final List<List<T2<IgniteOptimizedFieldType, Long>>> fieldOffs;
+
+        /** Fields details lists. */
+        private final List<List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>>> fieldInfoLists;
+
+        /** Fields details maps. */
+        private final List<Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>>> fieldInfoMaps;
+
+        /**
+         * Creates new instance.
+         *
+         * @param fields Fields.
+         * @param fieldOffs Field offsets.
+         * @param fieldInfoLists List of field details sequences for each type in the object's class hierarchy.
+         * @param fieldInfoMaps List of field details maps for each type in the object's class hierarchy.
+         */
+        Fields(List<List<Field>> fields, List<List<T2<IgniteOptimizedFieldType, Long>>> fieldOffs,
+            List<List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>>> fieldInfoLists,
+            List<Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>>> fieldInfoMaps) {
+            this.fields = fields;
+            this.fieldOffs = fieldOffs;
+            this.fieldInfoLists = fieldInfoLists;
+            this.fieldInfoMaps = fieldInfoMaps;
+        }
+
+        /**
+         * Returns class's own fields (excluding inherited).
+         *
+         * @return List of fields or {@code null} if fields list is empty.
+         */
+        List<Field> ownFields() {
+            return fields.isEmpty() ? null : fields.get(fields.size() - 1);
+        }
+
+        /**
+         * Returns field types and their offsets.
+         *
+         * @param i hierarchy level where 0 corresponds to top level.
+         * @return list of pairs where first value is field type and second value is its offset.
+         */
+        List<T2<IgniteOptimizedFieldType, Long>> fieldOffs(int i) {
+            return fieldOffs.get(i);
+        }
+
+        /**
+         * Returns field sequence numbers and their types as list.
+         *
+         * @param i hierarchy level where 0 corresponds to top level.
+         * @return list of pairs (field number, field type) for the given hierarchy level.
+         */
+        List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoList(int i) {
+            return fieldInfoLists.get(i);
+        }
+
+        /**
+         * Returns field sequence numbers and their types as map where key is a field name,
+         *
+         * @param i hierarchy level where 0 corresponds to top level.
+         * @return map of field names and their details.
+         */
+        Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoMap(int i) {
+            return fieldInfoMaps.get(i);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
new file mode 100644
index 0000000..eb01ff4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
@@ -0,0 +1,469 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.math.*;
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+import java.util.concurrent.locks.*;
+
+/**
+ * Resolves class names by serialVersionUID.
+ */
+@SuppressWarnings({"UnnecessaryFullyQualifiedName", "unchecked"})
+class IgniteOptimizedClassResolver {
+    /** File name to generate. */
+    private static final String FILE_NAME = "optimized-classnames.properties";
+
+    /** */
+    private static final Map<String, Integer> ggxName2id = new HashMap<>();
+
+    /** */
+    private static final T2<Class<?>, IgniteOptimizedClassDescriptor>[] ggxId2name;
+
+    /** */
+    private static final Map<String, Integer> ggName2id = new HashMap<>();
+
+    /** */
+    private static final T3<String, Class<?>, IgniteOptimizedClassDescriptor>[] ggId2name;
+
+    /** */
+    private static Map<String, Integer> usrName2Id;
+
+    /** */
+    private static T3<String, Class<?>, IgniteOptimizedClassDescriptor>[] usrId2Name;
+
+    /** */
+    private static final int HEADER_NAME = 255;
+
+    /** */
+    private static final int HEADER_GG_NAME = 254;
+
+    /** */
+    private static final int HEADER_USER_NAME = 253;
+
+    /** */
+    private static final int HEADER_ARRAY = 252;
+
+    /**
+     * Initialize predefined classes to optimize.
+     */
+    static {
+        Class[] superOptCls = new Class[] {
+            // Array types.
+            byte[].class,
+            short[].class,
+            int[].class,
+            long[].class,
+            float[].class,
+            double[].class,
+            boolean[].class,
+            char[].class,
+
+            // Boxed types.
+            Byte.class,
+            Short.class,
+            Integer.class,
+            Long.class,
+            Float.class,
+            Double.class,
+            Boolean.class,
+            Character.class,
+            String.class,
+
+            // Atomic.
+            AtomicBoolean.class,AtomicInteger.class,
+            AtomicLong.class,AtomicReference.class,
+            AtomicMarkableReference.class,
+            AtomicStampedReference.class,
+            AtomicIntegerArray.class,
+            AtomicReferenceArray.class,
+
+            // Concurrent types.
+            ConcurrentHashMap.class,
+            ConcurrentLinkedQueue.class,
+            ConcurrentSkipListMap.class,
+            ConcurrentSkipListSet.class,
+            LinkedBlockingDeque.class,
+            LinkedBlockingQueue.class,
+            PriorityBlockingQueue.class,
+            CopyOnWriteArrayList.class,
+            CopyOnWriteArraySet.class,
+
+            // Locks.
+            ReentrantLock.class,
+            ReentrantReadWriteLock.class,
+            ReentrantReadWriteLock.ReadLock.class,
+            ReentrantReadWriteLock.WriteLock.class,
+
+            // Util types.
+            Date.class,
+            UUID.class,
+            Calendar.class,
+            Random.class,
+            Calendar.class,
+            Currency.class,
+            ArrayList.class,
+            LinkedList.class,
+            Stack.class,
+            Vector.class,
+            HashMap.class,
+            HashSet.class,
+            Hashtable.class,
+            TreeMap.class,
+            TreeSet.class,
+            IdentityHashMap.class,
+            LinkedHashMap.class,
+            LinkedHashSet.class,
+            ArrayDeque.class,
+            BitSet.class,
+            EnumMap.class,
+            EnumSet.class,
+
+            // SQL types.
+            java.sql.Date.class,
+            Time.class,
+            Timestamp.class,
+
+            // Math types.
+            BigDecimal.class,
+            BigInteger.class,
+
+            // GridGain types.
+            IgniteUuid.class,
+            GridBoundedConcurrentOrderedSet.class,
+            GridBoundedLinkedHashSet.class,
+            GridConcurrentHashSet.class,
+            ConcurrentLinkedDeque8.class,
+            GridConcurrentPhantomHashSet.class,
+            GridConcurrentSkipListSet.class,
+            GridConcurrentWeakHashSet.class,
+            GridIdentityHashSet.class,
+            GridLeanSet.class,
+            GridSetWrapper.class
+        };
+
+        // Have to leave a range for special purposes.
+        assert superOptCls.length < 230;
+
+        ggxId2name = new T2[superOptCls.length];
+
+        for (int i = 0; i < superOptCls.length; i++) {
+            Class cls = superOptCls[i];
+
+            ggxName2id.put(cls.getName(), i);
+            ggxId2name[i] = new T2<Class<?>, IgniteOptimizedClassDescriptor>(cls, null);
+        }
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(
+            IgniteOptimizedClassResolver.class.getResourceAsStream(FILE_NAME),
+            GridOptimizedMarshallerUtils.UTF_8));
+
+        List<T3<String, Class<?>, IgniteOptimizedClassDescriptor>> ggId2name0 =
+            new LinkedList<>();
+
+        try {
+            for (int i = 0; ; i++) {
+                String clsName = reader.readLine();
+
+                if (clsName == null)
+                    break;
+
+                ggName2id.put(clsName, i);
+                ggId2name0.add(new T3<String, Class<?>, IgniteOptimizedClassDescriptor>(clsName, null, null));
+            }
+
+            ggId2name = ggId2name0.toArray(new T3[ggId2name0.size()]);
+        }
+        catch (IOException e) {
+            throw new AssertionError(e);
+        }
+        finally {
+            U.close(reader, null);
+        }
+    }
+
+    /**
+     * Ensure singleton.
+     */
+    private IgniteOptimizedClassResolver() {
+        // No-op.
+    }
+
+    /**
+     * @param usrName2id0 From name to ID.
+     * @param usrId2Name0 From ID to name.
+     */
+    static void userClasses(@Nullable Map<String, Integer> usrName2id0,
+        @Nullable T3<String, Class<?>, IgniteOptimizedClassDescriptor>[] usrId2Name0) {
+        usrName2Id = usrName2id0;
+        usrId2Name = usrId2Name0;
+    }
+
+    /**
+     * @param in DataInput to read from.
+     * @param clsLdr ClassLoader.
+     * @return Class descriptor.
+     * @throws IOException If serial version UID failed.
+     * @throws ClassNotFoundException If the class cannot be located by the specified class loader.
+     */
+    static IgniteOptimizedClassDescriptor readClass(DataInput in, ClassLoader clsLdr)
+        throws IOException, ClassNotFoundException {
+        assert in != null;
+        assert clsLdr != null;
+
+        int hdr = in.readByte() & 0xff;
+
+        if (hdr < ggxId2name.length) {
+            T2<Class<?>, IgniteOptimizedClassDescriptor> ggxT = ggxId2name[hdr];
+
+            IgniteOptimizedClassDescriptor desc = ggxT.get2();
+
+            if (desc == null) {
+                desc = GridOptimizedMarshallerUtils.classDescriptor(ggxT.get1(), null);
+
+                ggxT.set2(desc);
+            }
+
+            return desc;
+        }
+
+        String name;
+        Class<?> cls;
+        IgniteOptimizedClassDescriptor desc;
+
+        switch (hdr) {
+            case HEADER_GG_NAME:
+                int ggId = in.readInt();
+
+                T3<String, Class<?>, IgniteOptimizedClassDescriptor> ggT;
+
+                try {
+                    ggT = ggId2name[ggId];
+                }
+                catch (ArrayIndexOutOfBoundsException e) {
+                    throw new ClassNotFoundException("Failed to find optimized class ID " +
+                        "(is same GridGain version running on all nodes?): " + ggId, e);
+                }
+
+                name = ggT.get1();
+                cls = ggT.get2();
+                desc = ggT.get3();
+
+                if (desc == null) {
+                    if (clsLdr == U.gridClassLoader()) {
+                        if (cls == null) {
+                            cls = forName(name, clsLdr);
+
+                            ggT.set2(cls);
+                        }
+
+                        desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+
+                        ggT.set3(desc);
+                    }
+                    else {
+                        cls = forName(name, clsLdr);
+
+                        desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+                    }
+                }
+
+                break;
+
+            case HEADER_USER_NAME:
+                int usrId = in.readInt();
+
+                T3<String, Class<?>, IgniteOptimizedClassDescriptor> usrT;
+
+                try {
+                    if (usrId2Name != null)
+                        usrT = usrId2Name[usrId];
+                    else
+                        throw new ClassNotFoundException("Failed to find user defined class ID " +
+                            "(make sure to register identical classes on all nodes for optimization): " + usrId);
+                }
+                catch (ArrayIndexOutOfBoundsException e) {
+                    throw new ClassNotFoundException("Failed to find user defined class ID " +
+                        "(make sure to register identical classes on all nodes for optimization): " + usrId, e);
+                }
+
+                name = usrT.get1();
+                cls = usrT.get2();
+                desc = usrT.get3();
+
+                if (desc == null) {
+                    if (cls == null) {
+                        cls = forName(name, clsLdr);
+
+                        usrT.set2(cls);
+                    }
+
+                    desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+
+                    usrT.set3(desc);
+                }
+
+                break;
+
+            case HEADER_ARRAY:
+                name = readClass(in, clsLdr).name();
+
+                name = name.charAt(0) == '[' ? "[" + name : "[L" + name + ';';
+
+                cls = forName(name, clsLdr);
+
+                return GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+
+            case HEADER_NAME:
+                name = in.readUTF();
+
+                cls = forName(name, clsLdr);
+
+                desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+
+                break;
+
+            default:
+                throw new IOException("Unexpected optimized stream header: " + hdr);
+        }
+
+        short actual = desc.shortId();
+
+        short exp = in.readShort();
+
+        if (actual != exp)
+            throw new ClassNotFoundException("Optimized stream class checksum mismatch " +
+                "(is same version of marshalled class present on all nodes?) " +
+                "[expected=" + exp + ", actual=" + actual + ", cls=" + cls + ']');
+
+        return desc;
+    }
+
+    /**
+     * @param out Output.
+     * @param desc Class descriptor.
+     * @throws IOException In case of error.
+     */
+    static void writeClass(DataOutput out, IgniteOptimizedClassDescriptor desc) throws IOException {
+        assert out != null;
+        assert desc != null;
+
+        int hdr = desc.header();
+
+        out.writeByte(hdr);
+
+        switch (hdr) {
+            case HEADER_GG_NAME:
+            case HEADER_USER_NAME:
+                out.writeInt(desc.id());
+                out.writeShort(desc.shortId());
+
+                return;
+
+            case HEADER_ARRAY:
+                writeClass(out, GridOptimizedMarshallerUtils.classDescriptor(desc.componentType(), null));
+
+                return;
+
+            case HEADER_NAME:
+                out.writeUTF(desc.name());
+                out.writeShort(desc.shortId());
+        }
+    }
+
+    /**
+     * @param cls Class to write.
+     * @return Data for {@code writeClass} method.
+     */
+    static T2<Integer, Integer> writeClassData(Class<?> cls) {
+        assert cls != null;
+
+        String name = cls.getName();
+
+        Integer superHdr = ggxName2id.get(name);
+
+        if (superHdr != null)
+            return new T2<>(superHdr, null);
+
+        Integer id;
+
+        if ((id = ggName2id.get(name)) != null)
+            return new T2<>(HEADER_GG_NAME, id);
+
+        if (usrName2Id != null && (id = usrName2Id.get(name)) != null)
+            return new T2<>(HEADER_USER_NAME, id);
+
+        if (cls.isArray())
+            return new T2<>(HEADER_ARRAY, null);
+
+        return new T2<>(HEADER_NAME, null);
+    }
+
+    /**
+     * @param name Class name.
+     * @param ldr Class loader.
+     * @return Class.
+     * @throws ClassNotFoundException If class not found.
+     */
+    private static Class<?> forName(String name, ClassLoader ldr) throws ClassNotFoundException {
+        Class<?> cls = primitive(name);
+
+        if (cls == null)
+            cls = GridOptimizedMarshallerUtils.forName(name, ldr);
+
+        return cls;
+    }
+
+    /**
+     * @param name Name of primitive class.
+     * @return Primitive type class or null.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    @Nullable private static Class<?> primitive(String name) {
+        if (name.length() > 7)
+            return null;
+
+        switch (name.charAt(0)) {
+            case 'b':
+                if ("boolean".equals(name))
+                    return boolean.class;
+
+                return "byte".equals(name) ? byte.class : null;
+            case 's':
+                return "short".equals(name) ? short.class : null;
+            case 'i':
+                return "int".equals(name) ? int.class : null;
+            case 'l':
+                return "long".equals(name) ? long.class : null;
+            case 'c':
+                return "char".equals(name) ? char.class : null;
+            case 'f':
+                return "float".equals(name) ? float.class : null;
+            case 'd':
+                return "double".equals(name) ? double.class : null;
+            case 'v':
+                return "void".equals(name) ? void.class : null;
+        }
+
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedFieldType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedFieldType.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedFieldType.java
new file mode 100644
index 0000000..9cf14ca
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedFieldType.java
@@ -0,0 +1,42 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+/**
+ * Field type used to calculate {@code Unsafe} offsets into objects.
+ */
+enum IgniteOptimizedFieldType {
+    /** */
+    BYTE,
+
+    /** */
+    SHORT,
+
+    /** */
+    INT,
+
+    /** */
+    LONG,
+
+    /** */
+    FLOAT,
+
+    /** */
+    DOUBLE,
+
+    /** */
+    CHAR,
+
+    /** */
+    BOOLEAN,
+
+    /** */
+    OTHER
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java
new file mode 100644
index 0000000..9fbac3c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallable.java
@@ -0,0 +1,57 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import java.util.*;
+
+/**
+ * Optional interface which helps make serialization even faster by removing internal
+ * look-ups for classes.
+ * <p>
+ * All implementation must have the following:
+ * <ul>
+ * <li>
+ *     Must have static filed (private or public) declared of type {@link Object}
+ *     with name {@code GG_CLASS_ID}. GridGain will reflectively initialize this field with
+ *     proper class ID during system startup.
+ * </li>
+ * <li>
+ *     Must return the value of {@code GG_CLASS_ID} field from {@link #ggClassId} method.
+ * </li>
+ * </ul>
+ * Here is a sample implementation:
+ * <pre name="code" class="java">
+ * // For better performance consider implementing java.io.Externalizable interface.
+ * class ExampleMarshallable implements GridOptimizedMarshallable, Serializable {
+ *     // Class ID field required by 'GridOptimizedMarshallable'.
+ *     private static Object GG_CLASS_ID;
+ *
+ *     ...
+ *
+ *     &#64; public Object ggClassId() {
+ *         return GG_CLASS_ID;
+ *     }
+ * }
+ * </pre>
+ * <p>
+ * Note that for better performance you should also specify list of classes you
+ * plan to serialize via {@link IgniteOptimizedMarshaller#setClassNames(List)} method.
+ */
+public interface IgniteOptimizedMarshallable {
+    /** */
+    public static final String CLS_ID_FIELD_NAME = "GG_CLASS_ID";
+
+    /**
+     * Implementation of this method should simply return value of {@code GG_CLASS_ID} field.
+     *
+     * @return Class ID for optimized marshalling.
+     */
+    public Object ggClassId();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
new file mode 100644
index 0000000..80d30cc
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
@@ -0,0 +1,408 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.marshaller.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+import sun.misc.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+/**
+ * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller},
+ * which is based on standard {@link ObjectOutputStream}, this marshaller does not
+ * enforce that all serialized objects implement {@link Serializable} interface. It is also
+ * about 20 times faster as it removes lots of serialization overhead that exists in
+ * default JDK implementation.
+ * <p>
+ * {@code GridOptimizedMarshaller} is tested only on Java HotSpot VM on other VMs
+ * it could yield unexpected results. It is the default marshaller on Java HotSpot VMs
+ * and will be used if no other marshaller was explicitly configured.
+ * <p>
+ * <h1 class="header">Configuration</h1>
+ * <h2 class="header">Mandatory</h2>
+ * This marshaller has no mandatory configuration parameters.
+ * <h2 class="header">Java Example</h2>
+ * <pre name="code" class="java">
+ * GridOptimizedMarshaller marshaller = new GridOptimizedMarshaller();
+ *
+ * // Enforce Serializable interface.
+ * marshaller.setRequireSerializable(true);
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Override marshaller.
+ * cfg.setMarshaller(marshaller);
+ *
+ * // Starts grid.
+ * G.start(cfg);
+ * </pre>
+ * <h2 class="header">Spring Example</h2>
+ * GridOptimizedMarshaller can be configured from Spring XML configuration file:
+ * <pre name="code" class="xml">
+ * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ *     ...
+ *     &lt;property name="marshaller"&gt;
+ *         &lt;bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller"&gt;
+ *             &lt;property name="requireSerializable"&gt;true&lt;/property&gt;
+ *         &lt;/bean&gt;
+ *     &lt;/property&gt;
+ *     ...
+ * &lt;/bean&gt;
+ * </pre>
+ * <p>
+ * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <br>
+ * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
+ * <h2 class="header">Injection Example</h2>
+ * GridMarshaller can be injected in users task, job or SPI as following:
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     private GridMarshaller marshaller;
+ *     ...
+ * }
+ * </pre>
+ * or
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     private GridMarshaller marshaller;
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     public void setMarshaller(GridMarshaller marshaller) {
+ *         this.marshaller = marshaller;
+ *     }
+ *     ...
+ * }
+ * </pre>
+ */
+public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
+    /** Whether or not to require an object to be serializable in order to be marshalled. */
+    private boolean requireSer = true;
+
+    /** Default class loader. */
+    private final ClassLoader dfltClsLdr = getClass().getClassLoader();
+
+    /**
+     * Initializes marshaller not to enforce {@link Serializable} interface.
+     *
+     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
+     */
+    public IgniteOptimizedMarshaller() {
+        if (!available())
+            throw new GridRuntimeException("Using GridOptimizedMarshaller on unsupported JVM version (some of " +
+                "JVM-private APIs required for the marshaller to work are missing).");
+    }
+
+    /**
+     * Initializes marshaller with given serialization flag. If {@code true},
+     * then objects will be required to implement {@link Serializable} in order
+     * to be serialize.
+     *
+     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
+     *      then objects will be required to implement {@link Serializable} in order to be
+     *      marshalled, if {@code false}, then such requirement will be relaxed.
+     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
+     */
+    public IgniteOptimizedMarshaller(boolean requireSer) {
+        this();
+
+        this.requireSer = requireSer;
+    }
+
+    /**
+     * Initializes marshaller with given serialization flag. If {@code true},
+     * then objects will be required to implement {@link Serializable} in order
+     * to be serialize.
+     *
+     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
+     *      then objects will be required to implement {@link Serializable} in order to be
+     *      marshalled, if {@code false}, then such requirement will be relaxed.
+     * @param clsNames User preregistered class names.
+     * @param clsNamesPath Path to a file with user preregistered class names.
+     * @param poolSize Object streams pool size.
+     * @throws GridException If an I/O error occurs while writing stream header.
+     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
+     */
+    public IgniteOptimizedMarshaller(boolean requireSer, @Nullable List<String> clsNames,
+                                     @Nullable String clsNamesPath, int poolSize) throws GridException {
+        this(requireSer);
+
+        setClassNames(clsNames);
+        setClassNamesPath(clsNamesPath);
+        setPoolSize(poolSize);
+    }
+
+    /**
+     * Adds provided class names for marshalling optimization.
+     * <p>
+     * <b>NOTE</b>: these collections of classes must be identical on all nodes and in the same order.
+     *
+     * @param clsNames User preregistered class names to add.
+     */
+    @SuppressWarnings("unchecked")
+    public void setClassNames(@Nullable List<String> clsNames) {
+        if (clsNames != null && !clsNames.isEmpty()) {
+            String[] clsNamesArr = clsNames.toArray(new String[clsNames.size()]);
+
+            Arrays.sort(clsNamesArr);
+
+            Map<String, Integer> name2id = U.newHashMap(clsNamesArr.length);
+            T3<String, Class<?>, IgniteOptimizedClassDescriptor>[] id2name = new T3[clsNamesArr.length];
+
+            int i = 0;
+
+            for (String name : clsNamesArr) {
+                name2id.put(name, i);
+                id2name[i++] = new T3<>(name, null, null);
+            }
+
+            IgniteOptimizedClassResolver.userClasses(name2id, id2name);
+        }
+    }
+
+    /**
+     * Specifies a name of the file which lists all class names to be optimized.
+     * The file path can either be absolute path, relative to {@code GRIDGAIN_HOME},
+     * or specify a resource file on the class path.
+     * <p>
+     * The format of the file is class name per line, like this:
+     * <pre>
+     * ...
+     * com.example.Class1
+     * com.example.Class2
+     * ...
+     * </pre>
+     * <p>
+     * <b>NOTE</b>: this class list must be identical on all nodes and in the same order.
+     *
+     * @param path Path to a file with user preregistered class names.
+     * @throws GridException If an error occurs while writing stream header.
+     */
+    public void setClassNamesPath(@Nullable String path) throws GridException {
+        if (path == null)
+            return;
+
+        URL url = GridUtils.resolveGridGainUrl(path, false);
+
+        if (url == null)
+            throw new GridException("Failed to find resource for name: " + path);
+
+        List<String> clsNames;
+
+        try {
+            clsNames = new LinkedList<>();
+
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), GridOptimizedMarshallerUtils.UTF_8))) {
+                String clsName;
+
+                while ((clsName = reader.readLine()) != null)
+                    clsNames.add(clsName);
+            }
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to read class names from path: " + path, e);
+        }
+
+        setClassNames(clsNames);
+    }
+
+    /**
+     * Specifies size of cached object streams used by marshaller. Object streams are cached for
+     * performance reason to avoid costly recreation for every serialization routine. If {@code 0} (default),
+     * pool is not used and each thread has its own cached object stream which it keeps reusing.
+     * <p>
+     * Since each stream has an internal buffer, creating a stream for each thread can lead to
+     * high memory consumption if many large messages are marshalled or unmarshalled concurrently.
+     * Consider using pool in this case. This will limit number of streams that can be created and,
+     * therefore, decrease memory consumption.
+     * <p>
+     * NOTE: Using streams pool can decrease performance since streams will be shared between
+     * different threads which will lead to more frequent context switching.
+     *
+     * @param poolSize Streams pool size. If {@code 0}, pool is not used.
+     */
+    public void setPoolSize(int poolSize) {
+        GridOptimizedObjectStreamRegistry.poolSize(poolSize);
+    }
+
+    /**
+     * @return Whether to enforce {@link Serializable} interface.
+     */
+    public boolean isRequireSerializable() {
+        return requireSer;
+    }
+
+    /**
+     * Sets flag to enforce {@link Serializable} interface or not.
+     *
+     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
+     *      then objects will be required to implement {@link Serializable} in order to be
+     *      marshalled, if {@code false}, then such requirement will be relaxed.
+     */
+    public void setRequireSerializable(boolean requireSer) {
+        this.requireSer = requireSer;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
+        assert out != null;
+
+        GridOptimizedObjectOutputStream objOut = null;
+
+        try {
+            objOut = GridOptimizedObjectStreamRegistry.out();
+
+            objOut.requireSerializable(requireSer);
+
+            objOut.out().outputStream(out);
+
+            objOut.writeObject(obj);
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to serialize object: " + obj, e);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeOut(objOut);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public byte[] marshal(@Nullable Object obj) throws GridException {
+        GridOptimizedObjectOutputStream objOut = null;
+
+        try {
+            objOut = GridOptimizedObjectStreamRegistry.out();
+
+            objOut.requireSerializable(requireSer);
+
+            objOut.writeObject(obj);
+
+            return objOut.out().array();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to serialize object: " + obj, e);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeOut(objOut);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
+        assert in != null;
+
+        GridOptimizedObjectInputStream objIn = null;
+
+        try {
+            objIn = GridOptimizedObjectStreamRegistry.in();
+
+            objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
+
+            objIn.in().inputStream(in);
+
+            return (T)objIn.readObject();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
+        }
+        catch (ClassNotFoundException e) {
+            throw new GridException("Failed to find class with given class loader for unmarshalling " +
+                "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " +
+                clsLdr, e);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeIn(objIn);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
+        assert arr != null;
+
+        GridOptimizedObjectInputStream objIn = null;
+
+        try {
+            objIn = GridOptimizedObjectStreamRegistry.in();
+
+            objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
+
+            objIn.in().bytes(arr, arr.length);
+
+            return (T)objIn.readObject();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
+        }
+        catch (ClassNotFoundException e) {
+            throw new GridException("Failed to find class with given class loader for unmarshalling " +
+                "(make sure same version of all classes are available on all nodes or enable peer-class-loading): " +
+                clsLdr, e);
+        }
+        finally {
+            GridOptimizedObjectStreamRegistry.closeIn(objIn);
+        }
+    }
+
+    /**
+     * Checks whether {@code GridOptimizedMarshaller} is able to work on the current JVM.
+     * <p>
+     * As long as {@code GridOptimizedMarshaller} uses JVM-private API, which is not guaranteed
+     * to be available on all JVM, this method should be called to ensure marshaller could work properly.
+     * <p>
+     * Result of this method is automatically checked in constructor.
+     *
+     * @return {@code true} if {@code GridOptimizedMarshaller} can work on the current JVM or
+     *  {@code false} if it can't.
+     */
+    @SuppressWarnings({"TypeParameterExtendsFinalClass", "ErrorNotRethrown"})
+    public static boolean available() {
+        try {
+            Unsafe unsafe = GridUnsafe.unsafe();
+
+            Class<? extends Unsafe> unsafeCls = unsafe.getClass();
+
+            unsafeCls.getMethod("allocateInstance", Class.class);
+            unsafeCls.getMethod("copyMemory", Object.class, long.class, Object.class, long.class, long.class);
+
+            return true;
+        }
+        catch (Exception ignored) {
+            return false;
+        }
+        catch (NoClassDefFoundError ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * Undeployment callback invoked when class loader is being undeployed.
+     *
+     * @param ldr Class loader being undeployed.
+     */
+    public static void onUndeploy(ClassLoader ldr) {
+        GridOptimizedMarshallerUtils.onUndeploy(ldr);
+    }
+
+    /**
+     * Clears internal caches and frees memory. Usually called on system stop.
+     */
+    public static void clearCache() {
+        GridOptimizedMarshallerUtils.clearCache();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java
index f7d48a5..52f451b 100644
--- a/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/gridgain/client/marshaller/optimized/GridClientOptimizedMarshaller.java
@@ -19,7 +19,7 @@ import java.nio.*;
 import java.util.*;
 
 /**
- * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} to
+ * Wrapper, that adapts {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} to
  * {@link GridClientMarshaller} interface.
  */
 public class GridClientOptimizedMarshaller implements GridClientMarshaller {
@@ -27,13 +27,13 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
     public static final byte ID = 1;
 
     /** Optimized marshaller. */
-    private final GridOptimizedMarshaller opMarsh;
+    private final IgniteOptimizedMarshaller opMarsh;
 
     /**
      * Default constructor.
      */
     public GridClientOptimizedMarshaller() {
-        opMarsh = new GridOptimizedMarshaller();
+        opMarsh = new IgniteOptimizedMarshaller();
     }
 
     /**
@@ -47,12 +47,12 @@ public class GridClientOptimizedMarshaller implements GridClientMarshaller {
      * @param poolSize Object streams pool size.
      * @throws IOException If an I/O error occurs while writing stream header.
      * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
-     * @see GridOptimizedMarshaller
+     * @see org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller
      */
     public GridClientOptimizedMarshaller(boolean requireSer, List<String> clsNames, String clsNamesPath, int poolSize)
         throws IOException {
         try {
-            opMarsh = new GridOptimizedMarshaller(requireSer, clsNames, clsNamesPath, poolSize);
+            opMarsh = new IgniteOptimizedMarshaller(requireSer, clsNames, clsNamesPath, poolSize);
         }
         catch (GridException e) {
             throw new IOException(e);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
index 7ebc4dc..2d004ae 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/rendezvous/GridCacheRendezvousAffinityFunction.java
@@ -85,7 +85,7 @@ public class GridCacheRendezvousAffinityFunction implements GridCacheAffinityFun
     private GridCacheAffinityNodeHashResolver hashIdRslvr = new GridCacheAffinityNodeAddressHashResolver();
 
     /** Marshaller. */
-    private GridMarshaller marshaller = new GridOptimizedMarshaller(false);
+    private GridMarshaller marshaller = new IgniteOptimizedMarshaller(false);
 
     /**
      * Empty constructor with all defaults.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index fcfc385..23cfdb7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -1598,7 +1598,7 @@ public class GridGainEx {
 
                     marsh = new IgniteJdkMarshaller();
                 }
-                else if (!GridOptimizedMarshaller.available()) {
+                else if (!IgniteOptimizedMarshaller.available()) {
                     U.warn(log, "GridOptimizedMarshaller is not supported on this JVM " +
                         "(only recent 1.6 and 1.7 versions HotSpot VMs are supported). " +
                         "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot VM release. " +
@@ -1609,9 +1609,9 @@ public class GridGainEx {
                     marsh = new IgniteJdkMarshaller();
                 }
                 else
-                    marsh = new GridOptimizedMarshaller();
+                    marsh = new IgniteOptimizedMarshaller();
             }
-            else if (marsh instanceof GridOptimizedMarshaller && !U.isHotSpot()) {
+            else if (marsh instanceof IgniteOptimizedMarshaller && !U.isHotSpot()) {
                 U.warn(log, "Using GridOptimizedMarshaller on untested JVM (only Java HotSpot VMs were tested) - " +
                     "object serialization behavior could yield unexpected results.",
                     "Using GridOptimizedMarshaller on untested JVM.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 8525afe..9353504 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -1180,9 +1180,9 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
         if (cfg.getIncludeEventTypes() != null && cfg.getIncludeEventTypes().length != 0)
             perf.add("Disable grid events (remove 'includeEventTypes' from configuration)");
 
-        if (GridOptimizedMarshaller.available() && !(cfg.getMarshaller() instanceof GridOptimizedMarshaller))
+        if (IgniteOptimizedMarshaller.available() && !(cfg.getMarshaller() instanceof IgniteOptimizedMarshaller))
             perf.add("Enable optimized marshaller (set 'marshaller' to " +
-                GridOptimizedMarshaller.class.getSimpleName() + ')');
+                IgniteOptimizedMarshaller.class.getSimpleName() + ')');
     }
 
     /**
@@ -1979,7 +1979,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
             notifyLifecycleBeansEx(LifecycleEventType.AFTER_GRID_STOP);
 
             // Clean internal class/classloader caches to avoid stopped contexts held in memory.
-            GridOptimizedMarshaller.clearCache();
+            IgniteOptimizedMarshaller.clearCache();
             GridMarshallerExclusions.clearCache();
             GridEnumCache.clear();
 


[13/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 580b2aa1d8c3f8bdc87356fd818ac12b519a1894
Parents: 78736f3
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:51:25 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:51:25 2014 +0300

----------------------------------------------------------------------
 .../processors/rest/GridTestMemcacheClient.java |   2 +-
 .../configuration/IgniteConfiguration.java      |   3 +-
 .../ignite/marshaller/GridMarshaller.java       |   3 +-
 .../marshaller/jdk/GridJdkMarshaller.java       | 135 +++++++++++++++++++
 .../jdk/GridJdkMarshallerDummySerializable.java |  22 +++
 .../GridJdkMarshallerInputStreamWrapper.java    |  73 ++++++++++
 .../jdk/GridJdkMarshallerObjectInputStream.java |  53 ++++++++
 .../GridJdkMarshallerObjectOutputStream.java    |  37 +++++
 .../GridJdkMarshallerOutputStreamWrapper.java   |  51 +++++++
 .../apache/ignite/marshaller/jdk/package.html   |  15 +++
 .../org/gridgain/grid/kernal/GridGainEx.java    |   2 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   2 +-
 .../tcp/GridTcpMemcachedNioListener.java        |   2 +-
 .../rest/protocols/tcp/GridTcpRestParser.java   |   2 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   2 +-
 .../grid/marshaller/jdk/GridJdkMarshaller.java  | 135 -------------------
 .../jdk/GridJdkMarshallerDummySerializable.java |  22 ---
 .../GridJdkMarshallerInputStreamWrapper.java    |  73 ----------
 .../jdk/GridJdkMarshallerObjectInputStream.java |  53 --------
 .../GridJdkMarshallerObjectOutputStream.java    |  37 -----
 .../GridJdkMarshallerOutputStreamWrapper.java   |  51 -------
 .../gridgain/grid/marshaller/jdk/package.html   |  15 ---
 .../optimized/GridOptimizedMarshaller.java      |   3 +-
 .../tcp/GridTcpDiscoverySpiAdapter.java         |   2 +-
 .../GridTcpDiscoveryMulticastIpFinder.java      |   2 +-
 .../org/gridgain/jdbc/util/GridJdbcUtils.java   |   2 +-
 .../grid/GridExternalizableAbstractTest.java    |   2 +-
 .../communication/GridIoManagerSelfTest.java    |   2 +-
 .../GridDeploymentManagerStopSelfTest.java      |   2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |   2 +-
 .../marshaller/GridMarshallerResourceBean.java  |   2 +-
 .../jdk/GridJdkMarshallerSelfTest.java          |   1 +
 .../tcp/GridCacheDhtLockBackupSelfTest.java     |   2 +-
 ...GridTcpDiscoveryMarshallerCheckSelfTest.java |   2 +-
 .../testframework/junits/GridAbstractTest.java  |   2 +-
 36 files changed, 408 insertions(+), 410 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
index 08d13a7..994603d 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
@@ -12,8 +12,8 @@ package org.gridgain.grid.kernal.processors.rest;
 import org.apache.ignite.*;
 import org.apache.ignite.logger.java.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 18075c7..d7dc2c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -25,7 +25,6 @@ import org.gridgain.grid.dr.hub.sender.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
@@ -1457,7 +1456,7 @@ public class IgniteConfiguration {
     /**
      * Should return an instance of marshaller to use in grid. If not provided,
      * {@link GridOptimizedMarshaller} will be used on Java HotSpot VM, and
-     * {@link GridJdkMarshaller} will be used on other VMs.
+     * {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller} will be used on other VMs.
      *
      * @return Marshaller to use in grid.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
index 703eb51..9c8685f 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
@@ -10,7 +10,6 @@
 package org.apache.ignite.marshaller;
 
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.jetbrains.annotations.*;
 
@@ -24,7 +23,7 @@ import java.io.*;
  * Gridgain provides the following {@code GridMarshaller} implementations:
  * <ul>
  * <li>{@link GridOptimizedMarshaller} - default</li>
- * <li>{@link GridJdkMarshaller}</li>
+ * <li>{@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller}</li>
  * </ul>
  * <p>
  * Below are examples of marshaller configuration, usage, and injection into tasks, jobs,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
new file mode 100644
index 0000000..da75a2e
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshaller.java
@@ -0,0 +1,135 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import org.apache.ignite.marshaller.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.marshaller.optimized.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ * Implementation of {@link GridMarshaller} based on JDK serialization mechanism.
+ * <p>
+ * <h1 class="header">Configuration</h1>
+ * <h2 class="header">Mandatory</h2>
+ * This marshaller has no mandatory configuration parameters.
+ * <h2 class="header">Java Example</h2>
+ * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link GridOptimizedMarshaller}.
+ * <pre name="code" class="java">
+ * GridJdkMarshaller marshaller = new GridJdkMarshaller();
+ *
+ * GridConfiguration cfg = new GridConfiguration();
+ *
+ * // Override default marshaller.
+ * cfg.setMarshaller(marshaller);
+ *
+ * // Starts grid.
+ * G.start(cfg);
+ * </pre>
+ * <h2 class="header">Spring Example</h2>
+ * GridJdkMarshaller can be configured from Spring XML configuration file:
+ * <pre name="code" class="xml">
+ * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
+ *     ...
+ *     &lt;property name="marshaller"&gt;
+ *         &lt;bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/&gt;
+ *     &lt;/property&gt;
+ *     ...
+ * &lt;/bean&gt;
+ * </pre>
+ *  <p>
+ * <img src="http://www.gridgain.com/images/spring-small.png">
+ * <br>
+ * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
+ * <h2 class="header">Injection Example</h2>
+ * GridMarshaller can be injected in users task, job or SPI as following:
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     private GridMarshaller marshaller;
+ *     ...
+ * }
+ * </pre>
+ * or
+ * <pre name="code" class="java">
+ * public class MyGridJob implements GridComputeJob {
+ *     ...
+ *     private GridMarshaller marshaller;
+ *     ...
+ *     &#64;GridMarshallerResource
+ *     public void setMarshaller(GridMarshaller marshaller) {
+ *         this.marshaller = marshaller;
+ *     }
+ *     ...
+ * }
+ * </pre>
+ * <br>
+ *
+ */
+public class GridJdkMarshaller extends GridAbstractMarshaller {
+    /** {@inheritDoc} */
+    @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
+        assert out != null;
+
+        ObjectOutputStream objOut = null;
+
+        try {
+            objOut = new GridJdkMarshallerObjectOutputStream(new GridJdkMarshallerOutputStreamWrapper(out));
+
+            // Make sure that we serialize only task, without class loader.
+            objOut.writeObject(obj);
+
+            objOut.flush();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to serialize object: " + obj, e);
+        }
+        finally{
+            U.closeQuiet(objOut);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings({"unchecked"})
+    @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
+        assert in != null;
+
+        if (clsLdr == null)
+            clsLdr = getClass().getClassLoader();
+
+        ObjectInputStream objIn = null;
+
+        try {
+            objIn = new GridJdkMarshallerObjectInputStream(new GridJdkMarshallerInputStreamWrapper(in), clsLdr);
+
+            return (T)objIn.readObject();
+        }
+        catch (IOException e) {
+            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
+        }
+        catch (ClassNotFoundException e) {
+            throw new GridException("Failed to find class with given class loader for unmarshalling " +
+                "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " +
+                clsLdr, e);
+        }
+        finally{
+            U.closeQuiet(objIn);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(GridJdkMarshaller.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java
new file mode 100644
index 0000000..6487717
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerDummySerializable.java
@@ -0,0 +1,22 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import java.io.*;
+
+/**
+ * Serializable object used for {@link Object} replacement.
+ */
+class GridJdkMarshallerDummySerializable implements Serializable {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    // No-op.
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
new file mode 100644
index 0000000..fb08f40
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
@@ -0,0 +1,73 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import java.io.*;
+
+/**
+ * Wrapper for {@link InputStream}.
+ */
+class GridJdkMarshallerInputStreamWrapper extends InputStream {
+    /** */
+    private InputStream in;
+
+    /**
+     * Creates wrapper.
+     *
+     * @param in Wrapped input stream
+     */
+    GridJdkMarshallerInputStreamWrapper(InputStream in) {
+        assert in != null;
+
+        this.in = in;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read() throws IOException {
+        return in.read();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read(byte[] b) throws IOException {
+        return in.read(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read(byte[] b, int off, int len) throws IOException {
+        return in.read(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override public long skip(long n) throws IOException {
+        return in.skip(n);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int available() throws IOException {
+        return in.available();
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
+    @Override public void mark(int readLimit) {
+        in.mark(readLimit);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
+    @Override public void reset() throws IOException {
+        in.reset();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean markSupported() {
+        return in.markSupported();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
new file mode 100644
index 0000000..5a64a75
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
@@ -0,0 +1,53 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import java.io.*;
+
+/**
+ * This class defines custom JDK object input stream.
+ */
+class GridJdkMarshallerObjectInputStream extends ObjectInputStream {
+    /** */
+    private final ClassLoader clsLdr;
+
+    /**
+     * @param in Parent input stream.
+     * @param clsLdr Custom class loader.
+     * @throws IOException If initialization failed.
+     */
+    GridJdkMarshallerObjectInputStream(InputStream in, ClassLoader clsLdr) throws IOException {
+        super(in);
+
+        assert clsLdr != null;
+
+        this.clsLdr = clsLdr;
+
+        enableResolveObject(true);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
+        // NOTE: DO NOT CHANGE TO 'clsLoader.loadClass()'
+        // Must have 'Class.forName()' instead of clsLoader.loadClass()
+        // due to weird ClassNotFoundExceptions for arrays of classes
+        // in certain cases.
+        return Class.forName(desc.getName(), true, clsLdr);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object resolveObject(Object o) throws IOException {
+        if (o != null && o.getClass().equals(GridJdkMarshallerDummySerializable.class))
+            return new Object();
+
+        return super.resolveObject(o);
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
new file mode 100644
index 0000000..51cfdd6
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
@@ -0,0 +1,37 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import org.apache.ignite.marshaller.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+
+/**
+ * This class defines own object output stream.
+ */
+class GridJdkMarshallerObjectOutputStream extends ObjectOutputStream {
+    /**
+     * @param out Output stream.
+     * @throws IOException Thrown in case of any I/O errors.
+     */
+    GridJdkMarshallerObjectOutputStream(OutputStream out) throws IOException {
+        super(out);
+
+        enableReplaceObject(true);
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override protected Object replaceObject(Object o) throws IOException {
+        return o == null || GridMarshallerExclusions.isExcluded(o.getClass()) ? null :
+            o.getClass().equals(Object.class) ? new GridJdkMarshallerDummySerializable() : super.replaceObject(o);
+    }
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
new file mode 100644
index 0000000..b5e9e06
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
@@ -0,0 +1,51 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.jdk;
+
+import java.io.*;
+
+/**
+ * Wrapper for {@link OutputStream}.
+ */
+class GridJdkMarshallerOutputStreamWrapper extends OutputStream {
+    /** */
+    private OutputStream out;
+
+    /**
+     * Creates wrapper.
+     *
+     * @param out Wrapped output stream
+     */
+    GridJdkMarshallerOutputStreamWrapper(OutputStream out) {
+        assert out != null;
+
+        this.out = out;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(int b) throws IOException {
+        out.write(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(byte[] b) throws IOException {
+        out.write(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(byte[] b, int off, int len) throws IOException {
+        out.write(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void flush() throws IOException {
+        out.flush();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/package.html b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/package.html
new file mode 100644
index 0000000..6ccdc47
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains JDK <tt>java.io</tt> based marshaller.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index 1fe7cbd..b662845 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -15,6 +15,7 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.logger.*;
 import org.apache.ignite.logger.java.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.mbean.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -23,7 +24,6 @@ import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.kernal.processors.interop.*;
 import org.gridgain.grid.kernal.processors.resource.*;
 import org.gridgain.grid.kernal.processors.spring.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.segmentation.*;
 import org.gridgain.grid.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index 434a290..fa8801a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -13,12 +13,12 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index eaf57e1..00064a6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -13,13 +13,13 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.indexing.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index 6f14c58..b3c8b22 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.rest.*;
 import org.gridgain.grid.kernal.processors.rest.handlers.cache.*;
 import org.gridgain.grid.kernal.processors.rest.request.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
index a45179c..71ed4f3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -9,10 +9,10 @@
 package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.nio.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
index ee574af..28dce35 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestProtocol.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.client.marshaller.jdk.*;
 import org.gridgain.client.marshaller.optimized.*;
@@ -20,7 +21,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.rest.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
 import org.gridgain.grid.kernal.processors.rest.protocols.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java
deleted file mode 100644
index b8826a5..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshaller.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.jdk;
-
-import org.apache.ignite.marshaller.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-/**
- * Implementation of {@link GridMarshaller} based on JDK serialization mechanism.
- * <p>
- * <h1 class="header">Configuration</h1>
- * <h2 class="header">Mandatory</h2>
- * This marshaller has no mandatory configuration parameters.
- * <h2 class="header">Java Example</h2>
- * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link GridOptimizedMarshaller}.
- * <pre name="code" class="java">
- * GridJdkMarshaller marshaller = new GridJdkMarshaller();
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * // Override default marshaller.
- * cfg.setMarshaller(marshaller);
- *
- * // Starts grid.
- * G.start(cfg);
- * </pre>
- * <h2 class="header">Spring Example</h2>
- * GridJdkMarshaller can be configured from Spring XML configuration file:
- * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
- *     ...
- *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.gridgain.grid.marshaller.jdk.GridJdkMarshaller"/&gt;
- *     &lt;/property&gt;
- *     ...
- * &lt;/bean&gt;
- * </pre>
- *  <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
- * <h2 class="header">Injection Example</h2>
- * GridMarshaller can be injected in users task, job or SPI as following:
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     &#64;GridMarshallerResource
- *     private GridMarshaller marshaller;
- *     ...
- * }
- * </pre>
- * or
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     private GridMarshaller marshaller;
- *     ...
- *     &#64;GridMarshallerResource
- *     public void setMarshaller(GridMarshaller marshaller) {
- *         this.marshaller = marshaller;
- *     }
- *     ...
- * }
- * </pre>
- * <br>
- *
- */
-public class GridJdkMarshaller extends GridAbstractMarshaller {
-    /** {@inheritDoc} */
-    @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
-        assert out != null;
-
-        ObjectOutputStream objOut = null;
-
-        try {
-            objOut = new GridJdkMarshallerObjectOutputStream(new GridJdkMarshallerOutputStreamWrapper(out));
-
-            // Make sure that we serialize only task, without class loader.
-            objOut.writeObject(obj);
-
-            objOut.flush();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to serialize object: " + obj, e);
-        }
-        finally{
-            U.closeQuiet(objOut);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings({"unchecked"})
-    @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
-        assert in != null;
-
-        if (clsLdr == null)
-            clsLdr = getClass().getClassLoader();
-
-        ObjectInputStream objIn = null;
-
-        try {
-            objIn = new GridJdkMarshallerObjectInputStream(new GridJdkMarshallerInputStreamWrapper(in), clsLdr);
-
-            return (T)objIn.readObject();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
-        }
-        catch (ClassNotFoundException e) {
-            throw new GridException("Failed to find class with given class loader for unmarshalling " +
-                "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " +
-                clsLdr, e);
-        }
-        finally{
-            U.closeQuiet(objIn);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridJdkMarshaller.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerDummySerializable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerDummySerializable.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerDummySerializable.java
deleted file mode 100644
index b0e8645..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerDummySerializable.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.jdk;
-
-import java.io.*;
-
-/**
- * Serializable object used for {@link Object} replacement.
- */
-class GridJdkMarshallerDummySerializable implements Serializable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    // No-op.
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
deleted file mode 100644
index 63bc09b..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerInputStreamWrapper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.jdk;
-
-import java.io.*;
-
-/**
- * Wrapper for {@link InputStream}.
- */
-class GridJdkMarshallerInputStreamWrapper extends InputStream {
-    /** */
-    private InputStream in;
-
-    /**
-     * Creates wrapper.
-     *
-     * @param in Wrapped input stream
-     */
-    GridJdkMarshallerInputStreamWrapper(InputStream in) {
-        assert in != null;
-
-        this.in = in;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read() throws IOException {
-        return in.read();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read(byte[] b) throws IOException {
-        return in.read(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read(byte[] b, int off, int len) throws IOException {
-        return in.read(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override public long skip(long n) throws IOException {
-        return in.skip(n);
-    }
-
-    /** {@inheritDoc} */
-    @Override public int available() throws IOException {
-        return in.available();
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
-    @Override public void mark(int readLimit) {
-        in.mark(readLimit);
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings({"NonSynchronizedMethodOverridesSynchronizedMethod"})
-    @Override public void reset() throws IOException {
-        in.reset();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean markSupported() {
-        return in.markSupported();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectInputStream.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
deleted file mode 100644
index a402db3..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectInputStream.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.jdk;
-
-import java.io.*;
-
-/**
- * This class defines custom JDK object input stream.
- */
-class GridJdkMarshallerObjectInputStream extends ObjectInputStream {
-    /** */
-    private final ClassLoader clsLdr;
-
-    /**
-     * @param in Parent input stream.
-     * @param clsLdr Custom class loader.
-     * @throws IOException If initialization failed.
-     */
-    GridJdkMarshallerObjectInputStream(InputStream in, ClassLoader clsLdr) throws IOException {
-        super(in);
-
-        assert clsLdr != null;
-
-        this.clsLdr = clsLdr;
-
-        enableResolveObject(true);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
-        // NOTE: DO NOT CHANGE TO 'clsLoader.loadClass()'
-        // Must have 'Class.forName()' instead of clsLoader.loadClass()
-        // due to weird ClassNotFoundExceptions for arrays of classes
-        // in certain cases.
-        return Class.forName(desc.getName(), true, clsLdr);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected Object resolveObject(Object o) throws IOException {
-        if (o != null && o.getClass().equals(GridJdkMarshallerDummySerializable.class))
-            return new Object();
-
-        return super.resolveObject(o);
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
deleted file mode 100644
index e820977..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerObjectOutputStream.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.jdk;
-
-import org.apache.ignite.marshaller.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-
-/**
- * This class defines own object output stream.
- */
-class GridJdkMarshallerObjectOutputStream extends ObjectOutputStream {
-    /**
-     * @param out Output stream.
-     * @throws IOException Thrown in case of any I/O errors.
-     */
-    GridJdkMarshallerObjectOutputStream(OutputStream out) throws IOException {
-        super(out);
-
-        enableReplaceObject(true);
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override protected Object replaceObject(Object o) throws IOException {
-        return o == null || GridMarshallerExclusions.isExcluded(o.getClass()) ? null :
-            o.getClass().equals(Object.class) ? new GridJdkMarshallerDummySerializable() : super.replaceObject(o);
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
deleted file mode 100644
index 29a7eda..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerOutputStreamWrapper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.jdk;
-
-import java.io.*;
-
-/**
- * Wrapper for {@link OutputStream}.
- */
-class GridJdkMarshallerOutputStreamWrapper extends OutputStream {
-    /** */
-    private OutputStream out;
-
-    /**
-     * Creates wrapper.
-     *
-     * @param out Wrapped output stream
-     */
-    GridJdkMarshallerOutputStreamWrapper(OutputStream out) {
-        assert out != null;
-
-        this.out = out;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(int b) throws IOException {
-        out.write(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(byte[] b) throws IOException {
-        out.write(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(byte[] b, int off, int len) throws IOException {
-        out.write(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void flush() throws IOException {
-        out.flush();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/package.html b/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/package.html
deleted file mode 100644
index 6ccdc47..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/jdk/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains JDK <tt>java.io</tt> based marshaller.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
index 203ddb7..d3ae173 100644
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
@@ -11,7 +11,6 @@ package org.gridgain.grid.marshaller.optimized;
 
 import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -25,7 +24,7 @@ import java.util.*;
 import static org.gridgain.grid.marshaller.optimized.GridOptimizedMarshallerUtils.*;
 
 /**
- * Optimized implementation of {@link GridMarshaller}. Unlike {@link GridJdkMarshaller},
+ * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.GridJdkMarshaller},
  * which is based on standard {@link ObjectOutputStream}, this marshaller does not
  * enforce that all serialized objects implement {@link Serializable} interface. It is also
  * about 20 times faster as it removes lots of serialization overhead that exists in

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
index e8dd237..f1f8761 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
@@ -12,9 +12,9 @@ package org.gridgain.grid.spi.discovery.tcp;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
index c0e460b..792bdfc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast;
 
 import org.apache.ignite.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
index 1ddadfe..faedd51 100644
--- a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
+++ b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
@@ -10,8 +10,8 @@
 package org.gridgain.jdbc.util;
 
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.sql.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
index bfddb5a..2a52ec4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid;
 
 import org.apache.ignite.marshaller.*;
-import org.gridgain.grid.marshaller.jdk.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.testframework.junits.common.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
index 6cdf5b6..1178e14 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/communication/GridIoManagerSelfTest.java
@@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.managers.communication;
 
 import org.apache.commons.collections.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.discovery.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.communication.tcp.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java
index cc3bfc0..7a0ce0f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentManagerStopSelfTest.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.managers.deployment;
 
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.deployment.*;
 import org.gridgain.testframework.junits.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
index 239e128..5757f86 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java
@@ -11,11 +11,11 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.marshaller.jdk.*;
 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/580b2aa1/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 c138707..0f35995 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
@@ -14,9 +14,9 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.logger.java.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.loadbalancer.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.thread.*;
 import org.springframework.context.*;
 import org.springframework.context.support.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
index 9f93fc4..5920ff7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
@@ -10,6 +10,7 @@
 package org.gridgain.grid.marshaller.jdk;
 
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index 0f66823..fe21efe 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -13,12 +13,12 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.communication.*;
 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/580b2aa1/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
index 0eaa098..83ead72 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.spi.discovery.tcp;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/580b2aa1/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 910d3c5..0a20f9f 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
@@ -16,13 +16,13 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.jdk.*;
 import org.apache.log4j.*;
 import org.gridgain.grid.*;
 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.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.checkpoint.sharedfs.*;
 import org.gridgain.grid.spi.communication.tcp.*;


[37/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: a7c947cc2c147f1219506a8753d092209cd5ec91
Parents: f586cfc
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:35:25 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:35:25 2014 +0300

----------------------------------------------------------------------
 .../optimized/GridOptimizedMarshallerUtils.java |  450 --------
 .../GridOptimizedObjectInputStream.java         | 1008 ------------------
 .../GridOptimizedObjectOutputStream.java        |  831 ---------------
 .../GridOptimizedObjectStreamRegistry.java      |  215 ----
 .../IgniteOptimizedClassDescriptor.java         |    8 +-
 .../optimized/IgniteOptimizedClassResolver.java |   18 +-
 .../optimized/IgniteOptimizedMarshaller.java    |   32 +-
 .../IgniteOptimizedMarshallerUtils.java         |  450 ++++++++
 .../IgniteOptimizedObjectInputStream.java       | 1008 ++++++++++++++++++
 .../IgniteOptimizedObjectOutputStream.java      |  831 +++++++++++++++
 .../IgniteOptimizedObjectStreamRegistry.java    |  215 ++++
 .../optimized/GridOptimizedMarshallerTest.java  |   10 +-
 .../GridOptimizedObjectStreamSelfTest.java      |   20 +-
 13 files changed, 2548 insertions(+), 2548 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
deleted file mode 100644
index de90035..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerUtils.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.nio.charset.*;
-import java.security.*;
-import java.util.*;
-import java.util.concurrent.*;
-
-import static org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshallable.*;
-
-/**
- * Miscellaneous utility methods to facilitate {@link IgniteOptimizedMarshaller}.
- */
-class GridOptimizedMarshallerUtils {
-    /** Unsafe. */
-    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-    /** {@code Null} object reference. */
-    static final byte NULL = (byte)0x70;
-
-    /** Handle reference. */
-    static final byte HANDLE = (byte)0x71;
-
-    /** Object reference. */
-    static final byte OBJECT = (byte)0x72;
-
-    /** UTF-8 character name. */
-    static final Charset UTF_8 = Charset.forName("UTF-8");
-
-    /** Class descriptors cache. */
-    private static final ConcurrentMap<Class<?>, IgniteOptimizedClassDescriptor> CLS_DESC_CACHE =
-        new ConcurrentHashMap8<>(256);
-
-    /** Classes cache by name. */
-    private static final ConcurrentHashMap8<ClassLoader, ConcurrentHashMap8<String, Class<?>>> CLS_BY_NAME_CACHE =
-        new ConcurrentHashMap8<>();
-
-    /**
-     * Suppresses default constructor, ensuring non-instantiability.
-     */
-    private GridOptimizedMarshallerUtils() {
-        // No-op.
-    }
-
-    /**
-     * Gets class for given name and class loader.
-     *
-     * @param name Class name.
-     * @param ldr Class loader.
-     * @return Class.
-     * @throws ClassNotFoundException If class was not found.
-     */
-    static Class<?> forName(String name, ClassLoader ldr) throws ClassNotFoundException {
-        assert ldr != null;
-        assert name != null;
-
-        ConcurrentHashMap8<String, Class<?>> cache = CLS_BY_NAME_CACHE.get(ldr);
-
-        Class<?> cls = null;
-
-        if (cache == null) {
-            cache = new ConcurrentHashMap8<>();
-
-            ConcurrentHashMap8<String, Class<?>> old = CLS_BY_NAME_CACHE.putIfAbsent(ldr, cache);
-
-            if (old != null) {
-                cache = old;
-
-                cls = cache.get(name);
-            }
-        }
-        else
-            cls = cache.get(name);
-
-        if (cls == null) {
-            cls = Class.forName(name, true, ldr);
-
-            cache.put(name, cls);
-        }
-
-        return cls;
-    }
-
-    /**
-     * Gets descriptor for provided class.
-     *
-     * @param cls Class.
-     * @param obj Object.
-     * @return Descriptor.
-     * @throws IOException In case of error.
-     */
-    static IgniteOptimizedClassDescriptor classDescriptor(Class<?> cls, @Nullable Object obj) throws IOException {
-        if (obj != null) {
-            if (obj instanceof IgniteOptimizedMarshallable) {
-                IgniteOptimizedMarshallable m = (IgniteOptimizedMarshallable)obj;
-
-                Object clsId = m.ggClassId();
-
-                if (clsId != null && !(clsId instanceof IgniteOptimizedClassDescriptor))
-                    throw new IOException("Method '" + obj.getClass().getName() + ".ggClassId() must return " +
-                        "the value of the field '" + CLS_ID_FIELD_NAME + "'.");
-
-                IgniteOptimizedClassDescriptor desc = (IgniteOptimizedClassDescriptor)clsId;
-
-                if (desc == null) {
-                    desc = new IgniteOptimizedClassDescriptor(cls);
-
-                    try {
-                        Field field = obj.getClass().getDeclaredField(CLS_ID_FIELD_NAME);
-
-                        field.setAccessible(true);
-
-                        Object o = field.get(null);
-
-                        if (o == null) {
-                            if ((field.getModifiers() & Modifier.STATIC) == 0)
-                                throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared static: " +
-                                    obj.getClass().getName());
-
-                            field.set(null, desc);
-
-                            if (m.ggClassId() == null)
-                                throw new IOException( "Method '" + obj.getClass().getName() + ".ggClassId() must " +
-                                    "return the value of the field '" + CLS_ID_FIELD_NAME + "': "
-                                    + obj.getClass().getName());
-                        }
-                        else if (!(o instanceof IgniteOptimizedClassDescriptor))
-                            throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared with " +
-                                "null value: " + obj.getClass().getName());
-                    }
-                    catch (NoSuchFieldException e) {
-                        throw new IOException("GridOptimizedMarshallable classes must have static field declared " +
-                            "[fieldName=" + CLS_ID_FIELD_NAME + ", cls=" + obj.getClass().getName() + ']', e);
-                    }
-                    catch (IllegalAccessException e) {
-                        throw new IOException("Failed to set field '" + CLS_ID_FIELD_NAME + "' on '" +
-                            obj.getClass().getName() + "' class.", e);
-                    }
-                }
-
-                return desc;
-            }
-        }
-
-        IgniteOptimizedClassDescriptor desc = CLS_DESC_CACHE.get(cls);
-
-        if (desc == null) {
-            IgniteOptimizedClassDescriptor existing = CLS_DESC_CACHE.putIfAbsent(cls,
-                desc = new IgniteOptimizedClassDescriptor(cls));
-
-            if (existing != null)
-                desc = existing;
-        }
-
-        return desc;
-    }
-
-    /**
-     * Undeployment callback.
-     *
-     * @param ldr Undeployed class loader.
-     */
-    public static void onUndeploy(ClassLoader ldr) {
-        CLS_BY_NAME_CACHE.remove(ldr);
-
-        for (Class<?> cls : CLS_DESC_CACHE.keySet()) {
-            if (ldr.equals(cls.getClassLoader()))
-                CLS_DESC_CACHE.remove(cls);
-        }
-    }
-
-    /**
-     * Intended for test purposes only.
-     */
-    public static void clearCache() {
-        CLS_BY_NAME_CACHE.clear();
-        CLS_DESC_CACHE.clear();
-    }
-
-    /**
-     *
-     */
-    public static void printMemoryStats() {
-        X.println(">>>");
-        X.println(">>> GridOptimizedMarshallerUtils memory stats:");
-        X.println(" Cache size: " + CLS_DESC_CACHE.size());
-
-        for (Map.Entry<Class<?>, IgniteOptimizedClassDescriptor> e : CLS_DESC_CACHE.entrySet())
-            X.println(" " + e.getKey() + " : " + e.getValue());
-    }
-
-    /**
-     * Computes the serial version UID value for the given class.
-     * The code is taken from {@link ObjectStreamClass#computeDefaultSUID(Class)}.
-     *
-     * @param cls A class.
-     * @param fields Fields.
-     * @return A serial version UID.
-     * @throws IOException If failed.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    static Long computeSerialVersionUid(Class cls, List<Field> fields) throws IOException {
-        if (Serializable.class.isAssignableFrom(cls) && !Enum.class.isAssignableFrom(cls))
-            return ObjectStreamClass.lookup(cls).getSerialVersionUID();
-
-        MessageDigest md;
-
-        try {
-            md = MessageDigest.getInstance("SHA");
-        }
-        catch (NoSuchAlgorithmException e) {
-            throw new IOException("Failed to get digest for SHA.", e);
-        }
-
-        md.update(cls.getName().getBytes(UTF_8));
-
-        if (!F.isEmpty(fields)) {
-            for (int i = 0; i < fields.size(); i++) {
-                Field f = fields.get(i);
-
-                md.update(f.getName().getBytes(UTF_8));
-                md.update(f.getType().getName().getBytes(UTF_8));
-            }
-        }
-
-        byte[] hashBytes = md.digest();
-
-        long hash = 0;
-
-        // Composes a single-long hash from the byte[] hash.
-        for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--)
-            hash = (hash << 8) | (hashBytes[i] & 0xFF);
-
-        return hash;
-    }
-
-    /**
-     * Gets byte field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Byte value.
-     */
-    static byte getByte(Object obj, long off) {
-        return UNSAFE.getByte(obj, off);
-    }
-
-    /**
-     * Sets byte field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setByte(Object obj, long off, byte val) {
-        UNSAFE.putByte(obj, off, val);
-    }
-
-    /**
-     * Gets short field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Short value.
-     */
-    static short getShort(Object obj, long off) {
-        return UNSAFE.getShort(obj, off);
-    }
-
-    /**
-     * Sets short field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setShort(Object obj, long off, short val) {
-        UNSAFE.putShort(obj, off, val);
-    }
-
-    /**
-     * Gets integer field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Integer value.
-     */
-    static int getInt(Object obj, long off) {
-        return UNSAFE.getInt(obj, off);
-    }
-
-    /**
-     * Sets integer field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setInt(Object obj, long off, int val) {
-        UNSAFE.putInt(obj, off, val);
-    }
-
-    /**
-     * Gets long field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Long value.
-     */
-    static long getLong(Object obj, long off) {
-        return UNSAFE.getLong(obj, off);
-    }
-
-    /**
-     * Sets long field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setLong(Object obj, long off, long val) {
-        UNSAFE.putLong(obj, off, val);
-    }
-
-    /**
-     * Gets float field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Float value.
-     */
-    static float getFloat(Object obj, long off) {
-        return UNSAFE.getFloat(obj, off);
-    }
-
-    /**
-     * Sets float field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setFloat(Object obj, long off, float val) {
-        UNSAFE.putFloat(obj, off, val);
-    }
-
-    /**
-     * Gets double field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Double value.
-     */
-    static double getDouble(Object obj, long off) {
-        return UNSAFE.getDouble(obj, off);
-    }
-
-    /**
-     * Sets double field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setDouble(Object obj, long off, double val) {
-        UNSAFE.putDouble(obj, off, val);
-    }
-
-    /**
-     * Gets char field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Char value.
-     */
-    static char getChar(Object obj, long off) {
-        return UNSAFE.getChar(obj, off);
-    }
-
-    /**
-     * Sets char field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setChar(Object obj, long off, char val) {
-        UNSAFE.putChar(obj, off, val);
-    }
-
-    /**
-     * Gets boolean field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Boolean value.
-     */
-    static boolean getBoolean(Object obj, long off) {
-        return UNSAFE.getBoolean(obj, off);
-    }
-
-    /**
-     * Sets boolean field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setBoolean(Object obj, long off, boolean val) {
-        UNSAFE.putBoolean(obj, off, val);
-    }
-
-    /**
-     * Gets field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @return Value.
-     */
-    static Object getObject(Object obj, long off) {
-        return UNSAFE.getObject(obj, off);
-    }
-
-    /**
-     * Sets field value.
-     *
-     * @param obj Object.
-     * @param off Field offset.
-     * @param val Value.
-     */
-    static void setObject(Object obj, long off, Object val) {
-        UNSAFE.putObject(obj, off, val);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
deleted file mode 100644
index 9aae0ab..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectInputStream.java
+++ /dev/null
@@ -1,1008 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.io.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.marshaller.optimized.GridOptimizedMarshallerUtils.*;
-
-/**
- * Optimized object input stream.
- */
-class GridOptimizedObjectInputStream extends ObjectInputStream {
-    /** Unsafe. */
-    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-    /** Dummy object for HashSet. */
-    private static final Object DUMMY = new Object();
-
-    /** */
-    private final HandleTable handles = new HandleTable(10);
-
-    /** */
-    private ClassLoader clsLdr;
-
-    /** */
-    private GridDataInput in;
-
-    /** */
-    private Object curObj;
-
-    /** */
-    private List<T2<IgniteOptimizedFieldType, Long>> curFields;
-
-    /** */
-    private List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoList;
-
-    /** */
-    private Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoMap;
-
-    /** */
-    private Class<?> curCls;
-
-    /**
-     * @param in Input.
-     * @throws IOException In case of error.
-     */
-    GridOptimizedObjectInputStream(GridDataInput in) throws IOException {
-        this.in = in;
-    }
-
-    /**
-     * @throws IOException In case of error.
-     */
-    GridOptimizedObjectInputStream() throws IOException {
-        // No-op.
-    }
-
-    /**
-     * @param clsLdr Class loader.
-     */
-    void classLoader(ClassLoader clsLdr) {
-        this.clsLdr = clsLdr;
-    }
-
-    /**
-     * @return Class loader.
-     */
-    ClassLoader classLoader() {
-        return clsLdr;
-    }
-
-    /**
-     * @return Input.
-     */
-    public GridDataInput in() {
-        return in;
-    }
-
-    /**
-     * @param in Input.
-     */
-    public void in(GridDataInput in) {
-        this.in = in;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() throws IOException {
-        reset();
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public void reset() throws IOException {
-        in.reset();
-        handles.clear();
-
-        curObj = null;
-        curFields = null;
-        curFieldInfoList = null;
-        curFieldInfoMap = null;
-    }
-
-    /** {@inheritDoc} */
-    @Override public Object readObjectOverride() throws ClassNotFoundException, IOException {
-        curObj = null;
-        curFields = null;
-        curFieldInfoList = null;
-        curFieldInfoMap = null;
-
-        byte ref = in.readByte();
-
-        switch (ref) {
-            case NULL:
-                return null;
-
-            case HANDLE:
-                return handles.lookup(readInt());
-
-            case OBJECT:
-                IgniteOptimizedClassDescriptor desc = IgniteOptimizedClassResolver.readClass(this, clsLdr);
-
-                curCls = desc.describedClass();
-
-                return desc.read(this);
-
-            default:
-                SB msg = new SB("Unexpected error occurred during unmarshalling");
-
-                if (curCls != null)
-                    msg.a(" of an instance of the class: ").a(curCls.getName());
-
-                msg.a(". Check that all nodes are running the same version of GridGain and that all nodes have " +
-                    "GridOptimizedMarshaller configured with identical optimized classes lists, if any " +
-                    "(see setClassNames and setClassNamesPath methods). If your serialized classes implement " +
-                    "java.io.Externalizable interface, verify that serialization logic is correct.");
-
-                throw new IOException(msg.toString());
-        }
-    }
-
-    /**
-     * Reads array from this stream.
-     *
-     * @param compType Array component type.
-     * @return Array.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    <T> T[] readArray(Class<T> compType) throws ClassNotFoundException, IOException {
-        int len = in.readInt();
-
-        T[] arr = (T[])Array.newInstance(compType, len);
-
-        handles.assign(arr);
-
-        for (int i = 0; i < len; i++)
-            arr[i] = (T)readObject();
-
-        return arr;
-    }
-
-    /**
-     * Reads {@link UUID} from this stream.
-     *
-     * @return UUID.
-     * @throws IOException In case of error.
-     */
-    UUID readUuid() throws IOException {
-        UUID uuid = new UUID(readLong(), readLong());
-
-        handles.assign(uuid);
-
-        return uuid;
-    }
-
-    /**
-     * Reads {@link Properties} from this stream.
-     *
-     * @return Properties.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    Properties readProperties() throws ClassNotFoundException, IOException {
-        Properties dflts = readBoolean() ? null : (Properties)readObject();
-
-        Properties props = new Properties(dflts);
-
-        int size = in.readInt();
-
-        for (int i = 0; i < size; i++)
-            props.setProperty(readUTF(), readUTF());
-
-        handles.assign(props);
-
-        return props;
-    }
-
-    /**
-     * Reads and sets all non-static and non-transient field values from this stream.
-     *
-     * @param obj Object.
-     * @param fieldOffs Field offsets.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    void readFields(Object obj, List<T2<IgniteOptimizedFieldType, Long>> fieldOffs) throws ClassNotFoundException,
-        IOException {
-        for (int i = 0; i < fieldOffs.size(); i++) {
-            T2<IgniteOptimizedFieldType, Long> t = fieldOffs.get(i);
-
-            switch ((t.get1())) {
-                case BYTE:
-                    setByte(obj, t.get2(), readByte());
-
-                    break;
-
-                case SHORT:
-                    setShort(obj, t.get2(), readShort());
-
-                    break;
-
-                case INT:
-                    setInt(obj, t.get2(), readInt());
-
-                    break;
-
-                case LONG:
-                    setLong(obj, t.get2(), readLong());
-
-                    break;
-
-                case FLOAT:
-                    setFloat(obj, t.get2(), readFloat());
-
-                    break;
-
-                case DOUBLE:
-                    setDouble(obj, t.get2(), readDouble());
-
-                    break;
-
-                case CHAR:
-                    setChar(obj, t.get2(), readChar());
-
-                    break;
-
-                case BOOLEAN:
-                    setBoolean(obj, t.get2(), readBoolean());
-
-                    break;
-
-                case OTHER:
-                    setObject(obj, t.get2(), readObject());
-            }
-        }
-    }
-
-    /**
-     * Reads {@link Externalizable} object.
-     *
-     * @param constructor Constructor.
-     * @param readResolveMtd {@code readResolve} method.
-     * @return Object.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    Object readExternalizable(Constructor<?> constructor, Method readResolveMtd)
-        throws ClassNotFoundException, IOException {
-        Object obj;
-
-        try {
-            obj = constructor.newInstance();
-        }
-        catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
-            throw new IOException(e);
-        }
-
-        int handle = handles.assign(obj);
-
-        Externalizable extObj = ((Externalizable)obj);
-
-        extObj.readExternal(this);
-
-        if (readResolveMtd != null) {
-            try {
-                obj = readResolveMtd.invoke(obj);
-
-                handles.set(handle, obj);
-            }
-            catch (IllegalAccessException | InvocationTargetException e) {
-                throw new IOException(e);
-            }
-        }
-
-        return obj;
-    }
-
-    /**
-     * Reads serializable object.
-     *
-     * @param cls Class.
-     * @param mtds {@code readObject} methods.
-     * @param readResolveMtd {@code readResolve} method.
-     * @param fields class fields details.
-     * @return Object.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    Object readSerializable(Class<?> cls, List<Method> mtds, Method readResolveMtd,
-        IgniteOptimizedClassDescriptor.Fields fields) throws ClassNotFoundException, IOException {
-        Object obj;
-
-        try {
-            obj = UNSAFE.allocateInstance(cls);
-        }
-        catch (InstantiationException e) {
-            throw new IOException(e);
-        }
-
-        int handle = handles.assign(obj);
-
-        for (int i = 0; i < mtds.size(); i++) {
-            Method mtd = mtds.get(i);
-
-            if (mtd != null) {
-                curObj = obj;
-                curFields = fields.fieldOffs(i);
-                curFieldInfoList = fields.fieldInfoList(i);
-                curFieldInfoMap = fields.fieldInfoMap(i);
-
-                try {
-                    mtd.invoke(obj, this);
-                }
-                catch (IllegalAccessException | InvocationTargetException e) {
-                    throw new IOException(e);
-                }
-            }
-            else
-                readFields(obj, fields.fieldOffs(i));
-        }
-
-        if (readResolveMtd != null) {
-            try {
-                obj = readResolveMtd.invoke(obj);
-
-                handles.set(handle, obj);
-            }
-            catch (IllegalAccessException | InvocationTargetException e) {
-                throw new IOException(e);
-            }
-        }
-
-        return obj;
-    }
-
-    /**
-     * Reads {@link ArrayList}.
-     *
-     * @return List.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    ArrayList<?> readArrayList() throws ClassNotFoundException, IOException {
-        int size = readInt();
-
-        ArrayList<Object> list = new ArrayList<>(size);
-
-        handles.assign(list);
-
-        for (int i = 0; i < size; i++)
-            list.add(readObject());
-
-        return list;
-    }
-
-    /**
-     * Reads {@link HashMap}.
-     *
-     * @param set Whether reading underlying map from {@link HashSet}.
-     * @return Map.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    HashMap<?, ?> readHashMap(boolean set) throws ClassNotFoundException, IOException {
-        int size = readInt();
-        float loadFactor = readFloat();
-
-        HashMap<Object, Object> map = new HashMap<>(size, loadFactor);
-
-        if (!set)
-            handles.assign(map);
-
-        for (int i = 0; i < size; i++) {
-            Object key = readObject();
-            Object val = !set ? readObject() : DUMMY;
-
-            map.put(key, val);
-        }
-
-        return map;
-    }
-
-    /**
-     * Reads {@link HashSet}.
-     *
-     * @param mapFieldOff Map field offset.
-     * @return Set.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    HashSet<?> readHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
-        try {
-            HashSet<Object> set = (HashSet<Object>)UNSAFE.allocateInstance(HashSet.class);
-
-            handles.assign(set);
-
-            setObject(set, mapFieldOff, readHashMap(true));
-
-            return set;
-        }
-        catch (InstantiationException e) {
-            throw new IOException(e);
-        }
-    }
-
-    /**
-     * Reads {@link LinkedList}.
-     *
-     * @return List.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    LinkedList<?> readLinkedList() throws ClassNotFoundException, IOException {
-        int size = readInt();
-
-        LinkedList<Object> list = new LinkedList<>();
-
-        handles.assign(list);
-
-        for (int i = 0; i < size; i++)
-            list.add(readObject());
-
-        return list;
-    }
-
-    /**
-     * Reads {@link LinkedHashMap}.
-     *
-     * @param set Whether reading underlying map from {@link LinkedHashSet}.
-     * @return Map.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    LinkedHashMap<?, ?> readLinkedHashMap(boolean set) throws ClassNotFoundException, IOException {
-        int size = readInt();
-        float loadFactor = readFloat();
-        boolean accessOrder = readBoolean();
-
-        LinkedHashMap<Object, Object> map = new LinkedHashMap<>(size, loadFactor, accessOrder);
-
-        if (!set)
-            handles.assign(map);
-
-        for (int i = 0; i < size; i++) {
-            Object key = readObject();
-            Object val = !set ? readObject() : DUMMY;
-
-            map.put(key, val);
-        }
-
-        return map;
-    }
-
-    /**
-     * Reads {@link LinkedHashSet}.
-     *
-     * @param mapFieldOff Map field offset.
-     * @return Set.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    LinkedHashSet<?> readLinkedHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
-        try {
-            LinkedHashSet<Object> set = (LinkedHashSet<Object>)UNSAFE.allocateInstance(LinkedHashSet.class);
-
-            handles.assign(set);
-
-            setObject(set, mapFieldOff, readLinkedHashMap(true));
-
-            return set;
-        }
-        catch (InstantiationException e) {
-            throw new IOException(e);
-        }
-    }
-
-    /**
-     * Reads {@link Date}.
-     *
-     * @return Date.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    Date readDate() throws ClassNotFoundException, IOException {
-        Date date = new Date(readLong());
-
-        handles.assign(date);
-
-        return date;
-    }
-
-    /**
-     * Reads array of {@code byte}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    byte[] readByteArray() throws IOException {
-        byte[] arr = in.readByteArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code short}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    short[] readShortArray() throws IOException {
-        short[] arr = in.readShortArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code int}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    int[] readIntArray() throws IOException {
-        int[] arr = in.readIntArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code long}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    long[] readLongArray() throws IOException {
-        long[] arr = in.readLongArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code float}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    float[] readFloatArray() throws IOException {
-        float[] arr = in.readFloatArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code double}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    double[] readDoubleArray() throws IOException {
-        double[] arr = in.readDoubleArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code char}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    char[] readCharArray() throws IOException {
-        char[] arr = in.readCharArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code boolean}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    boolean[] readBooleanArray() throws IOException {
-        boolean[] arr = in.readBooleanArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads {@link String}.
-     *
-     * @return String.
-     * @throws IOException In case of error.
-     */
-    public String readString() throws IOException {
-        String str = in.readUTF();
-
-        handles.assign(str);
-
-        return str;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readFully(byte[] b) throws IOException {
-        in.readFully(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readFully(byte[] b, int off, int len) throws IOException {
-        in.readFully(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override public int skipBytes(int n) throws IOException {
-        return in.skipBytes(n);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean readBoolean() throws IOException {
-        return in.readBoolean();
-    }
-
-    /** {@inheritDoc} */
-    @Override public byte readByte() throws IOException {
-        return in.readByte();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int readUnsignedByte() throws IOException {
-        return in.readUnsignedByte();
-    }
-
-    /** {@inheritDoc} */
-    @Override public short readShort() throws IOException {
-        return in.readShort();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int readUnsignedShort() throws IOException {
-        return in.readUnsignedShort();
-    }
-
-    /** {@inheritDoc} */
-    @Override public char readChar() throws IOException {
-        return in.readChar();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int readInt() throws IOException {
-        return in.readInt();
-    }
-
-    /** {@inheritDoc} */
-    @Override public long readLong() throws IOException {
-        return in.readLong();
-    }
-
-    /** {@inheritDoc} */
-    @Override public float readFloat() throws IOException {
-        return in.readFloat();
-    }
-
-    /** {@inheritDoc} */
-    @Override public double readDouble() throws IOException {
-        return in.readDouble();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read() throws IOException {
-        return in.read();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read(byte[] b) throws IOException {
-        return in.read(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read(byte[] b, int off, int len) throws IOException {
-        return in.read(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("deprecation")
-    @Override public String readLine() throws IOException {
-        return in.readLine();
-    }
-
-    /** {@inheritDoc} */
-    @Override public String readUTF() throws IOException {
-        return in.readUTF();
-    }
-
-    /** {@inheritDoc} */
-    @Override public Object readUnshared() throws IOException, ClassNotFoundException {
-        return readObject();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void defaultReadObject() throws IOException, ClassNotFoundException {
-        if (curObj == null)
-            throw new NotActiveException("Not in readObject() call.");
-
-        readFields(curObj, curFields);
-    }
-
-    /** {@inheritDoc} */
-    @Override public ObjectInputStream.GetField readFields() throws IOException, ClassNotFoundException {
-        if (curObj == null)
-            throw new NotActiveException("Not in readObject() call.");
-
-        return new GetFieldImpl(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void registerValidation(ObjectInputValidation obj, int pri) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public int available() throws IOException {
-        return -1;
-    }
-
-    /**
-     * Returns objects that were added to handles table.
-     * Used ONLY for test purposes.
-     *
-     * @return Handled objects.
-     */
-    Object[] handledObjects() {
-        return handles.entries;
-    }
-
-    /**
-     * Lightweight identity hash table which maps objects to integer handles,
-     * assigned in ascending order.
-     */
-    private static class HandleTable {
-        /** Array mapping handle -> object/exception (depending on status). */
-        private Object[] entries;
-
-        /** Number of handles in table. */
-        private int size;
-
-        /**
-         * Creates handle table with the given initial capacity.
-         *
-         * @param initCap Initial capacity.
-         */
-        HandleTable(int initCap) {
-            entries = new Object[initCap];
-        }
-
-        /**
-         * Assigns next available handle to given object, and returns assigned
-         * handle.
-         *
-         * @param obj Object.
-         * @return Handle.
-         */
-        int assign(Object obj) {
-            if (size >= entries.length)
-                grow();
-
-            entries[size] = obj;
-
-            return size++;
-        }
-
-        /**
-         * Assigns new object to existing handle. Old object is forgotten.
-         *
-         * @param handle Handle.
-         * @param obj Object.
-         */
-        void set(int handle, Object obj) {
-            entries[handle] = obj;
-        }
-
-        /**
-         * Looks up and returns object associated with the given handle.
-         *
-         * @param handle Handle.
-         * @return Object.
-         */
-        Object lookup(int handle) {
-            return entries[handle];
-        }
-
-        /**
-         * Resets table to its initial state.
-         */
-        void clear() {
-            Arrays.fill(entries, 0, size, null);
-
-            size = 0;
-        }
-
-        /**
-         * Expands capacity of internal arrays.
-         */
-        private void grow() {
-            int newCap = (entries.length << 1) + 1;
-
-            Object[] newEntries = new Object[newCap];
-
-            System.arraycopy(entries, 0, newEntries, 0, size);
-
-            entries = newEntries;
-        }
-    }
-
-    /**
-     * {@link GetField} implementation.
-     */
-    private static class GetFieldImpl extends GetField {
-        /** Field info map. */
-        private final Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoMap;
-
-        /** Values. */
-        private final Object[] objs;
-
-        /**
-         * @param in Stream.
-         * @throws IOException In case of error.
-         * @throws ClassNotFoundException If class not found.
-         */
-        @SuppressWarnings("ForLoopReplaceableByForEach")
-        private GetFieldImpl(GridOptimizedObjectInputStream in) throws IOException, ClassNotFoundException {
-            fieldInfoMap = in.curFieldInfoMap;
-
-            List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>> infos = in.curFieldInfoList;
-
-            objs = new Object[infos.size()];
-
-            for (int i = 0; i < infos.size(); i++) {
-                IgniteBiTuple<Integer, IgniteOptimizedFieldType> t = infos.get(i);
-
-                Object obj = null;
-
-                switch (t.get2()) {
-                    case BYTE:
-                        obj = in.readByte();
-
-                        break;
-
-                    case SHORT:
-                        obj = in.readShort();
-
-                        break;
-
-                    case INT:
-                        obj = in.readInt();
-
-                        break;
-
-                    case LONG:
-                        obj = in.readLong();
-
-                        break;
-
-                    case FLOAT:
-                        obj = in.readFloat();
-
-                        break;
-
-                    case DOUBLE:
-                        obj = in.readDouble();
-
-                        break;
-
-                    case CHAR:
-                        obj = in.readChar();
-
-                        break;
-
-                    case BOOLEAN:
-                        obj = in.readBoolean();
-
-                        break;
-
-                    case OTHER:
-                        obj = in.readObject();
-                }
-
-                objs[t.get1()] = obj;
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override public ObjectStreamClass getObjectStreamClass() {
-            throw new UnsupportedOperationException();
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean defaulted(String name) throws IOException {
-            return objs[fieldInfoMap.get(name).get1()] == null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean get(String name, boolean dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public byte get(String name, byte dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public char get(String name, char dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public short get(String name, short dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public int get(String name, int dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public long get(String name, long dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public float get(String name, float dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public double get(String name, double dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public Object get(String name, Object dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /**
-         * @param name Field name.
-         * @param dflt Default value.
-         * @return Value.
-         */
-        private <T> T value(String name, T dflt) {
-            return objs[fieldInfoMap.get(name).get1()] != null ? (T)objs[fieldInfoMap.get(name).get1()] : dflt;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
deleted file mode 100644
index bd78c36..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectOutputStream.java
+++ /dev/null
@@ -1,831 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.io.*;
-import org.gridgain.grid.util.typedef.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.apache.ignite.marshaller.optimized.GridOptimizedMarshallerUtils.*;
-
-/**
- * Optimized object output stream.
- */
-class GridOptimizedObjectOutputStream extends ObjectOutputStream {
-    /** */
-    private static final Collection<String> CONVERTED_ERR = F.asList(
-        "weblogic/management/ManagementException",
-        "Externalizable class doesn't have default constructor: class " +
-            "org.gridgain.grid.kernal.processors.email.GridEmailProcessor$2"
-    );
-
-    /** */
-    private final GridHandleTable handles = new GridHandleTable(10, 3.00f);
-
-    /** */
-    private boolean requireSer;
-
-    /** */
-    private GridDataOutput out;
-
-    /** */
-    private Object curObj;
-
-    /** */
-    private List<T2<IgniteOptimizedFieldType, Long>> curFields;
-
-    /** */
-    private Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoMap;
-
-    /** */
-    private PutFieldImpl curPut;
-
-
-    /**
-     * @throws IOException In case of error.
-     */
-    GridOptimizedObjectOutputStream() throws IOException {
-        // No-op.
-    }
-
-    /**
-     * @param out Output.
-     * @throws IOException In case of error.
-     */
-    GridOptimizedObjectOutputStream(GridDataOutput out) throws IOException {
-        this.out = out;
-    }
-
-    /**
-     * @param requireSer Require {@link Serializable} flag.
-     */
-    void requireSerializable(boolean requireSer) {
-        this.requireSer = requireSer;
-    }
-
-    /**
-     * @return Require {@link Serializable} flag.
-     */
-    boolean requireSerializable() {
-        return requireSer;
-    }
-
-    /**
-     * @param out Output.
-     */
-    public void out(GridDataOutput out) {
-        this.out = out;
-    }
-
-    /**
-     * @return Output.
-     */
-    public GridDataOutput out() {
-        return out;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() throws IOException {
-        reset();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(byte[] b) throws IOException {
-        out.write(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(byte[] b, int off, int len) throws IOException {
-        out.write(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void writeObjectOverride(Object obj) throws IOException {
-        try {
-            writeObject0(obj);
-        }
-        catch (IOException e) {
-            Throwable t = e;
-
-            do {
-                if (CONVERTED_ERR.contains(t.getMessage()))
-                    throw new IOException("You are trying to serialize internal classes that are not supposed " +
-                        "to be serialized. Check that all non-serializable fields are transient. Consider using " +
-                        "static inner classes instead of non-static inner classes and anonymous classes.", e);
-            }
-            while ((t = t.getCause()) != null);
-
-            throw e;
-        }
-    }
-
-    /**
-     * Writes object to stream.
-     *
-     * @param obj Object.
-     * @throws IOException In case of error.
-     */
-    private void writeObject0(Object obj) throws IOException {
-        curObj = null;
-        curFields = null;
-        curPut = null;
-        curFieldInfoMap = null;
-
-        if (obj == null)
-            writeByte(NULL);
-        else {
-            Class<?> cls = obj.getClass();
-
-            IgniteOptimizedClassDescriptor desc = classDescriptor(cls, obj);
-
-            if (desc.excluded()) {
-                writeByte(NULL);
-
-                return;
-            }
-
-            Object obj0 = desc.replace(obj);
-
-            if (obj0 == null) {
-                writeByte(NULL);
-
-                return;
-            }
-
-            int handle = -1;
-
-            if (!desc.isPrimitive() && !desc.isEnum() && !desc.isClass())
-                handle = handles.lookup(obj);
-
-            if (obj0 != obj) {
-                obj = obj0;
-
-                desc = classDescriptor(obj.getClass(), obj);
-            }
-
-            if (handle >= 0) {
-                writeByte(HANDLE);
-                writeInt(handle);
-            }
-            else {
-                writeByte(OBJECT);
-
-                IgniteOptimizedClassResolver.writeClass(this, desc);
-
-                desc.write(this, obj);
-            }
-        }
-    }
-
-    /**
-     * Writes array to this stream.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    void writeArray(Object[] arr) throws IOException {
-        int len = arr.length;
-
-        writeInt(len);
-
-        for (int i = 0; i < len; i++) {
-            Object obj = arr[i];
-
-            writeObject0(obj);
-        }
-    }
-
-    /**
-     * Writes {@link UUID} to this stream.
-     *
-     * @param uuid UUID.
-     * @throws IOException In case of error.
-     */
-    void writeUuid(UUID uuid) throws IOException {
-        writeLong(uuid.getMostSignificantBits());
-        writeLong(uuid.getLeastSignificantBits());
-    }
-
-    /**
-     * Writes {@link Properties} to this stream.
-     *
-     * @param props Properties.
-     * @param dfltsFieldOff Defaults field offset.
-     * @throws IOException In case of error.
-     */
-    void writeProperties(Properties props, long dfltsFieldOff) throws IOException {
-        Properties dflts = (Properties)getObject(props, dfltsFieldOff);
-
-        if (dflts == null)
-            writeBoolean(true);
-        else {
-            writeBoolean(false);
-
-            writeObject0(dflts);
-        }
-
-        Set<String> names = props.stringPropertyNames();
-
-        writeInt(names.size());
-
-        for (String name : names) {
-            writeUTF(name);
-            writeUTF(props.getProperty(name));
-        }
-    }
-
-    /**
-     * Writes externalizable object.
-     *
-     * @param obj Object.
-     * @throws IOException In case of error.
-     */
-    void writeExternalizable(Object obj) throws IOException {
-        Externalizable extObj = (Externalizable)obj;
-
-        extObj.writeExternal(this);
-    }
-
-    /**
-     * Writes serializable object.
-     *
-     * @param obj Object.
-     * @param mtds {@code writeObject} methods.
-     * @param fields class fields details.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    void writeSerializable(Object obj, List<Method> mtds, IgniteOptimizedClassDescriptor.Fields fields)
-        throws IOException {
-        for (int i = 0; i < mtds.size(); i++) {
-            Method mtd = mtds.get(i);
-
-            if (mtd != null) {
-                curObj = obj;
-                curFields = fields.fieldOffs(i);
-                curFieldInfoMap = fields.fieldInfoMap(i);
-
-                try {
-                    mtd.invoke(obj, this);
-                }
-                catch (IllegalAccessException e) {
-                    throw new IOException(e);
-                }
-                catch (InvocationTargetException e) {
-                    throw new IOException(e.getCause());
-                }
-            }
-            else
-                writeFields(obj, fields.fieldOffs(i));
-        }
-    }
-
-    /**
-     * Writes {@link ArrayList}.
-     *
-     * @param list List.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings({"ForLoopReplaceableByForEach", "TypeMayBeWeakened"})
-    void writeArrayList(ArrayList<?> list) throws IOException {
-        int size = list.size();
-
-        writeInt(size);
-
-        for (int i = 0; i < size; i++)
-            writeObject0(list.get(i));
-    }
-
-    /**
-     * Writes {@link HashMap}.
-     *
-     * @param map Map.
-     * @param loadFactorFieldOff Load factor field offset.
-     * @param set Whether writing underlying map from {@link HashSet}.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    void writeHashMap(HashMap<?, ?> map, long loadFactorFieldOff, boolean set) throws IOException {
-        int size = map.size();
-
-        writeInt(size);
-        writeFloat(getFloat(map, loadFactorFieldOff));
-
-        for (Map.Entry<?, ?> e : map.entrySet()) {
-            writeObject0(e.getKey());
-
-            if (!set)
-                writeObject0(e.getValue());
-        }
-    }
-
-    /**
-     * Writes {@link HashSet}.
-     *
-     * @param set Set.
-     * @param mapFieldOff Map field offset.
-     * @param loadFactorFieldOff Load factor field offset.
-     * @throws IOException In case of error.
-     */
-    void writeHashSet(HashSet<?> set, long mapFieldOff, long loadFactorFieldOff) throws IOException {
-        writeHashMap((HashMap<?, ?>)getObject(set, mapFieldOff), loadFactorFieldOff, true);
-    }
-
-    /**
-     * Writes {@link LinkedList}.
-     *
-     * @param list List.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    void writeLinkedList(LinkedList<?> list) throws IOException {
-        int size = list.size();
-
-        writeInt(size);
-
-        for (Object obj : list)
-            writeObject0(obj);
-    }
-
-    /**
-     * Writes {@link LinkedHashMap}.
-     *
-     * @param map Map.
-     * @param loadFactorFieldOff Load factor field offset.
-     * @param accessOrderFieldOff access order field offset.
-     * @param set Whether writing underlying map from {@link LinkedHashSet}.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    void writeLinkedHashMap(LinkedHashMap<?, ?> map, long loadFactorFieldOff, long accessOrderFieldOff, boolean set)
-        throws IOException {
-        int size = map.size();
-
-        writeInt(size);
-        writeFloat(getFloat(map, loadFactorFieldOff));
-
-        if (accessOrderFieldOff >= 0)
-            writeBoolean(getBoolean(map, accessOrderFieldOff));
-        else
-            writeBoolean(false);
-
-        for (Map.Entry<?, ?> e : map.entrySet()) {
-            writeObject0(e.getKey());
-
-            if (!set)
-                writeObject0(e.getValue());
-        }
-    }
-
-    /**
-     * Writes {@link LinkedHashSet}.
-     *
-     * @param set Set.
-     * @param mapFieldOff Map field offset.
-     * @param loadFactorFieldOff Load factor field offset.
-     * @throws IOException In case of error.
-     */
-    void writeLinkedHashSet(LinkedHashSet<?> set, long mapFieldOff, long loadFactorFieldOff) throws IOException {
-        LinkedHashMap<?, ?> map = (LinkedHashMap<?, ?>)getObject(set, mapFieldOff);
-
-        writeLinkedHashMap(map, loadFactorFieldOff, -1, true);
-    }
-
-    /**
-     * Writes {@link Date}.
-     *
-     * @param date Date.
-     * @throws IOException In case of error.
-     */
-    void writeDate(Date date) throws IOException {
-        writeLong(date.getTime());
-    }
-
-    /**
-     * Writes all non-static and non-transient field values to this stream.
-     *
-     * @param obj Object.
-     * @param fieldOffs Field offsets.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    private void writeFields(Object obj, List<T2<IgniteOptimizedFieldType, Long>> fieldOffs) throws IOException {
-        for (int i = 0; i < fieldOffs.size(); i++) {
-            T2<IgniteOptimizedFieldType, Long> t = fieldOffs.get(i);
-
-            switch (t.get1()) {
-                case BYTE:
-                    writeByte(getByte(obj, t.get2()));
-
-                    break;
-
-                case SHORT:
-                    writeShort(getShort(obj, t.get2()));
-
-                    break;
-
-                case INT:
-                    writeInt(getInt(obj, t.get2()));
-
-                    break;
-
-                case LONG:
-                    writeLong(getLong(obj, t.get2()));
-
-                    break;
-
-                case FLOAT:
-                    writeFloat(getFloat(obj, t.get2()));
-
-                    break;
-
-                case DOUBLE:
-                    writeDouble(getDouble(obj, t.get2()));
-
-                    break;
-
-                case CHAR:
-                    writeChar(getChar(obj, t.get2()));
-
-                    break;
-
-                case BOOLEAN:
-                    writeBoolean(getBoolean(obj, t.get2()));
-
-                    break;
-
-                case OTHER:
-                    writeObject0(getObject(obj, t.get2()));
-            }
-        }
-    }
-
-    /**
-     * Writes array of {@code byte}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeByteArray(byte[] arr) throws IOException {
-        out.writeByteArray(arr);
-    }
-
-    /**
-     * Writes array of {@code short}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeShortArray(short[] arr) throws IOException {
-        out.writeShortArray(arr);
-    }
-
-    /**
-     * Writes array of {@code int}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeIntArray(int[] arr) throws IOException {
-        out.writeIntArray(arr);
-    }
-
-    /**
-     * Writes array of {@code long}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeLongArray(long[] arr) throws IOException {
-        out.writeLongArray(arr);
-    }
-
-    /**
-     * Writes array of {@code float}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeFloatArray(float[] arr) throws IOException {
-        out.writeFloatArray(arr);
-    }
-
-    /**
-     * Writes array of {@code double}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeDoubleArray(double[] arr) throws IOException {
-        out.writeDoubleArray(arr);
-    }
-
-    /**
-     * Writes array of {@code char}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeCharArray(char[] arr) throws IOException {
-        out.writeCharArray(arr);
-    }
-
-    /**
-     * Writes array of {@code boolean}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeBooleanArray(boolean[] arr) throws IOException {
-        out.writeBooleanArray(arr);
-    }
-
-    /**
-     * Writes {@link String}.
-     *
-     * @param str String.
-     * @throws IOException In case of error.
-     */
-    void writeString(String str) throws IOException {
-        out.writeUTF(str);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeBoolean(boolean v) throws IOException {
-        out.writeBoolean(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeByte(int v) throws IOException {
-        out.writeByte(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeShort(int v) throws IOException {
-        out.writeShort(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeChar(int v) throws IOException {
-        out.writeChar(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeInt(int v) throws IOException {
-        out.writeInt(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeLong(long v) throws IOException {
-        out.writeLong(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeFloat(float v) throws IOException {
-        out.writeFloat(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeDouble(double v) throws IOException {
-        out.writeDouble(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(int b) throws IOException {
-        writeByte(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeBytes(String s) throws IOException {
-        out.writeBytes(s);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeChars(String s) throws IOException {
-        out.writeChars(s);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeUTF(String s) throws IOException {
-        out.writeUTF(s);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void useProtocolVersion(int ver) throws IOException {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeUnshared(Object obj) throws IOException {
-        writeObject0(obj);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void defaultWriteObject() throws IOException {
-        if (curObj == null)
-            throw new NotActiveException("Not in writeObject() call.");
-
-        writeFields(curObj, curFields);
-    }
-
-    /** {@inheritDoc} */
-    @Override public ObjectOutputStream.PutField putFields() throws IOException {
-        if (curObj == null)
-            throw new NotActiveException("Not in writeObject() call or fields already written.");
-
-        if (curPut == null)
-            curPut = new PutFieldImpl(this);
-
-        return curPut;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeFields() throws IOException {
-        if (curObj == null)
-            throw new NotActiveException("Not in writeObject() call.");
-
-        if (curPut == null)
-            throw new NotActiveException("putFields() was not called.");
-
-        for (IgniteBiTuple<IgniteOptimizedFieldType, Object> t : curPut.objs) {
-            switch (t.get1()) {
-                case BYTE:
-                    writeByte((Byte)t.get2());
-
-                    break;
-
-                case SHORT:
-                    writeShort((Short)t.get2());
-
-                    break;
-
-                case INT:
-                    writeInt((Integer)t.get2());
-
-                    break;
-
-                case LONG:
-                    writeLong((Long)t.get2());
-
-                    break;
-
-                case FLOAT:
-                    writeFloat((Float)t.get2());
-
-                    break;
-
-                case DOUBLE:
-                    writeDouble((Double)t.get2());
-
-                    break;
-
-                case CHAR:
-                    writeChar((Character)t.get2());
-
-                    break;
-
-                case BOOLEAN:
-                    writeBoolean((Boolean)t.get2());
-
-                    break;
-
-                case OTHER:
-                    writeObject0(t.get2());
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void reset() throws IOException {
-        out.reset();
-        handles.clear();
-
-        curObj = null;
-        curFields = null;
-        curPut = null;
-        curFieldInfoMap = null;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void flush() throws IOException {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void drain() throws IOException {
-        // No-op.
-    }
-
-    /**
-     * Returns objects that were added to handles table.
-     * Used ONLY for test purposes.
-     *
-     * @return Handled objects.
-     */
-    Object[] handledObjects() {
-        return handles.objects();
-    }
-
-    /**
-     * {@link PutField} implementation.
-     */
-    private static class PutFieldImpl extends PutField {
-        /** Stream. */
-        private final GridOptimizedObjectOutputStream out;
-
-        /** Field info map. */
-        private final Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoMap;
-
-        /** Values. */
-        private final IgniteBiTuple<IgniteOptimizedFieldType, Object>[] objs;
-
-        /**
-         * @param out Output stream.
-         * @throws IOException In case of error.
-         */
-        @SuppressWarnings("unchecked")
-        private PutFieldImpl(GridOptimizedObjectOutputStream out) {
-            this.out = out;
-
-            fieldInfoMap = out.curFieldInfoMap;
-
-            objs = new IgniteBiTuple[fieldInfoMap.size()];
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, boolean val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, byte val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, char val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, short val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, int val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, long val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, float val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, double val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, Object val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void write(ObjectOutput out) throws IOException {
-            if (out != this.out)
-                throw new IllegalArgumentException("Wrong stream.");
-
-            this.out.writeFields();
-        }
-
-        /**
-         * @param name Field name.
-         * @param val Value.
-         */
-        private void value(String name, Object val) {
-            IgniteBiTuple<Integer, IgniteOptimizedFieldType> info = fieldInfoMap.get(name);
-
-            objs[info.get1()] = F.t(info.get2(), val);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamRegistry.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
deleted file mode 100644
index bc7a586..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.io.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-
-/**
- * Storage for object streams.
- */
-class GridOptimizedObjectStreamRegistry {
-    /** Holders. */
-    private static final ThreadLocal<StreamHolder> holders = new ThreadLocal<>();
-
-    /** Holders pool. */
-    private static BlockingQueue<StreamHolder> pool;
-
-    /**
-     * Ensures singleton.
-     */
-    private GridOptimizedObjectStreamRegistry() {
-        // No-op.
-    }
-
-    /**
-     * Sets streams pool size.
-     *
-     * @param size Streams pool size.
-     */
-    static void poolSize(int size) {
-        if (size > 0) {
-            pool = new LinkedBlockingQueue<>(size);
-
-            for (int i = 0; i < size; i++) {
-                boolean b = pool.offer(new StreamHolder());
-
-                assert b;
-            }
-        }
-        else
-            pool = null;
-    }
-
-    /**
-     * Gets output stream.
-     *
-     * @return Object output stream.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
-     */
-    static GridOptimizedObjectOutputStream out() throws GridInterruptedException {
-        return holder().acquireOut();
-    }
-
-    /**
-     * Gets input stream.
-     *
-     * @return Object input stream.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
-     */
-    static GridOptimizedObjectInputStream in() throws GridInterruptedException {
-        return holder().acquireIn();
-    }
-
-    /**
-     * Closes and releases output stream.
-     *
-     * @param out Object output stream.
-     */
-    static void closeOut(GridOptimizedObjectOutputStream out) {
-        U.close(out, null);
-
-        StreamHolder holder = holders.get();
-
-        holder.releaseOut();
-
-        if (pool != null) {
-            holders.remove();
-
-            boolean b = pool.offer(holder);
-
-            assert b;
-        }
-    }
-
-    /**
-     * Closes and releases input stream.
-     *
-     * @param in Object input stream.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    static void closeIn(GridOptimizedObjectInputStream in) {
-        U.close(in, null);
-
-        StreamHolder holder = holders.get();
-
-        holder.releaseIn();
-
-        if (pool != null) {
-            holders.remove();
-
-            boolean b = pool.offer(holder);
-
-            assert b;
-        }
-    }
-
-    /**
-     * Gets holder from pool or thread local.
-     *
-     * @return Stream holder.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
-     */
-    private static StreamHolder holder() throws GridInterruptedException {
-        StreamHolder holder = holders.get();
-
-        if (holder == null) {
-            try {
-                holders.set(holder = pool != null ? pool.take() : new StreamHolder());
-            }
-            catch (InterruptedException e) {
-                throw new GridInterruptedException("Failed to take object stream from pool (thread interrupted).", e);
-            }
-        }
-
-        return holder;
-    }
-
-    /**
-     * Streams holder.
-     */
-    private static class StreamHolder {
-        /** Output stream. */
-        private final GridOptimizedObjectOutputStream out = createOut();
-
-        /** Input stream. */
-        private final GridOptimizedObjectInputStream in = createIn();
-
-        /** Output streams counter. */
-        private int outAcquireCnt;
-
-        /** Input streams counter. */
-        private int inAcquireCnt;
-
-        /**
-         * Gets output stream.
-         *
-         * @return Object output stream.
-         */
-        GridOptimizedObjectOutputStream acquireOut() {
-            return outAcquireCnt++ > 0 ? createOut() : out;
-        }
-
-        /**
-         * Gets input stream.
-         *
-         * @return Object input stream.
-         */
-        GridOptimizedObjectInputStream acquireIn() {
-            return inAcquireCnt++ > 0 ? createIn() : in;
-        }
-
-        /**
-         * Releases output stream.
-         */
-        void releaseOut() {
-            outAcquireCnt--;
-        }
-
-        /**
-         * Releases input stream.
-         */
-        void releaseIn() {
-            inAcquireCnt--;
-        }
-
-        /**
-         * Creates output stream.
-         *
-         * @return Object output stream.
-         */
-        private GridOptimizedObjectOutputStream createOut() {
-            try {
-                return new GridOptimizedObjectOutputStream(new GridUnsafeDataOutput(4 * 1024));
-            }
-            catch (IOException e) {
-                throw new GridRuntimeException("Failed to create object output stream.", e);
-            }
-        }
-
-        /**
-         * Creates input stream.
-         *
-         * @return Object input stream.
-         */
-        private GridOptimizedObjectInputStream createIn() {
-            try {
-                return new GridOptimizedObjectInputStream(new GridUnsafeDataInput());
-            }
-            catch (IOException e) {
-                throw new GridRuntimeException("Failed to create object input stream.", e);
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
index eafa113..e68d8cf 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassDescriptor.java
@@ -550,7 +550,7 @@ class IgniteOptimizedClassDescriptor {
             }
         }
 
-        shortId = GridOptimizedMarshallerUtils.computeSerialVersionUid(cls, fields != null ? fields.ownFields() : null).shortValue();
+        shortId = IgniteOptimizedMarshallerUtils.computeSerialVersionUid(cls, fields != null ? fields.ownFields() : null).shortValue();
     }
 
     /**
@@ -651,7 +651,7 @@ class IgniteOptimizedClassDescriptor {
      * @throws IOException In case of error.
      */
     @SuppressWarnings("ForLoopReplaceableByForEach")
-    void write(GridOptimizedObjectOutputStream out, Object obj) throws IOException {
+    void write(IgniteOptimizedObjectOutputStream out, Object obj) throws IOException {
         switch (type) {
             case TYPE_BYTE:
                 out.writeByte((Byte)obj);
@@ -794,7 +794,7 @@ class IgniteOptimizedClassDescriptor {
                 break;
 
             case TYPE_CLS:
-                IgniteOptimizedClassResolver.writeClass(out, GridOptimizedMarshallerUtils.classDescriptor((Class<?>) obj, obj));
+                IgniteOptimizedClassResolver.writeClass(out, IgniteOptimizedMarshallerUtils.classDescriptor((Class<?>) obj, obj));
 
                 break;
 
@@ -826,7 +826,7 @@ class IgniteOptimizedClassDescriptor {
      * @throws ClassNotFoundException If class not found.
      * @throws IOException In case of error.
      */
-    Object read(GridOptimizedObjectInputStream in) throws ClassNotFoundException, IOException {
+    Object read(IgniteOptimizedObjectInputStream in) throws ClassNotFoundException, IOException {
         switch (type) {
             case TYPE_BYTE:
                 return in.readByte();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
index eb01ff4..beb172b 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedClassResolver.java
@@ -175,7 +175,7 @@ class IgniteOptimizedClassResolver {
 
         BufferedReader reader = new BufferedReader(new InputStreamReader(
             IgniteOptimizedClassResolver.class.getResourceAsStream(FILE_NAME),
-            GridOptimizedMarshallerUtils.UTF_8));
+            IgniteOptimizedMarshallerUtils.UTF_8));
 
         List<T3<String, Class<?>, IgniteOptimizedClassDescriptor>> ggId2name0 =
             new LinkedList<>();
@@ -238,7 +238,7 @@ class IgniteOptimizedClassResolver {
             IgniteOptimizedClassDescriptor desc = ggxT.get2();
 
             if (desc == null) {
-                desc = GridOptimizedMarshallerUtils.classDescriptor(ggxT.get1(), null);
+                desc = IgniteOptimizedMarshallerUtils.classDescriptor(ggxT.get1(), null);
 
                 ggxT.set2(desc);
             }
@@ -276,14 +276,14 @@ class IgniteOptimizedClassResolver {
                             ggT.set2(cls);
                         }
 
-                        desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+                        desc = IgniteOptimizedMarshallerUtils.classDescriptor(cls, null);
 
                         ggT.set3(desc);
                     }
                     else {
                         cls = forName(name, clsLdr);
 
-                        desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+                        desc = IgniteOptimizedMarshallerUtils.classDescriptor(cls, null);
                     }
                 }
 
@@ -317,7 +317,7 @@ class IgniteOptimizedClassResolver {
                         usrT.set2(cls);
                     }
 
-                    desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+                    desc = IgniteOptimizedMarshallerUtils.classDescriptor(cls, null);
 
                     usrT.set3(desc);
                 }
@@ -331,14 +331,14 @@ class IgniteOptimizedClassResolver {
 
                 cls = forName(name, clsLdr);
 
-                return GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+                return IgniteOptimizedMarshallerUtils.classDescriptor(cls, null);
 
             case HEADER_NAME:
                 name = in.readUTF();
 
                 cls = forName(name, clsLdr);
 
-                desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
+                desc = IgniteOptimizedMarshallerUtils.classDescriptor(cls, null);
 
                 break;
 
@@ -380,7 +380,7 @@ class IgniteOptimizedClassResolver {
                 return;
 
             case HEADER_ARRAY:
-                writeClass(out, GridOptimizedMarshallerUtils.classDescriptor(desc.componentType(), null));
+                writeClass(out, IgniteOptimizedMarshallerUtils.classDescriptor(desc.componentType(), null));
 
                 return;
 
@@ -428,7 +428,7 @@ class IgniteOptimizedClassResolver {
         Class<?> cls = primitive(name);
 
         if (cls == null)
-            cls = GridOptimizedMarshallerUtils.forName(name, ldr);
+            cls = IgniteOptimizedMarshallerUtils.forName(name, ldr);
 
         return cls;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
index 80d30cc..bfd186a 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshaller.java
@@ -208,7 +208,7 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
         try {
             clsNames = new LinkedList<>();
 
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), GridOptimizedMarshallerUtils.UTF_8))) {
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), IgniteOptimizedMarshallerUtils.UTF_8))) {
                 String clsName;
 
                 while ((clsName = reader.readLine()) != null)
@@ -238,7 +238,7 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
      * @param poolSize Streams pool size. If {@code 0}, pool is not used.
      */
     public void setPoolSize(int poolSize) {
-        GridOptimizedObjectStreamRegistry.poolSize(poolSize);
+        IgniteOptimizedObjectStreamRegistry.poolSize(poolSize);
     }
 
     /**
@@ -263,10 +263,10 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
     @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
         assert out != null;
 
-        GridOptimizedObjectOutputStream objOut = null;
+        IgniteOptimizedObjectOutputStream objOut = null;
 
         try {
-            objOut = GridOptimizedObjectStreamRegistry.out();
+            objOut = IgniteOptimizedObjectStreamRegistry.out();
 
             objOut.requireSerializable(requireSer);
 
@@ -278,16 +278,16 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
             throw new GridException("Failed to serialize object: " + obj, e);
         }
         finally {
-            GridOptimizedObjectStreamRegistry.closeOut(objOut);
+            IgniteOptimizedObjectStreamRegistry.closeOut(objOut);
         }
     }
 
     /** {@inheritDoc} */
     @Override public byte[] marshal(@Nullable Object obj) throws GridException {
-        GridOptimizedObjectOutputStream objOut = null;
+        IgniteOptimizedObjectOutputStream objOut = null;
 
         try {
-            objOut = GridOptimizedObjectStreamRegistry.out();
+            objOut = IgniteOptimizedObjectStreamRegistry.out();
 
             objOut.requireSerializable(requireSer);
 
@@ -299,7 +299,7 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
             throw new GridException("Failed to serialize object: " + obj, e);
         }
         finally {
-            GridOptimizedObjectStreamRegistry.closeOut(objOut);
+            IgniteOptimizedObjectStreamRegistry.closeOut(objOut);
         }
     }
 
@@ -307,10 +307,10 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
     @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
         assert in != null;
 
-        GridOptimizedObjectInputStream objIn = null;
+        IgniteOptimizedObjectInputStream objIn = null;
 
         try {
-            objIn = GridOptimizedObjectStreamRegistry.in();
+            objIn = IgniteOptimizedObjectStreamRegistry.in();
 
             objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
 
@@ -327,7 +327,7 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
                 clsLdr, e);
         }
         finally {
-            GridOptimizedObjectStreamRegistry.closeIn(objIn);
+            IgniteOptimizedObjectStreamRegistry.closeIn(objIn);
         }
     }
 
@@ -335,10 +335,10 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
     @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
         assert arr != null;
 
-        GridOptimizedObjectInputStream objIn = null;
+        IgniteOptimizedObjectInputStream objIn = null;
 
         try {
-            objIn = GridOptimizedObjectStreamRegistry.in();
+            objIn = IgniteOptimizedObjectStreamRegistry.in();
 
             objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
 
@@ -355,7 +355,7 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
                 clsLdr, e);
         }
         finally {
-            GridOptimizedObjectStreamRegistry.closeIn(objIn);
+            IgniteOptimizedObjectStreamRegistry.closeIn(objIn);
         }
     }
 
@@ -396,13 +396,13 @@ public class IgniteOptimizedMarshaller extends GridAbstractMarshaller {
      * @param ldr Class loader being undeployed.
      */
     public static void onUndeploy(ClassLoader ldr) {
-        GridOptimizedMarshallerUtils.onUndeploy(ldr);
+        IgniteOptimizedMarshallerUtils.onUndeploy(ldr);
     }
 
     /**
      * Clears internal caches and frees memory. Usually called on system stop.
      */
     public static void clearCache() {
-        GridOptimizedMarshallerUtils.clearCache();
+        IgniteOptimizedMarshallerUtils.clearCache();
     }
 }


[05/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 0ea0d7c66d6c775010cda379fe6bc8c8794d7579
Parents: 393486f
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:38:59 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:39:19 2014 +0300

----------------------------------------------------------------------
 .../failover/ComputeFailoverExample.java        |   1 -
 .../grid/gridify/GridTestGridifyJob.java        |   2 +-
 .../test/gridify/GridExternalGridifyTask.java   |   2 +-
 .../spi/checkpoint/s3/GridS3CheckpointSpi.java  |   2 +-
 .../ipfinder/s3/GridTcpDiscoveryS3IpFinder.java |   2 +-
 .../s3/GridS3CheckpointSpiSelfTest.java         |   2 +-
 .../client/GridClientStartNodeTask.java         |   1 -
 .../gridgain/client/GridClientStopNodeTask.java |   1 -
 .../client/GridClientTestRestServer.java        |   2 +-
 .../processors/rest/GridTestBinaryClient.java   |   2 +-
 .../processors/rest/GridTestMemcacheClient.java |   2 +-
 .../src/main/java/org/apache/ignite/Ignite.java |   1 -
 .../java/org/apache/ignite/IgniteLogger.java    | 153 +++++++++++++++++++
 .../gridify/aop/GridifyDefaultRangeTask.java    |   1 -
 .../configuration/IgniteConfiguration.java      |   2 +-
 .../ignite/messaging/MessagingListenActor.java  |   1 -
 .../org/apache/ignite/plugin/PluginContext.java |   1 -
 .../ignite/resources/IgniteLoggerResource.java  |   2 +-
 .../GridClientConnectionManagerAdapter.java     |   2 +-
 .../router/GridTcpRouterConfiguration.java      |   2 +-
 .../impl/GridRouterCommandLineStartup.java      |   2 +-
 .../client/router/impl/GridTcpRouterImpl.java   |   2 +-
 .../impl/GridTcpRouterNioListenerAdapter.java   |   2 +-
 .../impl/GridTcpRouterNioListenerOsImpl.java    |   2 +-
 ...GridCacheConsistentHashAffinityFunction.java |   1 -
 .../store/GridCacheLoadOnlyStoreAdapter.java    |   2 +-
 .../store/jdbc/GridCacheJdbcBlobStore.java      |   2 +-
 .../sender/store/fs/GridDrSenderHubFsStore.java |   2 +-
 .../gridgain/grid/hadoop/GridHadoopJobInfo.java |   2 +-
 .../gridgain/grid/kernal/GridDiagnostic.java    |   2 +-
 .../grid/kernal/GridJobContextImpl.java         |   2 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |   1 -
 .../gridgain/grid/kernal/GridKernalContext.java |   2 +-
 .../grid/kernal/GridKernalContextImpl.java      |   1 -
 .../gridgain/grid/kernal/GridLoggerProxy.java   |   2 +-
 .../grid/kernal/GridPerformanceSuggestions.java |   2 +-
 .../gridgain/grid/kernal/GridPluginContext.java |   1 -
 .../grid/kernal/GridUpdateNotifier.java         |   2 +-
 .../kernal/executor/GridExecutorService.java    |   1 -
 .../kernal/managers/GridManagerAdapter.java     |   2 +-
 .../deployment/GridDeploymentClassLoader.java   |   2 +-
 .../deployment/GridDeploymentCommunication.java |   2 +-
 .../deployment/GridDeploymentStoreAdapter.java  |   2 +-
 .../kernal/processors/GridProcessorAdapter.java |   2 +-
 .../affinity/GridAffinityAssignmentCache.java   |   2 +-
 .../processors/affinity/GridAffinityUtils.java  |   1 -
 .../processors/cache/GridCacheAdapter.java      |   1 -
 .../cache/GridCacheClearAllRunnable.java        |   2 +-
 .../cache/GridCacheConcurrentMap.java           |   2 +-
 .../processors/cache/GridCacheContext.java      |   2 +-
 .../GridCacheDefaultAffinityKeyMapper.java      |   2 +-
 .../GridCacheEntryInfoCollectSwapListener.java  |   2 +-
 .../cache/GridCacheEvictionEntry.java           |   2 +-
 .../processors/cache/GridCacheLogger.java       |   2 +-
 .../cache/GridCacheManagerAdapter.java          |   2 +-
 .../processors/cache/GridCacheMapEntry.java     |   2 +-
 .../cache/GridCacheMultiTxFuture.java           |   2 +-
 .../kernal/processors/cache/GridCacheMvcc.java  |   2 +-
 .../processors/cache/GridCacheMvccManager.java  |   2 +-
 .../cache/GridCachePreloaderAdapter.java        |   2 +-
 .../cache/GridCacheSharedContext.java           |   2 +-
 .../cache/GridCacheSharedManagerAdapter.java    |   2 +-
 .../processors/cache/GridCacheTxAdapter.java    |   2 +-
 .../processors/cache/GridCacheTxHandler.java    |   2 +-
 .../kernal/processors/cache/GridCacheUtils.java |   2 +-
 .../cache/GridCacheWriteBehindStore.java        |   2 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |   2 +-
 .../datastructures/GridCacheAtomicLongImpl.java |   2 +-
 .../GridCacheAtomicReferenceImpl.java           |   2 +-
 .../GridCacheAtomicSequenceImpl.java            |   2 +-
 .../GridCacheAtomicStampedImpl.java             |   2 +-
 .../GridCacheCountDownLatchImpl.java            |   2 +-
 .../datastructures/GridCacheQueueAdapter.java   |   2 +-
 .../cache/datastructures/GridCacheSetImpl.java  |   2 +-
 ...ridCacheOptimisticCheckPreparedTxFuture.java |   2 +-
 .../GridCachePerThreadTxCommitBuffer.java       |   2 +-
 .../distributed/GridCacheTxFinishSync.java      |   2 +-
 .../dht/GridClientPartitionTopology.java        |   2 +-
 .../dht/GridDhtAssignmentFetchFuture.java       |   2 +-
 .../cache/distributed/dht/GridDhtGetFuture.java |   2 +-
 .../distributed/dht/GridDhtLocalPartition.java  |   2 +-
 .../distributed/dht/GridDhtLockFuture.java      |   2 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   2 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   2 +-
 .../dht/GridPartitionedGetFuture.java           |   2 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   2 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |   2 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   2 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |   2 +-
 .../preloader/GridDhtPartitionDemandPool.java   |   2 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |   2 +-
 .../GridDhtPartitionsExchangeFuture.java        |   2 +-
 .../distributed/near/GridNearGetFuture.java     |   2 +-
 .../distributed/near/GridNearLockFuture.java    |   2 +-
 .../near/GridNearTxFinishFuture.java            |   2 +-
 .../near/GridNearTxPrepareFuture.java           |   2 +-
 .../cache/local/GridLocalLockFuture.java        |   2 +-
 .../cache/local/GridLocalTxFuture.java          |   2 +-
 .../cache/query/GridCacheQueryAdapter.java      |   2 +-
 .../query/GridCacheQueryFutureAdapter.java      |   2 +-
 .../GridCacheContinuousQueryAdapter.java        |   2 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |   1 -
 .../query/jdbc/GridCacheQueryJdbcTask.java      |   1 -
 .../processors/clock/GridClockServer.java       |   2 +-
 .../dataload/GridDataLoadUpdateJob.java         |   2 +-
 .../dataload/IgniteDataLoaderImpl.java          |   1 -
 .../dr/GridDrDataLoadCacheUpdater.java          |   2 +-
 .../processors/ggfs/GridGgfsDataManager.java    |   1 -
 .../processors/ggfs/GridGgfsDeleteWorker.java   |   2 +-
 .../kernal/processors/ggfs/GridGgfsImpl.java    |   1 -
 .../ggfs/GridGgfsInputStreamImpl.java           |   2 +-
 .../processors/ggfs/GridGgfsIpcHandler.java     |   2 +-
 .../kernal/processors/ggfs/GridGgfsJobImpl.java |   1 -
 .../kernal/processors/ggfs/GridGgfsManager.java |   2 +-
 .../processors/ggfs/GridGgfsMetaManager.java    |   2 +-
 .../kernal/processors/ggfs/GridGgfsServer.java  |   2 +-
 .../kernal/processors/job/GridJobWorker.java    |   2 +-
 .../resource/GridResourceCustomInjector.java    |   2 +-
 .../resource/GridResourceLoggerInjector.java    |   2 +-
 .../resource/GridResourceProcessor.java         |   2 +-
 .../handlers/GridRestCommandHandlerAdapter.java |   2 +-
 .../rest/protocols/GridRestProtocolAdapter.java |   2 +-
 .../tcp/GridTcpMemcachedNioListener.java        |   2 +-
 .../protocols/tcp/GridTcpRestNioListener.java   |   2 +-
 .../processors/service/GridServiceProxy.java    |   1 -
 .../processors/spring/GridSpringProcessor.java  |   2 +-
 .../GridStreamerStageExecutionFuture.java       |   2 +-
 .../processors/streamer/IgniteStreamerImpl.java |   2 +-
 .../kernal/processors/task/GridTaskWorker.java  |   2 +-
 .../gridgain/grid/kernal/visor/VisorJob.java    |   2 +-
 .../gridgain/grid/logger/GridNullLogger.java    |   1 +
 .../org/gridgain/grid/logger/IgniteLogger.java  | 153 -------------------
 .../grid/logger/java/GridJavaLogger.java        |   1 +
 .../marshaller/GridMarshallerExclusions.java    |   2 +-
 .../org/gridgain/grid/spi/GridSpiAdapter.java   |   2 +-
 .../org/gridgain/grid/spi/GridSpiThread.java    |   2 +-
 .../gridgain/grid/spi/GridSpiThreadFactory.java |   3 +-
 .../noop/GridNoopAuthenticationSpi.java         |   2 +-
 .../cache/GridCacheCheckpointSpi.java           |   2 +-
 .../checkpoint/jdbc/GridJdbcCheckpointSpi.java  |   2 +-
 .../checkpoint/noop/GridNoopCheckpointSpi.java  |   2 +-
 .../sharedfs/GridSharedFsCheckpointSpi.java     |   2 +-
 .../sharedfs/GridSharedFsTimeoutTask.java       |   2 +-
 .../checkpoint/sharedfs/GridSharedFsUtils.java  |   2 +-
 .../fifoqueue/GridFifoQueueCollisionSpi.java    |   2 +-
 .../GridJobStealingCollisionSpi.java            |   2 +-
 .../GridPriorityQueueCollisionSpi.java          |   2 +-
 .../tcp/GridTcpCommunicationSpi.java            |   2 +-
 .../local/GridLocalDeploymentSpi.java           |   2 +-
 .../spi/discovery/tcp/GridTcpDiscoverySpi.java  |   2 +-
 .../tcp/GridTcpDiscoverySpiAdapter.java         |   2 +-
 .../jdbc/GridTcpDiscoveryJdbcIpFinder.java      |   2 +-
 .../GridTcpDiscoveryMulticastIpFinder.java      |   2 +-
 .../GridTcpDiscoverySharedFsIpFinder.java       |   2 +-
 .../ipfinder/vm/GridTcpDiscoveryVmIpFinder.java |   2 +-
 .../memory/GridMemoryEventStorageSpi.java       |   2 +-
 .../failover/always/GridAlwaysFailoverSpi.java  |   2 +-
 .../jobstealing/GridJobStealingFailoverSpi.java |   2 +-
 .../failover/never/GridNeverFailoverSpi.java    |   2 +-
 .../grid/spi/indexing/GridNoopIndexingSpi.java  |   2 +-
 .../adaptive/GridAdaptiveLoadBalancingSpi.java  |   2 +-
 .../GridRoundRobinGlobalLoadBalancer.java       |   2 +-
 .../GridRoundRobinLoadBalancingSpi.java         |   2 +-
 .../GridWeightedRandomLoadBalancingSpi.java     |   2 +-
 .../noop/GridNoopSecureSessionSpi.java          |   2 +-
 .../swapspace/file/GridFileSwapSpaceSpi.java    |   2 +-
 .../swapspace/noop/GridNoopSwapSpaceSpi.java    |   2 +-
 .../org/gridgain/grid/util/GridJavaProcess.java |   2 +-
 .../org/gridgain/grid/util/GridLogThrottle.java |   2 +-
 .../java/org/gridgain/grid/util/GridUtils.java  |   3 +-
 .../grid/util/future/GridFutureAdapter.java     |   2 +-
 .../grid/util/ipc/GridIpcEndpointFactory.java   |   2 +-
 .../grid/util/ipc/GridIpcToNioAdapter.java      |   2 +-
 .../ipc/loopback/GridIpcServerTcpEndpoint.java  |   2 +-
 .../GridIpcSharedMemoryClientEndpoint.java      |   2 +-
 .../GridIpcSharedMemoryServerEndpoint.java      |   2 +-
 .../ipc/shmem/GridIpcSharedMemorySpace.java     |   2 +-
 .../nio/GridConnectionBytesVerifyFilter.java    |   2 +-
 .../grid/util/nio/GridNioAsyncNotifyFilter.java |   2 +-
 .../grid/util/nio/GridNioCodecFilter.java       |   2 +-
 .../grid/util/nio/GridNioFilterChain.java       |   2 +-
 .../gridgain/grid/util/nio/GridNioServer.java   |   2 +-
 .../util/nio/GridShmemCommunicationClient.java  |   2 +-
 .../grid/util/nio/ssl/GridNioSslFilter.java     |   2 +-
 .../grid/util/nio/ssl/GridNioSslHandler.java    |   2 +-
 .../grid/util/nodestart/GridNodeStartUtils.java |   2 +-
 .../nodestart/GridRemoteStartSpecification.java |   2 +-
 .../gridgain/grid/util/worker/GridWorker.java   |   2 +-
 .../grid/util/worker/GridWorkerPool.java        |   2 +-
 .../java/org/gridgain/grid/GridTestJob.java     |   2 +-
 .../java/org/gridgain/grid/GridTestTask.java    |   2 +-
 .../kernal/GridCancelUnusedJobSelfTest.java     |   1 -
 .../GridCancelledJobsMetricsSelfTest.java       |   1 -
 .../GridCollisionJobsContextSelfTest.java       |   1 -
 .../GridContinuousJobSiblingsSelfTest.java      |   1 -
 .../grid/kernal/GridContinuousTaskSelfTest.java |   1 -
 .../grid/kernal/GridDeploymentSelfTest.java     |   1 -
 .../GridEventStorageCheckAllEventsSelfTest.java |   1 -
 .../GridExplicitImplicitDeploymentSelfTest.java |   1 -
 .../GridFailoverCustomTopologySelfTest.java     |   1 -
 .../kernal/GridJobCollisionCancelSelfTest.java  |   1 -
 .../kernal/GridJobMasterLeaveAwareSelfTest.java |   1 -
 .../grid/kernal/GridJobStealingSelfTest.java    |   1 -
 .../GridJobStealingZeroActiveJobsSelfTest.java  |   1 -
 .../GridMultipleVersionsDeploymentSelfTest.java |   1 -
 .../GridMultithreadedJobStealingSelfTest.java   |   1 -
 .../kernal/GridNonHistoryMetricsSelfTest.java   |   1 -
 .../grid/kernal/GridReduceSelfTest.java         |   1 -
 .../kernal/GridRuntimeExceptionSelfTest.java    |   1 -
 .../grid/kernal/GridStopWithWaitSelfTest.java   |   1 -
 .../GridTaskCancelSingleNodeSelfTest.java       |   1 -
 .../GridTaskContinuousMapperSelfTest.java       |   1 -
 .../grid/kernal/GridTaskFailoverSelfTest.java   |   1 -
 .../GridTaskFutureImplStopGridSelfTest.java     |   1 -
 .../GridTaskInstanceExecutionSelfTest.java      |   1 -
 .../grid/kernal/GridTaskMapAsyncSelfTest.java   |   1 -
 .../grid/kernal/GridTaskTimeoutSelfTest.java    |   1 -
 .../GridCheckpointManagerAbstractSelfTest.java  |   2 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |   1 -
 .../cache/GridCacheGroupLockPutTask.java        |   1 -
 .../cache/GridCachePutAllFailoverSelfTest.java  |   1 -
 .../processors/cache/GridCachePutAllTask.java   |   1 -
 .../cache/GridCacheUtilsSelfTest.java           |   2 +-
 .../GridCacheCountDownLatchSelfTest.java        |   1 -
 ...dCacheSequenceMultiNodeAbstractSelfTest.java |   1 -
 .../distributed/dht/GridCacheDhtTestUtils.java  |   1 -
 .../GridCachePartitionedAffinitySelfTest.java   |   1 -
 ...achePartitionedMultiNodeCounterSelfTest.java |   1 -
 ...CacheReplicatedPreloadLifecycleSelfTest.java |   1 -
 .../closure/GridClosureProcessorSelfTest.java   |   1 -
 .../streamer/GridStreamerSelfTest.java          |   1 -
 .../grid/loadtest/GridSingleExecutionTest.java  |   1 -
 .../grid/logger/java/GridJavaLoggerTest.java    |   1 +
 .../marshaller/GridMarshallerAbstractTest.java  |   3 +-
 .../marshaller/GridMarshallerResourceBean.java  |   2 +-
 .../p2p/GridP2PRemoteClassLoadersSelfTest.java  |   1 -
 .../org/gridgain/grid/p2p/GridP2PTestJob.java   |   2 +-
 .../org/gridgain/grid/p2p/GridP2PTestTask.java  |   2 +-
 ...SessionCancelSiblingsFromFutureSelfTest.java |   1 -
 ...ridSessionCancelSiblingsFromJobSelfTest.java |   1 -
 ...idSessionCancelSiblingsFromTaskSelfTest.java |   1 -
 .../GridSessionCollisionSpiSelfTest.java        |   1 -
 ...idSessionFutureWaitJobAttributeSelfTest.java |   1 -
 ...dSessionFutureWaitTaskAttributeSelfTest.java |   1 -
 ...GridSessionJobWaitTaskAttributeSelfTest.java |   1 -
 .../grid/session/GridSessionLoadSelfTest.java   |   1 -
 .../GridSessionSetFutureAttributeSelfTest.java  |   1 -
 ...nSetFutureAttributeWaitListenerSelfTest.java |   1 -
 ...GridSessionSetJobAttributeOrderSelfTest.java |   1 -
 .../GridSessionSetJobAttributeSelfTest.java     |   1 -
 ...sionSetJobAttributeWaitListenerSelfTest.java |   1 -
 .../GridSessionSetTaskAttributeSelfTest.java    |   1 -
 ...GridSessionTaskWaitJobAttributeSelfTest.java |   1 -
 .../GridSessionWaitAttributeSelfTest.java       |   1 -
 .../org/gridgain/grid/spi/GridTcpForwarder.java |   2 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |   1 -
 ...tartupWithUndefinedGridGainHomeSelfTest.java |   1 -
 .../tostring/GridToStringBuilderSelfTest.java   |   2 +-
 .../cache/GridCacheAbstractLoadTest.java        |   1 -
 .../colocation/GridTestCacheStore.java          |   1 -
 .../direct/session/GridSessionLoadTestJob.java  |   2 +-
 .../direct/session/GridSessionLoadTestTask.java |   2 +-
 .../stealing/GridStealingLoadTestJob.java       |   2 +-
 .../loadtests/job/GridJobLoadTestJob.java       |   2 +-
 .../loadtests/nio/GridNioBenchmarkTest.java     |   2 +-
 .../testframework/GridStringLogger.java         |   2 +-
 .../GridTestSafeThreadFactory.java              |   2 +-
 .../gridgain/testframework/GridTestUtils.java   |   1 -
 .../testframework/junits/GridAbstractTest.java  |   1 -
 .../junits/GridTestKernalContext.java           |   2 +-
 .../testframework/junits/GridTestResources.java |   2 +-
 .../junits/logger/GridTestLog4jLogger.java      |   5 +-
 .../tests/p2p/GridP2PAwareTestUserResource.java |   1 -
 .../tests/p2p/GridP2PTestTaskExternalPath1.java |   1 -
 .../tests/p2p/GridP2PTestTaskExternalPath2.java |   2 +-
 .../grid/tests/p2p/JobStealingTask.java         |   1 -
 .../grid/hadoop/GridHadoopDefaultJobInfo.java   |   2 +-
 .../ggfs/hadoop/GridGgfsHadoopJclLogger.java    |   2 +-
 .../processors/hadoop/GridHadoopComponent.java  |   2 +-
 .../GridHadoopDefaultMapReducePlanner.java      |   1 -
 .../hadoop/shuffle/GridHadoopShuffleJob.java    |   2 +-
 .../taskexecutor/GridHadoopExecutorService.java |   2 +-
 .../taskexecutor/GridHadoopRunnableTask.java    |   2 +-
 .../GridHadoopExternalTaskExecutor.java         |   2 +-
 .../child/GridHadoopChildProcessRunner.java     |   2 +-
 .../child/GridHadoopExternalProcessStarter.java |   2 +-
 .../GridHadoopExternalCommunication.java        |   2 +-
 .../GridHadoopIpcToNioAdapter.java              |   2 +-
 .../processors/hadoop/v2/GridHadoopV2Job.java   |   2 +-
 .../v2/GridHadoopV2JobResourceManager.java      |   2 +-
 .../collections/GridHadoopAbstractMapTest.java  |   2 +-
 ...GridHadoopExternalCommunicationSelfTest.java |   2 +-
 .../GridHibernateAccessStrategyAdapter.java     |   1 -
 .../hibernate/GridHibernateRegionFactory.java   |   1 -
 .../hibernate/GridCacheHibernateBlobStore.java  |   2 +-
 .../grid/spi/indexing/h2/GridH2IndexingSpi.java |   2 +-
 .../GridIndexingSpiAbstractSelfTest.java        |   2 +-
 .../gridgain/grid/logger/jcl/GridJclLogger.java |   2 +-
 .../grid/logger/jcl/GridJclLoggerTest.java      |   2 +-
 .../cache/jta/GridCacheXAResource.java          |   2 +-
 .../grid/logger/log4j/GridLog4jLogger.java      |   5 +-
 .../logger/log4j/GridLog4jInitializedTest.java  |   2 +-
 .../logger/log4j/GridLog4jLoggingFileTest.java  |   2 +-
 .../logger/log4j/GridLog4jLoggingPathTest.java  |   2 +-
 .../logger/log4j/GridLog4jLoggingUrlTest.java   |   2 +-
 .../log4j/GridLog4jNotInitializedTest.java      |   2 +-
 .../http/jetty/GridJettyRestHandler.java        |   2 +-
 .../processors/schedule/ScheduleFutureImpl.java |   2 +-
 .../grid/kernal/GridScheduleSelfTest.java       |   1 -
 .../grid/logger/slf4j/GridSlf4jLogger.java      |   2 +-
 .../java/org/gridgain/grid/GridSpringBean.java  |   1 -
 .../spring/GridSpringProcessorImpl.java         |   2 +-
 .../GridAbstractUserExternalResource.java       |   1 -
 .../resource/GridUserExternalResourceTask1.java |   2 +-
 .../resource/GridUserExternalResourceTask2.java |   2 +-
 .../grid/kernal/GridFactorySelfTest.java        |   1 -
 .../resource/GridAbstractUserResource.java      |   1 -
 .../resource/GridLoggerInjectionSelfTest.java   |   1 -
 .../GridResourceEventFilterSelfTest.java        |   1 -
 .../GridResourceFieldInjectionSelfTest.java     |   1 -
 ...dResourceFieldOverrideInjectionSelfTest.java |   1 -
 ...GridResourceIsolatedClassLoaderSelfTest.java |   1 -
 .../GridResourceIsolatedTaskSelfTest.java       |   1 -
 .../GridResourceMethodInjectionSelfTest.java    |   1 -
 ...ResourceMethodOverrideInjectionSelfTest.java |   1 -
 .../resource/GridResourceProcessorSelfTest.java |   1 -
 .../GridResourceSharedUndeploySelfTest.java     |   1 -
 .../kernal/processors/resource/TestClosure.java |   1 -
 .../grid/p2p/GridP2PAbstractUserResource.java   |   1 -
 .../GridP2PContinuousLocalDeploySelfTest.java   |   1 -
 .../util/nodestart/GridNodeCallableImpl.java    |   2 +-
 .../GridUriDeploymentClassLoaderFactory.java    |   2 +-
 .../uri/GridUriDeploymentFileProcessor.java     |   2 +-
 .../uri/GridUriDeploymentJarVerifier.java       |   2 +-
 .../deployment/uri/GridUriDeploymentSpi.java    |   2 +-
 .../uri/GridUriDeploymentSpringParser.java      |   2 +-
 .../uri/scanners/GridUriDeploymentScanner.java  |   2 +-
 .../file/GridUriDeploymentFileScanner.java      |   2 +-
 .../ftp/GridUriDeploymentFtpClient.java         |   2 +-
 .../ftp/GridUriDeploymentFtpScanner.java        |   2 +-
 .../http/GridUriDeploymentHttpScanner.java      |   2 +-
 .../gridgain/visor/plugin/VisorPluginModel.java |   2 +-
 .../cache/websession/GridWebSessionFilter.java  |   1 -
 .../websession/GridWebSessionListener.java      |   1 -
 345 files changed, 392 insertions(+), 497 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java
index 9c74eb3..b9395c3 100644
--- a/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java
+++ b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverExample.java
@@ -15,7 +15,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.examples.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.lang.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java
index f213cee..28d5418 100644
--- a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java
+++ b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridTestGridifyJob.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.gridify;
 
+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/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java
index 7a3dcb9..7e95f0f 100644
--- a/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java
+++ b/modules/aop/src/test/java/org/test/gridify/GridExternalGridifyTask.java
@@ -9,11 +9,11 @@
 
 package org.test.gridify;
 
+import org.apache.ignite.*;
 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.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
index 7b4837b..d0fcf23 100644
--- a/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
+++ b/modules/aws/src/main/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpi.java
@@ -13,9 +13,9 @@ import com.amazonaws.*;
 import com.amazonaws.auth.*;
 import com.amazonaws.services.s3.*;
 import com.amazonaws.services.s3.model.*;
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java
index 1fd94ec..2ba1950 100644
--- a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java
+++ b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java
@@ -13,9 +13,9 @@ import com.amazonaws.*;
 import com.amazonaws.auth.*;
 import com.amazonaws.services.s3.*;
 import com.amazonaws.services.s3.model.*;
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java
index 2b6227a..b9d0d55 100644
--- a/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java
+++ b/modules/aws/src/test/java/org/gridgain/grid/spi/checkpoint/s3/GridS3CheckpointSpiSelfTest.java
@@ -195,7 +195,7 @@ public class GridS3CheckpointSpiSelfTest extends GridSpiAbstractTest<GridS3Check
     }
 
     /**
-     * Wrapper around {@link GridTestUtils#retryAssert(org.gridgain.grid.logger.IgniteLogger, int, long, GridAbsClosure)}.
+     * Wrapper around {@link GridTestUtils#retryAssert(org.apache.ignite.IgniteLogger, int, long, GridAbsClosure)}.
      * Provides s3-specific timeouts.
      * @param assertion Closure with assertion inside.
      * @throws GridInterruptedException If was interrupted.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java
index 37a58aa..7074175 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridClientStartNodeTask.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.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.springframework.beans.factory.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java
index d2b884f..efa2326 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridClientStopNodeTask.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 java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java
index 76518de..7308bf0 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTestRestServer.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.client;
 
+import org.apache.ignite.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.client.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
 import org.gridgain.grid.kernal.processors.rest.protocols.tcp.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.nio.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
index 098ad9f..9c2e61f 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.rest;
 
+import org.apache.ignite.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.client.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
index 7baa481..6ed95d7 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.rest;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index b620337..64352a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -17,7 +17,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.dr.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.hadoop.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
new file mode 100644
index 0000000..1ee12a7
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteLogger.java
@@ -0,0 +1,153 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite;
+
+import org.gridgain.grid.util.tostring.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * This interface defines basic logging functionality used throughout the system. We had to
+ * abstract it out so that we can use whatever logging is used by the hosting environment.
+ * Currently, <a target=_new href="http://logging.apache.org/log4j/docs/">log4j</a>,
+ * <a target=_new href="http://www.jboss.org/developers/guides/logging">JBoss</a>,
+ * <a target=_new href="http://jakarta.apache.org/commons/logging/">JCL</a> and
+ * console logging are provided as supported implementations.
+ * <p>
+ * GridGain logger could be configured either from code (for example log4j logger):
+ * <pre name="code" class="java">
+ *      GridConfiguration cfg = new GridConfiguration();
+ *      ...
+ *      URL xml = U.resolveGridGainUrl("config/custom-log4j.xml");
+ *      GridLogger log = new GridLog4jLogger(xml);
+ *      ...
+ *      cfg.setGridLogger(log);
+ * </pre>
+ * or in grid configuration file (see JCL logger example below):
+ * <pre name="code" class="xml">
+ *      ...
+ *      &lt;property name="gridLogger"&gt;
+ *          &lt;bean class="org.gridgain.grid.logger.jcl.GridJclLogger"&gt;
+ *              &lt;constructor-arg type="org.apache.commons.logging.Log"&gt;
+ *                  &lt;bean class="org.apache.commons.logging.impl.Log4JLogger"&gt;
+ *                      &lt;constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/&gt;
+ *                  &lt;/bean&gt;
+ *              &lt;/constructor-arg&gt;
+ *          &lt;/bean&gt;
+ *      &lt;/property&gt;
+ *      ...
+ * </pre>
+ * It's recommended to use GridGain's logger injection instead of using/instantiating
+ * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
+ * injection.
+ * <h1 class="header">Quiet Mode</h1>
+ * By default GridGain 3.0 and later starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG}
+ * log output. If system property {@code GRIDGAIN_QUIET} is set to {@code false} than GridGain
+ * will operate in normal un-suppressed logging mode. Note that all output in "quiet" mode is
+ * done through standard output (STDOUT).
+ * <p>
+ * Note that GridGain's standard startup scripts <tt>$GRIDGAIN_HOME/bin/ggstart.{sh|bat}</tt> start
+ * by default in "quiet" mode. Both scripts accept {@code -v} arguments to turn off "quiet" mode.
+ */
+@GridToStringExclude
+public interface IgniteLogger {
+    /**
+     * Creates new logger with given category based off the current instance.
+     *
+     * @param ctgr Category for new logger.
+     * @return New logger with given category.
+     */
+    public IgniteLogger getLogger(Object ctgr);
+
+    /**
+     * Logs out trace message.
+     *
+     * @param msg Trace message.
+     */
+    public void trace(String msg);
+
+    /**
+     * Logs out debug message.
+     *
+     * @param msg Debug message.
+     */
+    public void debug(String msg);
+
+    /**
+     * Logs out information message.
+     *
+     * @param msg Information message.
+     */
+    public void info(String msg);
+
+    /**
+     * Logs out warning message.
+     *
+     * @param msg Warning message.
+     */
+    public void warning(String msg);
+
+    /**
+     * Logs out warning message with optional exception.
+     *
+     * @param msg Warning message.
+     * @param e Optional exception (can be {@code null}).
+     */
+    public void warning(String msg, @Nullable Throwable e);
+
+    /**
+     * Logs out error message.
+     *
+     * @param msg Error message.
+     */
+    public void error(String msg);
+
+    /**
+     * Logs error message with optional exception.
+     *
+     * @param msg Error message.
+     * @param e Optional exception (can be {@code null}).
+     */
+    public void error(String msg, @Nullable Throwable e);
+
+    /**
+     * Tests whether {@code trace} level is enabled.
+     *
+     * @return {@code true} in case when {@code trace} level is enabled, {@code false} otherwise.
+     */
+    public boolean isTraceEnabled();
+
+    /**
+     * Tests whether {@code debug} level is enabled.
+     *
+     * @return {@code true} in case when {@code debug} level is enabled, {@code false} otherwise.
+     */
+    public boolean isDebugEnabled();
+
+    /**
+     * Tests whether {@code info} level is enabled.
+     *
+     * @return {@code true} in case when {@code info} level is enabled, {@code false} otherwise.
+     */
+    public boolean isInfoEnabled();
+
+    /**
+     * Tests whether {@code info} and {@code debug} levels are turned off.
+     *
+     * @return Whether {@code info} and {@code debug} levels are turned off.
+     */
+    public boolean isQuiet();
+
+    /**
+     * Gets name of the file being logged to if one is configured or {@code null} otherwise.
+     *
+     * @return Name of the file being logged to if one is configured or {@code null} otherwise.
+     */
+    @Nullable public String fileName();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
index 422e20b..0135022 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/gridify/aop/GridifyDefaultRangeTask.java
@@ -15,7 +15,6 @@ 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 org.gridgain.grid.util.gridify.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index c51d1ed..a6574f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -9,6 +9,7 @@
 
 package org.apache.ignite.configuration;
 
+import org.apache.ignite.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
@@ -23,7 +24,6 @@ import org.gridgain.grid.dr.hub.sender.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-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/main/java/org/apache/ignite/messaging/MessagingListenActor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
index 3b5d77b..5717154 100644
--- a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
+++ b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java
@@ -14,7 +14,6 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 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/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
index 3472e10..abe991b 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/PluginContext.java
@@ -12,7 +12,6 @@ package org.apache.ignite.plugin;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.*;
 import org.gridgain.grid.util.direct.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java
index fdddc3f..b248c71 100644
--- a/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java
+++ b/modules/core/src/main/java/org/apache/ignite/resources/IgniteLoggerResource.java
@@ -14,7 +14,7 @@ import org.gridgain.grid.spi.*;
 import java.lang.annotation.*;
 
 /**
- * Annotates a field or a setter method for injection of {@link org.gridgain.grid.logger.IgniteLogger}. Grid logger is provided to grid
+ * Annotates a field or a setter method for injection of {@link org.apache.ignite.IgniteLogger}. Grid logger is provided to grid
  * via {@link org.apache.ignite.configuration.IgniteConfiguration}.
  * <p>
  * Logger can be injected into instances of following classes:

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
index b1e8253..8a4850f 100644
--- a/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.client.impl.connection;
 
+import org.apache.ignite.*;
 import org.gridgain.client.*;
 import org.gridgain.client.impl.*;
 import org.gridgain.client.util.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.direct.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java b/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java
index f9f8ebb..b2ebb52 100644
--- a/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/client/router/GridTcpRouterConfiguration.java
@@ -1,8 +1,8 @@
 package org.gridgain.client.router;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.gridgain.client.ssl.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.security.*;
 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/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java
index f4d8c79..02a2474 100644
--- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java
+++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridRouterCommandLineStartup.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.client.router.impl;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
 import org.gridgain.client.router.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.spring.*;
-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/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
index 6ffc294..fc08d5d 100644
--- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
+++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.client.router.impl;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lifecycle.*;
 import org.gridgain.client.*;
 import org.gridgain.client.router.*;
 import org.gridgain.client.ssl.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.util.nio.*;
 import org.gridgain.grid.util.nio.ssl.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java
index a718400..3113ae0 100644
--- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerAdapter.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.client.router.impl;
 
+import org.apache.ignite.*;
 import org.gridgain.client.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.client.marshaller.jdk.*;
 import org.gridgain.client.marshaller.optimized.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.nio.*;
 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/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java
index 56462c5..150bf4e 100644
--- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java
+++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterNioListenerOsImpl.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.client.router.impl;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 
 /**
  * Router NIO listener.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java
index 66f0e19..e026e50 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/affinity/consistenthash/GridCacheConsistentHashAffinityFunction.java
@@ -16,7 +16,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.util.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java
index 5d2268a..e367327 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheLoadOnlyStoreAdapter.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.cache.store;
 
+import org.apache.ignite.*;
 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.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
index 5fed548..4e5512d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/jdbc/GridCacheJdbcBlobStore.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.cache.store.jdbc;
 
+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.tostring.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java b/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java
index 9df0efb..5571bde 100644
--- a/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/dr/hub/sender/store/fs/GridDrSenderHubFsStore.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.dr.hub.sender.store.fs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.dr.hub.sender.store.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java b/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java
index 93e33ad..948093a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java
+++ b/modules/core/src/main/java/org/gridgain/grid/hadoop/GridHadoopJobInfo.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.hadoop;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java
index b141781..c41c133 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridDiagnostic.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.worker.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java
index 66f2cf7..747a594 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridJobContextImpl.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.processors.job.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index a20a5dd..cbc9d18 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -57,7 +57,6 @@ import org.gridgain.grid.kernal.processors.session.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
index 6560a12..a3bc773 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.plugin.*;
 import org.gridgain.grid.*;
@@ -50,7 +51,6 @@ import org.gridgain.grid.kernal.processors.session.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
index 5b43e02..3cb3336 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
@@ -54,7 +54,6 @@ import org.gridgain.grid.kernal.processors.spring.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java
index 603b6fe..2ac9916 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridLoggerProxy.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
 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.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java
index a2dd13a..09d04d2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPerformanceSuggestions.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 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/main/java/org/gridgain/grid/kernal/GridPluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java
index c1ff20d..d86ad14 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPluginContext.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.plugin.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.direct.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
index 9f5d000..51f2e59 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.license.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.product.*;
 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/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java b/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java
index 068250e..8ea6faa 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/executor/GridExecutorService.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java
index 170d33a..392da6e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/GridManagerAdapter.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.managers;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -19,7 +20,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.swapspace.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java
index c02f3e2..ee4a909 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentClassLoader.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.managers.deployment;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
index 266776a..e868343 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentCommunication.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.managers.deployment;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-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/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java
index aa377b9..1667a97 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentStoreAdapter.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.managers.deployment;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.deployment.*;
 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/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java
index 3d8ba2f..900ddb3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/GridProcessorAdapter.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
index 3c6e842..25feb24 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.affinity;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java
index f2d519c..054ef7c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityUtils.java
@@ -17,7 +17,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.task.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 9a44d85..a9034b5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -30,7 +30,6 @@ import org.gridgain.grid.kernal.processors.cache.dr.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
 import org.gridgain.grid.kernal.processors.dr.*;
 import org.gridgain.grid.kernal.processors.task.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java
index a46e88c..b8fa047 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheClearAllRunnable.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-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/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java
index 573ec21..add63b4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheConcurrentMap.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
index e82a06e..a7ed532 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
@@ -34,7 +35,6 @@ import org.gridgain.grid.kernal.processors.closure.*;
 import org.gridgain.grid.kernal.processors.offheap.*;
 import org.gridgain.grid.kernal.processors.portable.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
index 666d4d2..3d4a311 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 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.portables.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java
index c82dcb2..e3d1538 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryInfoCollectSwapListener.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jdk8.backport.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
index 59de374..a051a20 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionEntry.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 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.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java
index 3ce7b19..7cc4593 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheLogger.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java
index da93f79..e3b2882 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheManagerAdapter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.concurrent.atomic.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
index 8d612a2..8427dbe 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.cache.extras.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
 import org.gridgain.grid.kernal.processors.dr.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 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/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
index 0cb28f0..44e9711 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMultiTxFuture.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java
index 5950032..7445179 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvcc.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.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
index 68dfe3a..5b8f19f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.managers.discovery.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java
index c17f724..172d062 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePreloaderAdapter.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
index 57f0ad8..808c117 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedContext.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
@@ -20,7 +21,6 @@ import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.discovery.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java
index 815324f..14ff2dd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheSharedManagerAdapter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.concurrent.atomic.*;


[51/53] [abbrv] incubator-ignite git commit: Merge branch 'master' of github.com:sboikov/ignite-test into gg-9470-rename-1

Posted by sb...@apache.org.
Merge branch 'master' of github.com:sboikov/ignite-test into gg-9470-rename-1


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

Branch: refs/heads/master
Commit: 2d0728e5f368b4af5495e8957900c5ece42627e8
Parents: a74cf2a 5539623
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 00:36:27 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 00:36:27 2014 +0300

----------------------------------------------------------------------
 README.md | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------



[14/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 569ae2b..c8675e0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
@@ -21,7 +22,6 @@ import org.gridgain.grid.cache.query.GridCacheContinuousQueryEntry;
 import org.gridgain.grid.cache.store.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.continuous.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index b55afcd..de1d1a2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.processors.cache.query.reducefields;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.discovery.*;
 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/a50fccdd/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 e562a50..46ba6da 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
@@ -14,9 +14,9 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java
index af8e8ab..c1b4449 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java
@@ -14,10 +14,10 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
index 65f724a..db44d7c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
@@ -12,8 +12,8 @@ package org.gridgain.grid.kernal.processors.dataload;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
index 788242c..ec55cca 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
@@ -13,10 +13,10 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.eviction.fifo.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
index 2d87f6f..619082a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal.processors.ggfs;
 
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java
index 9db6b34..6397cde 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal.processors.streamer;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/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 6b1fc7e..3da4159 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
@@ -13,9 +13,9 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/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 844b997..5d3ea8f 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
@@ -16,6 +16,7 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
@@ -27,7 +28,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.marshaller.optimized.*;
 import org.gridgain.grid.p2p.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.streamer.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java
index 16b30ab..f458745 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java
@@ -12,8 +12,8 @@ package org.gridgain.grid.marshaller;
 import com.esotericsoftware.kryo.*;
 import com.esotericsoftware.kryo.io.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
index f2f8bb4..1167250 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
@@ -10,6 +10,7 @@
 package org.gridgain.grid.marshaller.optimized;
 
 import junit.framework.*;
+import org.apache.ignite.marshaller.optimized.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
index 29132c6..ce795b6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
@@ -2,6 +2,7 @@ package org.gridgain.grid.marshaller.optimized;
 
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
index 72d9639..51bf4d6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -3,6 +3,7 @@ package org.gridgain.grid.marshaller.optimized;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
index f37c2bc..4306862 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
@@ -10,6 +10,7 @@
 package org.gridgain.grid.marshaller.optimized;
 
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java
index d2f999c..2a63c73 100644
--- a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java
@@ -4,8 +4,8 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
index 57715cc..d7aa2b9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
@@ -12,8 +12,8 @@ package org.gridgain.grid.spi;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.communication.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
index 83ead72..04c368e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.spi.discovery.tcp;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.marshaller.jdk.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
index 367f150..d9b7de8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.util.future;
 
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/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 0a20f9f..b41809e 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
@@ -17,13 +17,13 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.log4j.*;
 import org.gridgain.grid.*;
 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.marshaller.optimized.*;
 import org.gridgain.grid.spi.checkpoint.sharedfs.*;
 import org.gridgain.grid.spi.communication.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/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 2aefe07..c0755a5 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
@@ -11,10 +11,10 @@ package org.gridgain.testframework.junits;
 
 import org.apache.ignite.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.config.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/webapp/META-INF/gg-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml
index 3434b3c..918df61 100644
--- a/modules/core/src/test/webapp/META-INF/gg-config.xml
+++ b/modules/core/src/test/webapp/META-INF/gg-config.xml
@@ -45,7 +45,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/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 6b0e098..f7b0a86 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
@@ -12,10 +12,10 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.child;
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.logger.log4j.*;
+import org.apache.ignite.marshaller.optimized.*;
 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.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/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 de90bb1..79d40ca 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
@@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communi
 
 import org.apache.ignite.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.kernal.processors.hadoop.message.*;
 import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index cd76a07..f1e33c0 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -11,12 +11,12 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.discovery.*;
 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/a50fccdd/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
index c43d410..ddc2a35 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -13,13 +13,13 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.cache.store.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index 8c2ff51..11df811 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -12,9 +12,9 @@ package org.gridgain.grid.kernal.processors.cache;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
index 0e9bb02..317f259 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
@@ -12,13 +12,13 @@ package org.gridgain.grid.kernal.processors.cache;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.eviction.lru.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
index 4966e8f..58f91df 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.indexing.h2.*;
 import org.gridgain.grid.util.typedef.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
index ebeb46f..b7d6d83 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
@@ -13,9 +13,9 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
index fff0f76..22c0942 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.indexing.h2.opt;
 
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.indexing.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java b/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java
index e3fb2a8..8c41970 100644
--- a/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java
@@ -11,10 +11,10 @@ package org.gridgain.loadtests.h2indexing;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;
 import org.gridgain.grid.spi.indexing.h2.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
index 718fe4c..05533bb 100644
--- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
+++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
@@ -42,7 +42,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
index 9454b25..e1366d7 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.kernal;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*;


[38/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
index c2a580f..db1ae2f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java
@@ -850,7 +850,7 @@ public class GridServiceProcessor extends GridProcessorAdapter {
      * @return Copy of service.
      */
     private GridService copyAndInject(GridService svc) {
-        GridMarshaller m = ctx.config().getMarshaller();
+        IgniteMarshaller m = ctx.config().getMarshaller();
 
         try {
             byte[] bytes = m.marshal(svc);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
index f6c1e0f..d58717e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskProcessor.java
@@ -49,7 +49,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
         new EnumMap<>(GridTaskThreadContextKey.class);
 
     /** */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /** */
     private final ConcurrentMap<IgniteUuid, GridTaskWorker<?, ?>> tasks = GridConcurrentFactory.newMap();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
index b76f6c1..4d18c4b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
@@ -76,7 +76,7 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
     private final IgniteLogger log;
 
     /** */
-    private final GridMarshaller marsh;
+    private final IgniteMarshaller marsh;
 
     /** */
     private final GridTaskSessionImpl ses;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
index aa0359d..3db8f2c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
@@ -116,7 +116,7 @@ public class GridSharedFsCheckpointSpi extends GridSpiAdapter implements GridChe
 
     /** Grid marshaller. */
     @IgniteMarshallerResource
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** List of checkpoint directories where all files are stored. */
     private Queue<String> dirPaths = new LinkedList<>();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
index 79f05a2..5d563ec 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
@@ -35,7 +35,7 @@ class GridSharedFsTimeoutTask extends GridSpiThread {
     private IgniteLogger log;
 
     /** Messages marshaller. */
-    private GridMarshaller marshaller;
+    private IgniteMarshaller marshaller;
 
     /** */
     private final Object mux = new Object();
@@ -50,7 +50,7 @@ class GridSharedFsTimeoutTask extends GridSpiThread {
      * @param marshaller Messages marshaller.
      * @param log Messages logger.
      */
-    GridSharedFsTimeoutTask(String gridName, GridMarshaller marshaller, IgniteLogger log) {
+    GridSharedFsTimeoutTask(String gridName, IgniteMarshaller marshaller, IgniteLogger log) {
         super(gridName, "grid-sharedfs-timeout-worker", log);
 
         assert marshaller != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
index 13689f3..c177b77 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
@@ -39,7 +39,7 @@ final class GridSharedFsUtils {
      *    to {@link GridSharedFsCheckpointData} object.
      * @throws IOException Thrown if file read error occurred.
      */
-    static GridSharedFsCheckpointData read(File file, GridMarshaller m, IgniteLogger log)
+    static GridSharedFsCheckpointData read(File file, IgniteMarshaller m, IgniteLogger log)
         throws IOException, GridException {
         assert file != null;
         assert m != null;
@@ -66,7 +66,7 @@ final class GridSharedFsUtils {
      * @throws GridException Thrown if data could not be marshalled.
      * @throws IOException Thrown if file write operation failed.
      */
-    static void write(File file, GridSharedFsCheckpointData data, GridMarshaller m, IgniteLogger log)
+    static void write(File file, GridSharedFsCheckpointData data, IgniteMarshaller m, IgniteLogger log)
         throws IOException, GridException {
         assert file != null;
         assert m != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index 9617000..12ea6c0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -339,7 +339,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
 
     /** Marshaller. */
     @IgniteMarshallerResource
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** Local IP address. */
     private String locAddr;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
index 4bffc5e..ef055fb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
@@ -202,7 +202,7 @@ public class GridTcpDiscoverySpi extends GridTcpDiscoverySpiAdapter implements G
 
     /** Grid marshaller. */
     @IgniteMarshallerResource
-    private GridMarshaller gridMarsh;
+    private IgniteMarshaller gridMarsh;
 
     /** Nodes ring. */
     @GridToStringExclude

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
index 0706447..89dfa0e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
@@ -128,7 +128,7 @@ abstract class GridTcpDiscoverySpiAdapter extends GridSpiAdapter implements Grid
     protected volatile long gridStartTime;
 
     /** Marshaller. */
-    protected final GridMarshaller marsh = new IgniteJdkMarshaller();
+    protected final IgniteMarshaller marsh = new IgniteJdkMarshaller();
 
     /** Statistics. */
     protected final GridTcpDiscoveryStatistics stats = new GridTcpDiscoveryStatistics();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
index eaf813f..3f40cf9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
@@ -70,7 +70,7 @@ public class GridTcpDiscoveryMulticastIpFinder extends GridTcpDiscoveryVmIpFinde
     private static final byte[] MSG_ADDR_REQ_DATA = U.GG_HEADER;
 
     /** */
-    private static final GridMarshaller marsh = new IgniteJdkMarshaller();
+    private static final IgniteMarshaller marsh = new IgniteJdkMarshaller();
 
     /** Grid logger. */
     @IgniteLoggerResource

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
index d8eb600..ce64c20 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
@@ -27,7 +27,7 @@ public class GridIndexingEntityAdapter<T> implements GridIndexingEntity<T> {
 
     /**
      * @param val Value.
-     * @param bytes Value marshalled by {@link org.apache.ignite.marshaller.GridMarshaller}.
+     * @param bytes Value marshalled by {@link org.apache.ignite.marshaller.IgniteMarshaller}.
      */
     public GridIndexingEntityAdapter(T val, @Nullable byte[] bytes) {
         this.val = val;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
index 4dc2c6d..59be61a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
@@ -154,7 +154,7 @@ public class GridFileSwapSpaceSpi extends GridSpiAdapter implements GridSwapSpac
 
     /** Marshaller. */
     @IgniteMarshallerResource
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** {@inheritDoc} */
     @Override public String getBaseDirectory() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
index f3efc02..8f1e18b 100644
--- a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
+++ b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
@@ -25,7 +25,7 @@ import static java.sql.Types.*;
  */
 public class GridJdbcUtils {
     /** Marshaller. */
-    private static final GridMarshaller MARSHALLER = new IgniteJdkMarshaller();
+    private static final IgniteMarshaller MARSHALLER = new IgniteJdkMarshaller();
 
     /**
      * Marshals task argument to byte array.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
index 2733c45..4fd524d 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
@@ -17,7 +17,7 @@ import java.util.concurrent.*;
 @GridCommonTest(group = "Marshaller")
 public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
     /** {@inheritDoc} */
-    @Override protected GridMarshaller createMarshaller() {
+    @Override protected IgniteMarshaller createMarshaller() {
         IgniteOptimizedMarshaller m = new IgniteOptimizedMarshaller();
 
         m.setRequireSerializable(false);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
index f2dac0d..d17c792 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -133,7 +133,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testNonSerializable5() throws GridException {
-        GridMarshaller marsh = new IgniteOptimizedMarshaller();
+        IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
         byte[] bytes = marsh.marshal(true);
 
@@ -148,7 +148,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testSerializable() throws GridException {
-        GridMarshaller marsh = new IgniteOptimizedMarshaller();
+        IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
         SomeSerializable outObj = marsh.unmarshal(marsh.marshal(new SomeSerializable(null)), null);
 
@@ -159,7 +159,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If failed.
      */
     public void testSerializableAfterChangingValue() throws GridException {
-        GridMarshaller marsh = new IgniteOptimizedMarshaller();
+        IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
         SomeSimpleSerializable newObj = new SomeSimpleSerializable();
 
@@ -180,7 +180,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testExternalizable() throws GridException {
-        GridMarshaller marsh = new IgniteOptimizedMarshaller();
+        IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
         ExternalizableA outObj = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, true)), null);
         ExternalizableA outObj1 = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, false)), null);
@@ -219,7 +219,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
         ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
         IgniteOptimizedClassResolver.userClasses(null, null);
 
-        GridMarshaller marsh = new IgniteOptimizedMarshaller();
+        IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
         int size1 = marsh.marshal(obj).length;
 
@@ -249,7 +249,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
         ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
         IgniteOptimizedClassResolver.userClasses(null, null);
 
-        GridMarshaller marsh = new IgniteOptimizedMarshaller();
+        IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
         int size1 = marsh.marshal(obj).length;
 
@@ -349,7 +349,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void checkPerformance(int cnt, int tries) throws Exception {
-        GridMarshaller marsh = new IgniteOptimizedMarshaller();
+        IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
         for (int j = 0; j < tries; j++) {
             System.gc();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
index 60c6110..16c01f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
@@ -940,7 +940,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testExcludedClass() throws Exception {
-        Class<?>[] exclClasses = U.staticField(GridMarshallerExclusions.class, "EXCL_CLASSES");
+        Class<?>[] exclClasses = U.staticField(IgniteMarshallerExclusions.class, "EXCL_CLASSES");
 
         assertFalse(F.isEmpty(exclClasses));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
index 0673e5d..8f02e67 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
@@ -22,8 +22,8 @@ public class GridExternalizableAbstractTest extends GridCommonAbstractTest {
     /**
      * @return Marshallers.
      */
-    protected List<GridMarshaller> getMarshallers() {
-        List<GridMarshaller> marshallers = new ArrayList<>();
+    protected List<IgniteMarshaller> getMarshallers() {
+        List<IgniteMarshaller> marshallers = new ArrayList<>();
 
         marshallers.add(new IgniteJdkMarshaller());
         marshallers.add(new IgniteOptimizedMarshaller());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java b/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
index b84989c..6aabb6f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
@@ -115,7 +115,7 @@ public final class GridTestIoUtils {
      * @throws Exception If failed.
      */
     @SuppressWarnings("unchecked")
-    public static <T> T externalize(Externalizable obj, GridMarshaller marshaller) throws Exception {
+    public static <T> T externalize(Externalizable obj, IgniteMarshaller marshaller) throws Exception {
         assert marshaller != null;
 
         byte[] buf = marshaller.marshal(obj);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
index 2e8f2a6..b7e97c6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
  */
 public class GridGgfsPathSelfTest extends GridCommonAbstractTest {
     /** Marshaller to test {@link Externalizable} interface. */
-    private final GridMarshaller marshaller = new IgniteOptimizedMarshaller();
+    private final IgniteMarshaller marshaller = new IgniteOptimizedMarshaller();
 
     /**
      * Test public methods of ggfs path.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index 1deefea..31530ae 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -716,7 +716,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
     private static class CommunicationSpi extends GridTcpCommunicationSpi {
         /** Marshaller. */
         @IgniteMarshallerResource
-        private GridMarshaller marsh;
+        private IgniteMarshaller marsh;
 
         /** Whether to block all outgoing messages. */
         private volatile boolean block;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
index eb5b96b..9094077 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
@@ -39,7 +39,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
      * @throws Exception If failed.
      */
     public void testSerializationTopicCreatedByGridUuid() throws Exception {
-        for (GridMarshaller marsh : getMarshallers()) {
+        for (IgniteMarshaller marsh : getMarshallers()) {
             info("Test GridTopic externalization [marshaller=" + marsh + ']');
 
             for (GridTopic topic : GridTopic.values()) {
@@ -54,7 +54,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
      * @throws Exception If failed.
      */
     public void testSerializationTopicCreatedByGridUuidAndUUID() throws Exception {
-        for (GridMarshaller marsh : getMarshallers()) {
+        for (IgniteMarshaller marsh : getMarshallers()) {
             info("Test GridTopic externalization [marshaller=" + marsh + ']');
 
             for (GridTopic topic : GridTopic.values()) {
@@ -69,7 +69,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
      * @throws Exception If failed.
      */
     public void testSerializationTopicCreatedByGridUuidAndLong() throws Exception {
-        for (GridMarshaller marsh : getMarshallers()) {
+        for (IgniteMarshaller marsh : getMarshallers()) {
             info("Test GridTopic externalization [marshaller=" + marsh + ']');
 
             for (GridTopic topic : GridTopic.values()) {
@@ -84,7 +84,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
      * @throws Exception If failed.
      */
     public void testSerializationTopicCreatedByStringAndUUIDAndLong() throws Exception {
-        for (GridMarshaller marsh : getMarshallers()) {
+        for (IgniteMarshaller marsh : getMarshallers()) {
             info("Test GridTopic externalization [marshaller=" + marsh + ']');
 
             for (GridTopic topic : GridTopic.values()) {
@@ -99,7 +99,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
      * @throws Exception If failed.
      */
     public void testSerializationTopicCreatedByString() throws Exception {
-        for (GridMarshaller marsh : getMarshallers()) {
+        for (IgniteMarshaller marsh : getMarshallers()) {
             info("Test GridTopic externalization [marshaller=" + marsh + ']');
 
             for (GridTopic topic : GridTopic.values()) {
@@ -114,7 +114,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
      * @throws Exception If failed.
      */
     public void testSerializationTopicCreatedByStringAndIntAndLong() throws Exception {
-        for (GridMarshaller marsh : getMarshallers()) {
+        for (IgniteMarshaller marsh : getMarshallers()) {
             info("Test GridTopic externalization [marshaller=" + marsh + ']');
 
             for (GridTopic topic : GridTopic.values()) {
@@ -129,7 +129,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
      * @throws Exception If failed.
      */
     public void testSerializationTopicCreatedByStrinAndLong() throws Exception {
-        for (GridMarshaller marsh : getMarshallers()) {
+        for (IgniteMarshaller marsh : getMarshallers()) {
             info("Test GridTopic externalization [marshaller=" + marsh + ']');
 
             for (GridTopic topic : GridTopic.values()) {
@@ -144,7 +144,7 @@ public class GridTopicExternalizableSelfTest extends GridExternalizableAbstractT
      * @throws Exception If failed.
      */
     public void testSerializationTopicCreatedByStringAndUUIDAndIntAndLong() throws Exception {
-        for (GridMarshaller marsh : getMarshallers()) {
+        for (IgniteMarshaller marsh : getMarshallers()) {
             info("Test GridTopic externalization [marshaller=" + marsh + ']');
 
             for (GridTopic topic : GridTopic.values()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index fe05d81..651b0a8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -74,7 +74,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
             NEAR_ENTRY_OVERHEAD = U.<Integer>staticField(GridNearCacheEntry.class, "NEAR_SIZE_OVERHEAD");
             REPLICATED_ENTRY_OVERHEAD = DHT_ENTRY_OVERHEAD;
 
-            GridMarshaller marsh = new IgniteOptimizedMarshaller();
+            IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
             KEY_SIZE = marsh.marshal(1).length;
             ONE_KB_VAL_SIZE = marsh.marshal(new Value(new byte[1024])).length;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
index 823e66a..f8847db 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
@@ -92,7 +92,7 @@ public class GridCacheMvccSelfTest extends GridCommonAbstractTest {
             false
         );
 
-        GridMarshaller marshaller = getTestResources().getMarshaller();
+        IgniteMarshaller marshaller = getTestResources().getMarshaller();
 
         GridCacheMvccCandidate<String> unmarshalled = marshaller.unmarshal(marshaller.marshal(cand), null);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
index 0f79da7..f3fa2db 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
@@ -134,7 +134,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
 
             Ignite g0 = grid(0);
 
-            GridMarshaller marsh = g0.configuration().getMarshaller();
+            IgniteMarshaller marsh = g0.configuration().getMarshaller();
 
             if (marsh instanceof IgniteOptimizedMarshaller)
                 assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable());
@@ -184,7 +184,7 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
 
             Ignite g0 = grid(0);
 
-            GridMarshaller marsh = g0.configuration().getMarshaller();
+            IgniteMarshaller marsh = g0.configuration().getMarshaller();
 
             if (marsh instanceof IgniteOptimizedMarshaller)
                 assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
index da1519c..84cca65 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
@@ -24,7 +24,7 @@ import java.util.concurrent.*;
  */
 public class GridGgfsFileInfoSelfTest extends GridGgfsCommonAbstractTest {
     /** Marshaller to test {@link Externalizable} interface. */
-    private final GridMarshaller marshaller = new IgniteOptimizedMarshaller();
+    private final IgniteMarshaller marshaller = new IgniteOptimizedMarshaller();
 
     /**
      * Test node info serialization.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 147935f..e6fb1b4 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
@@ -53,7 +53,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
     private static final String CACHE_NAME = "namedCache";
 
     /** */
-    private static GridMarshaller marsh;
+    private static IgniteMarshaller marsh;
 
     /** Closure job. */
     protected IgniteInClosure<String> c1 = new IgniteInClosure<String>() {
@@ -135,7 +135,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
     /**
      * @return Grid marshaller.
      */
-    protected abstract GridMarshaller createMarshaller();
+    protected abstract IgniteMarshaller createMarshaller();
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 b3ffa02..9f6b1e4 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
@@ -35,7 +35,7 @@ class GridMarshallerResourceBean implements Serializable {
     private IgniteLogger log;
 
     /** Marshaller. */
-    private GridMarshaller marshaller;
+    private IgniteMarshaller marshaller;
 
     /** Load balancer. */
     private ComputeLoadBalancer balancer;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
index 9cd31aa..f6134a5 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
@@ -21,7 +21,7 @@ import org.gridgain.testframework.junits.common.*;
 @GridCommonTest(group = "Marshaller")
 public class GridJdkMarshallerSelfTest extends GridMarshallerAbstractTest {
     /** {@inheritDoc} */
-    @Override protected GridMarshaller createMarshaller() {
+    @Override protected IgniteMarshaller createMarshaller() {
         return new IgniteJdkMarshaller();
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
index 8dac019..9417f77 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
@@ -51,7 +51,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb
 
         serState = spi.loadCheckpoint(globalKey);
 
-        GridMarshaller marshaller = getTestResources().getMarshaller();
+        IgniteMarshaller marshaller = getTestResources().getMarshaller();
 
         assert marshaller != null;
 
@@ -77,7 +77,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb
      * @throws Exception If check failed.
      */
     private static void checkRunningState(String sesKey, String sesState, String globalKey, String globalState,
-        GridMarshaller marsh, ClassLoader cl) throws Exception {
+        IgniteMarshaller marsh, ClassLoader cl) throws Exception {
         assert marsh != null;
         assert cl != null;
 
@@ -144,7 +144,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb
 
         /** */
         @IgniteMarshallerResource
-        private GridMarshaller marshaller;
+        private IgniteMarshaller marshaller;
 
         /** {@inheritDoc} */
         @Override protected Collection<ComputeJobAdapter> split(int gridSize, Object arg) throws GridException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index d16942c..22be7ef 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -46,7 +46,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
     private GridCommunicationSpi commSpi;
 
     /** Marshaller used in test. */
-    private GridMarshaller marsh = new IgniteJdkMarshaller();
+    private IgniteMarshaller marsh = new IgniteJdkMarshaller();
 
     /**
      *
@@ -234,7 +234,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest {
 
         /** */
         @IgniteMarshallerResource
-        private GridMarshaller marsh;
+        private IgniteMarshaller marsh;
 
         /**
          * Creates test communication spi.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 8f979a3..cc0483f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -140,7 +140,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
     private static class CommunicationSpi extends GridTcpCommunicationSpi {
         /** */
         @IgniteMarshallerResource
-        private GridMarshaller marsh;
+        private IgniteMarshaller marsh;
 
         /** {@inheritDoc} */
         @Override protected void notifyListener(UUID sndId, GridTcpCommunicationMessageAdapter msg,

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
index af38e80..dde721c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
@@ -464,7 +464,7 @@ public abstract class GridAbstractDiscoverySelfTest<T extends GridSpi> extends G
      */
     private void writeObject(ClusterNode node) throws Exception {
 
-        GridMarshaller marshaller = getTestResources().getMarshaller();
+        IgniteMarshaller marshaller = getTestResources().getMarshaller();
 
         OutputStream out = new NullOutputStream();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
index 42f9dda..ad46c0a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
@@ -58,7 +58,7 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest {
     private void testExternalizable(@Nullable Object t, @Nullable Throwable ex, boolean syncNotify) throws Exception {
         GridKernalContext ctx = ((GridKernal)grid()).context();
 
-        GridMarshaller m = new IgniteOptimizedMarshaller();
+        IgniteMarshaller m = new IgniteOptimizedMarshaller();
         ClassLoader clsLdr = getClass().getClassLoader();
 
         IgniteFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) :

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 d9d1513..9e1660b 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
@@ -996,7 +996,7 @@ public abstract class GridAbstractTest extends TestCase {
      * @return Path for specific marshaller.
      */
     @SuppressWarnings({"IfMayBeConditional", "deprecation"})
-    protected String getDefaultCheckpointPath(GridMarshaller marshaller) {
+    protected String getDefaultCheckpointPath(IgniteMarshaller marshaller) {
         if (marshaller instanceof IgniteJdkMarshaller)
             return GridSharedFsCheckpointSpi.DFLT_DIR_PATH + "/jdk/";
         else
@@ -1167,7 +1167,7 @@ public abstract class GridAbstractTest extends TestCase {
                 // Remove resources cached in static, if any.
                 GridClassLoaderCache.clear();
                 IgniteOptimizedMarshaller.clearCache();
-                GridMarshallerExclusions.clearCache();
+                IgniteMarshallerExclusions.clearCache();
                 GridEnumCache.clear();
             }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 e997486..2b99542 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
@@ -44,7 +44,7 @@ public class GridTestResources {
     private final UUID nodeId;
 
     /** */
-    private GridMarshaller marshaller;
+    private IgniteMarshaller marshaller;
 
     /** */
     private final MBeanServer jmx;
@@ -229,7 +229,7 @@ public class GridTestResources {
      * @throws GridException If failed.
      */
     @SuppressWarnings("unchecked")
-    public synchronized GridMarshaller getMarshaller() throws GridException {
+    public synchronized IgniteMarshaller getMarshaller() throws GridException {
         if (marshaller == null) {
             String marshallerName = GridTestProperties.getProperty("marshaller.class");
 
@@ -237,7 +237,7 @@ public class GridTestResources {
                 marshaller = new IgniteOptimizedMarshaller();
             else {
                 try {
-                    Class<? extends GridMarshaller> cls = (Class<? extends GridMarshaller>)Class.forName(marshallerName);
+                    Class<? extends IgniteMarshaller> cls = (Class<? extends IgniteMarshaller>)Class.forName(marshallerName);
 
                     marshaller = cls.newInstance();
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 ae3a600..a9fa657 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
@@ -134,7 +134,7 @@ public class GridHadoopExternalCommunication {
     private GridHadoopProcessDescriptor locProcDesc;
 
     /** Marshaller. */
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** Message notification executor service. */
     private ExecutorService execSvc;
@@ -223,7 +223,7 @@ public class GridHadoopExternalCommunication {
     public GridHadoopExternalCommunication(
         UUID parentNodeId,
         UUID procId,
-        GridMarshaller marsh,
+        IgniteMarshaller marsh,
         IgniteLogger log,
         ExecutorService execSvc,
         String gridName

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
index 3c0080e..76b29cd 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
@@ -19,12 +19,12 @@ import org.gridgain.grid.util.nio.*;
  */
 public class GridHadoopMarshallerFilter extends GridNioFilterAdapter {
     /** Marshaller. */
-    private GridMarshaller marshaller;
+    private IgniteMarshaller marshaller;
 
     /**
      * @param marshaller Marshaller to use.
      */
-    public GridHadoopMarshallerFilter(GridMarshaller marshaller) {
+    public GridHadoopMarshallerFilter(IgniteMarshaller marshaller) {
         super("GridHadoopMarshallerFilter");
 
         this.marshaller = marshaller;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 1b18ae7..6e2033e 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
@@ -45,7 +45,7 @@ public class GridHadoopExternalCommunicationSelfTest extends GridCommonAbstractT
     private void checkSimpleMessageSending(boolean useShmem) throws Exception {
         UUID parentNodeId = UUID.randomUUID();
 
-        GridMarshaller marsh = new IgniteOptimizedMarshaller();
+        IgniteMarshaller marsh = new IgniteOptimizedMarshaller();
 
         IgniteLogger log = log();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 dd2f2bd..6fede17 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
@@ -181,7 +181,7 @@ public class GridCacheHibernateBlobStore<K, V> extends GridCacheStoreAdapter<K,
 
     /** Marshaller. */
     @IgniteMarshallerResource
-    private GridMarshaller marsh;
+    private IgniteMarshaller marsh;
 
     /** {@inheritDoc} */
     @SuppressWarnings({"unchecked", "RedundantTypeArguments"})

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 411431f..68e8cbe 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
@@ -238,7 +238,7 @@ public class GridH2IndexingSpi extends GridSpiAdapter implements GridIndexingSpi
 
     /** */
     @IgniteMarshallerResource
-    private GridMarshaller gridMarshaller;
+    private IgniteMarshaller igniteMarshaller;
 
     /** */
     private final CountDownLatch ctxInitLatch = new CountDownLatch(1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/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 69e5fed..9ec7f59 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
@@ -552,12 +552,12 @@ public abstract class GridIndexingSpiAbstractSelfTest<X extends GridIndexingSpi>
      */
     private static class IdxMarshaller implements GridIndexingMarshaller {
         /** */
-        private final GridMarshaller marshaller;
+        private final IgniteMarshaller marshaller;
 
         /**
          * @param marshaller Marshaller.
          */
-        private IdxMarshaller(GridMarshaller marshaller) {
+        private IdxMarshaller(IgniteMarshaller marshaller) {
             this.marshaller = marshaller;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
index 0c42fe9..190b632 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
@@ -617,7 +617,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
 
         /** Marshaller. */
         @IgniteMarshallerResource
-        private GridMarshaller marshaller;
+        private IgniteMarshaller marshaller;
 
         /** Executor. */
         @IgniteExecutorServiceResource

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
index b558d4c..f5a1072 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
@@ -27,7 +27,7 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest
     private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Marshaller. */
-    private static final GridMarshaller MARSHALLER = new IgniteOptimizedMarshaller();
+    private static final IgniteMarshaller MARSHALLER = new IgniteOptimizedMarshaller();
 
     /** Attribute key. */
     private static final String ATTR_KEY = "checkAttr";

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
index d1c48c6..c10e88a 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
@@ -439,7 +439,7 @@ public class GridResourceFieldInjectionSelfTest extends GridCommonAbstractTest {
 
         /** */
         @IgniteMarshallerResource
-        private GridMarshaller marshaller;
+        private IgniteMarshaller marshaller;
 
         /** */
         @IgniteSpringApplicationContextResource

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78892777/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
index 9166f28..9c8a56d 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
@@ -219,7 +219,7 @@ public class GridResourceMethodInjectionSelfTest extends GridCommonAbstractTest
         private String locHost;
 
         /** */
-        private GridMarshaller marshaller;
+        private IgniteMarshaller marshaller;
 
         /** */
         private ApplicationContext springCtx;
@@ -331,7 +331,7 @@ public class GridResourceMethodInjectionSelfTest extends GridCommonAbstractTest
          * @param marshaller Marshaller.
          */
         @IgniteMarshallerResource
-        public void setMarshaller(GridMarshaller marshaller) {
+        public void setMarshaller(IgniteMarshaller marshaller) {
             this.marshaller = marshaller;
         }
 


[15/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectInputStream.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectInputStream.java
deleted file mode 100644
index 92ad62c..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectInputStream.java
+++ /dev/null
@@ -1,1008 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.io.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.gridgain.grid.marshaller.optimized.GridOptimizedMarshallerUtils.*;
-
-/**
- * Optimized object input stream.
- */
-class GridOptimizedObjectInputStream extends ObjectInputStream {
-    /** Unsafe. */
-    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-    /** Dummy object for HashSet. */
-    private static final Object DUMMY = new Object();
-
-    /** */
-    private final HandleTable handles = new HandleTable(10);
-
-    /** */
-    private ClassLoader clsLdr;
-
-    /** */
-    private GridDataInput in;
-
-    /** */
-    private Object curObj;
-
-    /** */
-    private List<T2<GridOptimizedFieldType, Long>> curFields;
-
-    /** */
-    private List<IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoList;
-
-    /** */
-    private Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoMap;
-
-    /** */
-    private Class<?> curCls;
-
-    /**
-     * @param in Input.
-     * @throws IOException In case of error.
-     */
-    GridOptimizedObjectInputStream(GridDataInput in) throws IOException {
-        this.in = in;
-    }
-
-    /**
-     * @throws IOException In case of error.
-     */
-    GridOptimizedObjectInputStream() throws IOException {
-        // No-op.
-    }
-
-    /**
-     * @param clsLdr Class loader.
-     */
-    void classLoader(ClassLoader clsLdr) {
-        this.clsLdr = clsLdr;
-    }
-
-    /**
-     * @return Class loader.
-     */
-    ClassLoader classLoader() {
-        return clsLdr;
-    }
-
-    /**
-     * @return Input.
-     */
-    public GridDataInput in() {
-        return in;
-    }
-
-    /**
-     * @param in Input.
-     */
-    public void in(GridDataInput in) {
-        this.in = in;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() throws IOException {
-        reset();
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public void reset() throws IOException {
-        in.reset();
-        handles.clear();
-
-        curObj = null;
-        curFields = null;
-        curFieldInfoList = null;
-        curFieldInfoMap = null;
-    }
-
-    /** {@inheritDoc} */
-    @Override public Object readObjectOverride() throws ClassNotFoundException, IOException {
-        curObj = null;
-        curFields = null;
-        curFieldInfoList = null;
-        curFieldInfoMap = null;
-
-        byte ref = in.readByte();
-
-        switch (ref) {
-            case NULL:
-                return null;
-
-            case HANDLE:
-                return handles.lookup(readInt());
-
-            case OBJECT:
-                GridOptimizedClassDescriptor desc = GridOptimizedClassResolver.readClass(this, clsLdr);
-
-                curCls = desc.describedClass();
-
-                return desc.read(this);
-
-            default:
-                SB msg = new SB("Unexpected error occurred during unmarshalling");
-
-                if (curCls != null)
-                    msg.a(" of an instance of the class: ").a(curCls.getName());
-
-                msg.a(". Check that all nodes are running the same version of GridGain and that all nodes have " +
-                    "GridOptimizedMarshaller configured with identical optimized classes lists, if any " +
-                    "(see setClassNames and setClassNamesPath methods). If your serialized classes implement " +
-                    "java.io.Externalizable interface, verify that serialization logic is correct.");
-
-                throw new IOException(msg.toString());
-        }
-    }
-
-    /**
-     * Reads array from this stream.
-     *
-     * @param compType Array component type.
-     * @return Array.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    <T> T[] readArray(Class<T> compType) throws ClassNotFoundException, IOException {
-        int len = in.readInt();
-
-        T[] arr = (T[])Array.newInstance(compType, len);
-
-        handles.assign(arr);
-
-        for (int i = 0; i < len; i++)
-            arr[i] = (T)readObject();
-
-        return arr;
-    }
-
-    /**
-     * Reads {@link UUID} from this stream.
-     *
-     * @return UUID.
-     * @throws IOException In case of error.
-     */
-    UUID readUuid() throws IOException {
-        UUID uuid = new UUID(readLong(), readLong());
-
-        handles.assign(uuid);
-
-        return uuid;
-    }
-
-    /**
-     * Reads {@link Properties} from this stream.
-     *
-     * @return Properties.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    Properties readProperties() throws ClassNotFoundException, IOException {
-        Properties dflts = readBoolean() ? null : (Properties)readObject();
-
-        Properties props = new Properties(dflts);
-
-        int size = in.readInt();
-
-        for (int i = 0; i < size; i++)
-            props.setProperty(readUTF(), readUTF());
-
-        handles.assign(props);
-
-        return props;
-    }
-
-    /**
-     * Reads and sets all non-static and non-transient field values from this stream.
-     *
-     * @param obj Object.
-     * @param fieldOffs Field offsets.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    void readFields(Object obj, List<T2<GridOptimizedFieldType, Long>> fieldOffs) throws ClassNotFoundException,
-        IOException {
-        for (int i = 0; i < fieldOffs.size(); i++) {
-            T2<GridOptimizedFieldType, Long> t = fieldOffs.get(i);
-
-            switch ((t.get1())) {
-                case BYTE:
-                    setByte(obj, t.get2(), readByte());
-
-                    break;
-
-                case SHORT:
-                    setShort(obj, t.get2(), readShort());
-
-                    break;
-
-                case INT:
-                    setInt(obj, t.get2(), readInt());
-
-                    break;
-
-                case LONG:
-                    setLong(obj, t.get2(), readLong());
-
-                    break;
-
-                case FLOAT:
-                    setFloat(obj, t.get2(), readFloat());
-
-                    break;
-
-                case DOUBLE:
-                    setDouble(obj, t.get2(), readDouble());
-
-                    break;
-
-                case CHAR:
-                    setChar(obj, t.get2(), readChar());
-
-                    break;
-
-                case BOOLEAN:
-                    setBoolean(obj, t.get2(), readBoolean());
-
-                    break;
-
-                case OTHER:
-                    setObject(obj, t.get2(), readObject());
-            }
-        }
-    }
-
-    /**
-     * Reads {@link Externalizable} object.
-     *
-     * @param constructor Constructor.
-     * @param readResolveMtd {@code readResolve} method.
-     * @return Object.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    Object readExternalizable(Constructor<?> constructor, Method readResolveMtd)
-        throws ClassNotFoundException, IOException {
-        Object obj;
-
-        try {
-            obj = constructor.newInstance();
-        }
-        catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
-            throw new IOException(e);
-        }
-
-        int handle = handles.assign(obj);
-
-        Externalizable extObj = ((Externalizable)obj);
-
-        extObj.readExternal(this);
-
-        if (readResolveMtd != null) {
-            try {
-                obj = readResolveMtd.invoke(obj);
-
-                handles.set(handle, obj);
-            }
-            catch (IllegalAccessException | InvocationTargetException e) {
-                throw new IOException(e);
-            }
-        }
-
-        return obj;
-    }
-
-    /**
-     * Reads serializable object.
-     *
-     * @param cls Class.
-     * @param mtds {@code readObject} methods.
-     * @param readResolveMtd {@code readResolve} method.
-     * @param fields class fields details.
-     * @return Object.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    Object readSerializable(Class<?> cls, List<Method> mtds, Method readResolveMtd,
-        GridOptimizedClassDescriptor.Fields fields) throws ClassNotFoundException, IOException {
-        Object obj;
-
-        try {
-            obj = UNSAFE.allocateInstance(cls);
-        }
-        catch (InstantiationException e) {
-            throw new IOException(e);
-        }
-
-        int handle = handles.assign(obj);
-
-        for (int i = 0; i < mtds.size(); i++) {
-            Method mtd = mtds.get(i);
-
-            if (mtd != null) {
-                curObj = obj;
-                curFields = fields.fieldOffs(i);
-                curFieldInfoList = fields.fieldInfoList(i);
-                curFieldInfoMap = fields.fieldInfoMap(i);
-
-                try {
-                    mtd.invoke(obj, this);
-                }
-                catch (IllegalAccessException | InvocationTargetException e) {
-                    throw new IOException(e);
-                }
-            }
-            else
-                readFields(obj, fields.fieldOffs(i));
-        }
-
-        if (readResolveMtd != null) {
-            try {
-                obj = readResolveMtd.invoke(obj);
-
-                handles.set(handle, obj);
-            }
-            catch (IllegalAccessException | InvocationTargetException e) {
-                throw new IOException(e);
-            }
-        }
-
-        return obj;
-    }
-
-    /**
-     * Reads {@link ArrayList}.
-     *
-     * @return List.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    ArrayList<?> readArrayList() throws ClassNotFoundException, IOException {
-        int size = readInt();
-
-        ArrayList<Object> list = new ArrayList<>(size);
-
-        handles.assign(list);
-
-        for (int i = 0; i < size; i++)
-            list.add(readObject());
-
-        return list;
-    }
-
-    /**
-     * Reads {@link HashMap}.
-     *
-     * @param set Whether reading underlying map from {@link HashSet}.
-     * @return Map.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    HashMap<?, ?> readHashMap(boolean set) throws ClassNotFoundException, IOException {
-        int size = readInt();
-        float loadFactor = readFloat();
-
-        HashMap<Object, Object> map = new HashMap<>(size, loadFactor);
-
-        if (!set)
-            handles.assign(map);
-
-        for (int i = 0; i < size; i++) {
-            Object key = readObject();
-            Object val = !set ? readObject() : DUMMY;
-
-            map.put(key, val);
-        }
-
-        return map;
-    }
-
-    /**
-     * Reads {@link HashSet}.
-     *
-     * @param mapFieldOff Map field offset.
-     * @return Set.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    HashSet<?> readHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
-        try {
-            HashSet<Object> set = (HashSet<Object>)UNSAFE.allocateInstance(HashSet.class);
-
-            handles.assign(set);
-
-            setObject(set, mapFieldOff, readHashMap(true));
-
-            return set;
-        }
-        catch (InstantiationException e) {
-            throw new IOException(e);
-        }
-    }
-
-    /**
-     * Reads {@link LinkedList}.
-     *
-     * @return List.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    LinkedList<?> readLinkedList() throws ClassNotFoundException, IOException {
-        int size = readInt();
-
-        LinkedList<Object> list = new LinkedList<>();
-
-        handles.assign(list);
-
-        for (int i = 0; i < size; i++)
-            list.add(readObject());
-
-        return list;
-    }
-
-    /**
-     * Reads {@link LinkedHashMap}.
-     *
-     * @param set Whether reading underlying map from {@link LinkedHashSet}.
-     * @return Map.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    LinkedHashMap<?, ?> readLinkedHashMap(boolean set) throws ClassNotFoundException, IOException {
-        int size = readInt();
-        float loadFactor = readFloat();
-        boolean accessOrder = readBoolean();
-
-        LinkedHashMap<Object, Object> map = new LinkedHashMap<>(size, loadFactor, accessOrder);
-
-        if (!set)
-            handles.assign(map);
-
-        for (int i = 0; i < size; i++) {
-            Object key = readObject();
-            Object val = !set ? readObject() : DUMMY;
-
-            map.put(key, val);
-        }
-
-        return map;
-    }
-
-    /**
-     * Reads {@link LinkedHashSet}.
-     *
-     * @param mapFieldOff Map field offset.
-     * @return Set.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    LinkedHashSet<?> readLinkedHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
-        try {
-            LinkedHashSet<Object> set = (LinkedHashSet<Object>)UNSAFE.allocateInstance(LinkedHashSet.class);
-
-            handles.assign(set);
-
-            setObject(set, mapFieldOff, readLinkedHashMap(true));
-
-            return set;
-        }
-        catch (InstantiationException e) {
-            throw new IOException(e);
-        }
-    }
-
-    /**
-     * Reads {@link Date}.
-     *
-     * @return Date.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    Date readDate() throws ClassNotFoundException, IOException {
-        Date date = new Date(readLong());
-
-        handles.assign(date);
-
-        return date;
-    }
-
-    /**
-     * Reads array of {@code byte}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    byte[] readByteArray() throws IOException {
-        byte[] arr = in.readByteArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code short}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    short[] readShortArray() throws IOException {
-        short[] arr = in.readShortArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code int}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    int[] readIntArray() throws IOException {
-        int[] arr = in.readIntArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code long}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    long[] readLongArray() throws IOException {
-        long[] arr = in.readLongArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code float}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    float[] readFloatArray() throws IOException {
-        float[] arr = in.readFloatArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code double}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    double[] readDoubleArray() throws IOException {
-        double[] arr = in.readDoubleArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code char}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    char[] readCharArray() throws IOException {
-        char[] arr = in.readCharArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads array of {@code boolean}s.
-     *
-     * @return Array.
-     * @throws IOException In case of error.
-     */
-    boolean[] readBooleanArray() throws IOException {
-        boolean[] arr = in.readBooleanArray();
-
-        handles.assign(arr);
-
-        return arr;
-    }
-
-    /**
-     * Reads {@link String}.
-     *
-     * @return String.
-     * @throws IOException In case of error.
-     */
-    public String readString() throws IOException {
-        String str = in.readUTF();
-
-        handles.assign(str);
-
-        return str;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readFully(byte[] b) throws IOException {
-        in.readFully(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readFully(byte[] b, int off, int len) throws IOException {
-        in.readFully(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override public int skipBytes(int n) throws IOException {
-        return in.skipBytes(n);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean readBoolean() throws IOException {
-        return in.readBoolean();
-    }
-
-    /** {@inheritDoc} */
-    @Override public byte readByte() throws IOException {
-        return in.readByte();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int readUnsignedByte() throws IOException {
-        return in.readUnsignedByte();
-    }
-
-    /** {@inheritDoc} */
-    @Override public short readShort() throws IOException {
-        return in.readShort();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int readUnsignedShort() throws IOException {
-        return in.readUnsignedShort();
-    }
-
-    /** {@inheritDoc} */
-    @Override public char readChar() throws IOException {
-        return in.readChar();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int readInt() throws IOException {
-        return in.readInt();
-    }
-
-    /** {@inheritDoc} */
-    @Override public long readLong() throws IOException {
-        return in.readLong();
-    }
-
-    /** {@inheritDoc} */
-    @Override public float readFloat() throws IOException {
-        return in.readFloat();
-    }
-
-    /** {@inheritDoc} */
-    @Override public double readDouble() throws IOException {
-        return in.readDouble();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read() throws IOException {
-        return in.read();
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read(byte[] b) throws IOException {
-        return in.read(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public int read(byte[] b, int off, int len) throws IOException {
-        return in.read(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("deprecation")
-    @Override public String readLine() throws IOException {
-        return in.readLine();
-    }
-
-    /** {@inheritDoc} */
-    @Override public String readUTF() throws IOException {
-        return in.readUTF();
-    }
-
-    /** {@inheritDoc} */
-    @Override public Object readUnshared() throws IOException, ClassNotFoundException {
-        return readObject();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void defaultReadObject() throws IOException, ClassNotFoundException {
-        if (curObj == null)
-            throw new NotActiveException("Not in readObject() call.");
-
-        readFields(curObj, curFields);
-    }
-
-    /** {@inheritDoc} */
-    @Override public ObjectInputStream.GetField readFields() throws IOException, ClassNotFoundException {
-        if (curObj == null)
-            throw new NotActiveException("Not in readObject() call.");
-
-        return new GetFieldImpl(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void registerValidation(ObjectInputValidation obj, int pri) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public int available() throws IOException {
-        return -1;
-    }
-
-    /**
-     * Returns objects that were added to handles table.
-     * Used ONLY for test purposes.
-     *
-     * @return Handled objects.
-     */
-    Object[] handledObjects() {
-        return handles.entries;
-    }
-
-    /**
-     * Lightweight identity hash table which maps objects to integer handles,
-     * assigned in ascending order.
-     */
-    private static class HandleTable {
-        /** Array mapping handle -> object/exception (depending on status). */
-        private Object[] entries;
-
-        /** Number of handles in table. */
-        private int size;
-
-        /**
-         * Creates handle table with the given initial capacity.
-         *
-         * @param initCap Initial capacity.
-         */
-        HandleTable(int initCap) {
-            entries = new Object[initCap];
-        }
-
-        /**
-         * Assigns next available handle to given object, and returns assigned
-         * handle.
-         *
-         * @param obj Object.
-         * @return Handle.
-         */
-        int assign(Object obj) {
-            if (size >= entries.length)
-                grow();
-
-            entries[size] = obj;
-
-            return size++;
-        }
-
-        /**
-         * Assigns new object to existing handle. Old object is forgotten.
-         *
-         * @param handle Handle.
-         * @param obj Object.
-         */
-        void set(int handle, Object obj) {
-            entries[handle] = obj;
-        }
-
-        /**
-         * Looks up and returns object associated with the given handle.
-         *
-         * @param handle Handle.
-         * @return Object.
-         */
-        Object lookup(int handle) {
-            return entries[handle];
-        }
-
-        /**
-         * Resets table to its initial state.
-         */
-        void clear() {
-            Arrays.fill(entries, 0, size, null);
-
-            size = 0;
-        }
-
-        /**
-         * Expands capacity of internal arrays.
-         */
-        private void grow() {
-            int newCap = (entries.length << 1) + 1;
-
-            Object[] newEntries = new Object[newCap];
-
-            System.arraycopy(entries, 0, newEntries, 0, size);
-
-            entries = newEntries;
-        }
-    }
-
-    /**
-     * {@link GetField} implementation.
-     */
-    private static class GetFieldImpl extends GetField {
-        /** Field info map. */
-        private final Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap;
-
-        /** Values. */
-        private final Object[] objs;
-
-        /**
-         * @param in Stream.
-         * @throws IOException In case of error.
-         * @throws ClassNotFoundException If class not found.
-         */
-        @SuppressWarnings("ForLoopReplaceableByForEach")
-        private GetFieldImpl(GridOptimizedObjectInputStream in) throws IOException, ClassNotFoundException {
-            fieldInfoMap = in.curFieldInfoMap;
-
-            List<IgniteBiTuple<Integer, GridOptimizedFieldType>> infos = in.curFieldInfoList;
-
-            objs = new Object[infos.size()];
-
-            for (int i = 0; i < infos.size(); i++) {
-                IgniteBiTuple<Integer, GridOptimizedFieldType> t = infos.get(i);
-
-                Object obj = null;
-
-                switch (t.get2()) {
-                    case BYTE:
-                        obj = in.readByte();
-
-                        break;
-
-                    case SHORT:
-                        obj = in.readShort();
-
-                        break;
-
-                    case INT:
-                        obj = in.readInt();
-
-                        break;
-
-                    case LONG:
-                        obj = in.readLong();
-
-                        break;
-
-                    case FLOAT:
-                        obj = in.readFloat();
-
-                        break;
-
-                    case DOUBLE:
-                        obj = in.readDouble();
-
-                        break;
-
-                    case CHAR:
-                        obj = in.readChar();
-
-                        break;
-
-                    case BOOLEAN:
-                        obj = in.readBoolean();
-
-                        break;
-
-                    case OTHER:
-                        obj = in.readObject();
-                }
-
-                objs[t.get1()] = obj;
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override public ObjectStreamClass getObjectStreamClass() {
-            throw new UnsupportedOperationException();
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean defaulted(String name) throws IOException {
-            return objs[fieldInfoMap.get(name).get1()] == null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean get(String name, boolean dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public byte get(String name, byte dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public char get(String name, char dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public short get(String name, short dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public int get(String name, int dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public long get(String name, long dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public float get(String name, float dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public double get(String name, double dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /** {@inheritDoc} */
-        @Override public Object get(String name, Object dflt) throws IOException {
-            return value(name, dflt);
-        }
-
-        /**
-         * @param name Field name.
-         * @param dflt Default value.
-         * @return Value.
-         */
-        private <T> T value(String name, T dflt) {
-            return objs[fieldInfoMap.get(name).get1()] != null ? (T)objs[fieldInfoMap.get(name).get1()] : dflt;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectOutputStream.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectOutputStream.java
deleted file mode 100644
index 0365699..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectOutputStream.java
+++ /dev/null
@@ -1,831 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.io.*;
-import org.gridgain.grid.util.typedef.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static org.gridgain.grid.marshaller.optimized.GridOptimizedMarshallerUtils.*;
-
-/**
- * Optimized object output stream.
- */
-class GridOptimizedObjectOutputStream extends ObjectOutputStream {
-    /** */
-    private static final Collection<String> CONVERTED_ERR = F.asList(
-        "weblogic/management/ManagementException",
-        "Externalizable class doesn't have default constructor: class " +
-            "org.gridgain.grid.kernal.processors.email.GridEmailProcessor$2"
-    );
-
-    /** */
-    private final GridHandleTable handles = new GridHandleTable(10, 3.00f);
-
-    /** */
-    private boolean requireSer;
-
-    /** */
-    private GridDataOutput out;
-
-    /** */
-    private Object curObj;
-
-    /** */
-    private List<T2<GridOptimizedFieldType, Long>> curFields;
-
-    /** */
-    private Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> curFieldInfoMap;
-
-    /** */
-    private PutFieldImpl curPut;
-
-
-    /**
-     * @throws IOException In case of error.
-     */
-    GridOptimizedObjectOutputStream() throws IOException {
-        // No-op.
-    }
-
-    /**
-     * @param out Output.
-     * @throws IOException In case of error.
-     */
-    GridOptimizedObjectOutputStream(GridDataOutput out) throws IOException {
-        this.out = out;
-    }
-
-    /**
-     * @param requireSer Require {@link Serializable} flag.
-     */
-    void requireSerializable(boolean requireSer) {
-        this.requireSer = requireSer;
-    }
-
-    /**
-     * @return Require {@link Serializable} flag.
-     */
-    boolean requireSerializable() {
-        return requireSer;
-    }
-
-    /**
-     * @param out Output.
-     */
-    public void out(GridDataOutput out) {
-        this.out = out;
-    }
-
-    /**
-     * @return Output.
-     */
-    public GridDataOutput out() {
-        return out;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void close() throws IOException {
-        reset();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(byte[] b) throws IOException {
-        out.write(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(byte[] b, int off, int len) throws IOException {
-        out.write(b, off, len);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void writeObjectOverride(Object obj) throws IOException {
-        try {
-            writeObject0(obj);
-        }
-        catch (IOException e) {
-            Throwable t = e;
-
-            do {
-                if (CONVERTED_ERR.contains(t.getMessage()))
-                    throw new IOException("You are trying to serialize internal classes that are not supposed " +
-                        "to be serialized. Check that all non-serializable fields are transient. Consider using " +
-                        "static inner classes instead of non-static inner classes and anonymous classes.", e);
-            }
-            while ((t = t.getCause()) != null);
-
-            throw e;
-        }
-    }
-
-    /**
-     * Writes object to stream.
-     *
-     * @param obj Object.
-     * @throws IOException In case of error.
-     */
-    private void writeObject0(Object obj) throws IOException {
-        curObj = null;
-        curFields = null;
-        curPut = null;
-        curFieldInfoMap = null;
-
-        if (obj == null)
-            writeByte(NULL);
-        else {
-            Class<?> cls = obj.getClass();
-
-            GridOptimizedClassDescriptor desc = classDescriptor(cls, obj);
-
-            if (desc.excluded()) {
-                writeByte(NULL);
-
-                return;
-            }
-
-            Object obj0 = desc.replace(obj);
-
-            if (obj0 == null) {
-                writeByte(NULL);
-
-                return;
-            }
-
-            int handle = -1;
-
-            if (!desc.isPrimitive() && !desc.isEnum() && !desc.isClass())
-                handle = handles.lookup(obj);
-
-            if (obj0 != obj) {
-                obj = obj0;
-
-                desc = classDescriptor(obj.getClass(), obj);
-            }
-
-            if (handle >= 0) {
-                writeByte(HANDLE);
-                writeInt(handle);
-            }
-            else {
-                writeByte(OBJECT);
-
-                GridOptimizedClassResolver.writeClass(this, desc);
-
-                desc.write(this, obj);
-            }
-        }
-    }
-
-    /**
-     * Writes array to this stream.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    void writeArray(Object[] arr) throws IOException {
-        int len = arr.length;
-
-        writeInt(len);
-
-        for (int i = 0; i < len; i++) {
-            Object obj = arr[i];
-
-            writeObject0(obj);
-        }
-    }
-
-    /**
-     * Writes {@link UUID} to this stream.
-     *
-     * @param uuid UUID.
-     * @throws IOException In case of error.
-     */
-    void writeUuid(UUID uuid) throws IOException {
-        writeLong(uuid.getMostSignificantBits());
-        writeLong(uuid.getLeastSignificantBits());
-    }
-
-    /**
-     * Writes {@link Properties} to this stream.
-     *
-     * @param props Properties.
-     * @param dfltsFieldOff Defaults field offset.
-     * @throws IOException In case of error.
-     */
-    void writeProperties(Properties props, long dfltsFieldOff) throws IOException {
-        Properties dflts = (Properties)getObject(props, dfltsFieldOff);
-
-        if (dflts == null)
-            writeBoolean(true);
-        else {
-            writeBoolean(false);
-
-            writeObject0(dflts);
-        }
-
-        Set<String> names = props.stringPropertyNames();
-
-        writeInt(names.size());
-
-        for (String name : names) {
-            writeUTF(name);
-            writeUTF(props.getProperty(name));
-        }
-    }
-
-    /**
-     * Writes externalizable object.
-     *
-     * @param obj Object.
-     * @throws IOException In case of error.
-     */
-    void writeExternalizable(Object obj) throws IOException {
-        Externalizable extObj = (Externalizable)obj;
-
-        extObj.writeExternal(this);
-    }
-
-    /**
-     * Writes serializable object.
-     *
-     * @param obj Object.
-     * @param mtds {@code writeObject} methods.
-     * @param fields class fields details.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    void writeSerializable(Object obj, List<Method> mtds, GridOptimizedClassDescriptor.Fields fields)
-        throws IOException {
-        for (int i = 0; i < mtds.size(); i++) {
-            Method mtd = mtds.get(i);
-
-            if (mtd != null) {
-                curObj = obj;
-                curFields = fields.fieldOffs(i);
-                curFieldInfoMap = fields.fieldInfoMap(i);
-
-                try {
-                    mtd.invoke(obj, this);
-                }
-                catch (IllegalAccessException e) {
-                    throw new IOException(e);
-                }
-                catch (InvocationTargetException e) {
-                    throw new IOException(e.getCause());
-                }
-            }
-            else
-                writeFields(obj, fields.fieldOffs(i));
-        }
-    }
-
-    /**
-     * Writes {@link ArrayList}.
-     *
-     * @param list List.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings({"ForLoopReplaceableByForEach", "TypeMayBeWeakened"})
-    void writeArrayList(ArrayList<?> list) throws IOException {
-        int size = list.size();
-
-        writeInt(size);
-
-        for (int i = 0; i < size; i++)
-            writeObject0(list.get(i));
-    }
-
-    /**
-     * Writes {@link HashMap}.
-     *
-     * @param map Map.
-     * @param loadFactorFieldOff Load factor field offset.
-     * @param set Whether writing underlying map from {@link HashSet}.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    void writeHashMap(HashMap<?, ?> map, long loadFactorFieldOff, boolean set) throws IOException {
-        int size = map.size();
-
-        writeInt(size);
-        writeFloat(getFloat(map, loadFactorFieldOff));
-
-        for (Map.Entry<?, ?> e : map.entrySet()) {
-            writeObject0(e.getKey());
-
-            if (!set)
-                writeObject0(e.getValue());
-        }
-    }
-
-    /**
-     * Writes {@link HashSet}.
-     *
-     * @param set Set.
-     * @param mapFieldOff Map field offset.
-     * @param loadFactorFieldOff Load factor field offset.
-     * @throws IOException In case of error.
-     */
-    void writeHashSet(HashSet<?> set, long mapFieldOff, long loadFactorFieldOff) throws IOException {
-        writeHashMap((HashMap<?, ?>)getObject(set, mapFieldOff), loadFactorFieldOff, true);
-    }
-
-    /**
-     * Writes {@link LinkedList}.
-     *
-     * @param list List.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    void writeLinkedList(LinkedList<?> list) throws IOException {
-        int size = list.size();
-
-        writeInt(size);
-
-        for (Object obj : list)
-            writeObject0(obj);
-    }
-
-    /**
-     * Writes {@link LinkedHashMap}.
-     *
-     * @param map Map.
-     * @param loadFactorFieldOff Load factor field offset.
-     * @param accessOrderFieldOff access order field offset.
-     * @param set Whether writing underlying map from {@link LinkedHashSet}.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    void writeLinkedHashMap(LinkedHashMap<?, ?> map, long loadFactorFieldOff, long accessOrderFieldOff, boolean set)
-        throws IOException {
-        int size = map.size();
-
-        writeInt(size);
-        writeFloat(getFloat(map, loadFactorFieldOff));
-
-        if (accessOrderFieldOff >= 0)
-            writeBoolean(getBoolean(map, accessOrderFieldOff));
-        else
-            writeBoolean(false);
-
-        for (Map.Entry<?, ?> e : map.entrySet()) {
-            writeObject0(e.getKey());
-
-            if (!set)
-                writeObject0(e.getValue());
-        }
-    }
-
-    /**
-     * Writes {@link LinkedHashSet}.
-     *
-     * @param set Set.
-     * @param mapFieldOff Map field offset.
-     * @param loadFactorFieldOff Load factor field offset.
-     * @throws IOException In case of error.
-     */
-    void writeLinkedHashSet(LinkedHashSet<?> set, long mapFieldOff, long loadFactorFieldOff) throws IOException {
-        LinkedHashMap<?, ?> map = (LinkedHashMap<?, ?>)getObject(set, mapFieldOff);
-
-        writeLinkedHashMap(map, loadFactorFieldOff, -1, true);
-    }
-
-    /**
-     * Writes {@link Date}.
-     *
-     * @param date Date.
-     * @throws IOException In case of error.
-     */
-    void writeDate(Date date) throws IOException {
-        writeLong(date.getTime());
-    }
-
-    /**
-     * Writes all non-static and non-transient field values to this stream.
-     *
-     * @param obj Object.
-     * @param fieldOffs Field offsets.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    private void writeFields(Object obj, List<T2<GridOptimizedFieldType, Long>> fieldOffs) throws IOException {
-        for (int i = 0; i < fieldOffs.size(); i++) {
-            T2<GridOptimizedFieldType, Long> t = fieldOffs.get(i);
-
-            switch (t.get1()) {
-                case BYTE:
-                    writeByte(getByte(obj, t.get2()));
-
-                    break;
-
-                case SHORT:
-                    writeShort(getShort(obj, t.get2()));
-
-                    break;
-
-                case INT:
-                    writeInt(getInt(obj, t.get2()));
-
-                    break;
-
-                case LONG:
-                    writeLong(getLong(obj, t.get2()));
-
-                    break;
-
-                case FLOAT:
-                    writeFloat(getFloat(obj, t.get2()));
-
-                    break;
-
-                case DOUBLE:
-                    writeDouble(getDouble(obj, t.get2()));
-
-                    break;
-
-                case CHAR:
-                    writeChar(getChar(obj, t.get2()));
-
-                    break;
-
-                case BOOLEAN:
-                    writeBoolean(getBoolean(obj, t.get2()));
-
-                    break;
-
-                case OTHER:
-                    writeObject0(getObject(obj, t.get2()));
-            }
-        }
-    }
-
-    /**
-     * Writes array of {@code byte}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeByteArray(byte[] arr) throws IOException {
-        out.writeByteArray(arr);
-    }
-
-    /**
-     * Writes array of {@code short}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeShortArray(short[] arr) throws IOException {
-        out.writeShortArray(arr);
-    }
-
-    /**
-     * Writes array of {@code int}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeIntArray(int[] arr) throws IOException {
-        out.writeIntArray(arr);
-    }
-
-    /**
-     * Writes array of {@code long}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeLongArray(long[] arr) throws IOException {
-        out.writeLongArray(arr);
-    }
-
-    /**
-     * Writes array of {@code float}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeFloatArray(float[] arr) throws IOException {
-        out.writeFloatArray(arr);
-    }
-
-    /**
-     * Writes array of {@code double}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeDoubleArray(double[] arr) throws IOException {
-        out.writeDoubleArray(arr);
-    }
-
-    /**
-     * Writes array of {@code char}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeCharArray(char[] arr) throws IOException {
-        out.writeCharArray(arr);
-    }
-
-    /**
-     * Writes array of {@code boolean}s.
-     *
-     * @param arr Array.
-     * @throws IOException In case of error.
-     */
-    void writeBooleanArray(boolean[] arr) throws IOException {
-        out.writeBooleanArray(arr);
-    }
-
-    /**
-     * Writes {@link String}.
-     *
-     * @param str String.
-     * @throws IOException In case of error.
-     */
-    void writeString(String str) throws IOException {
-        out.writeUTF(str);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeBoolean(boolean v) throws IOException {
-        out.writeBoolean(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeByte(int v) throws IOException {
-        out.writeByte(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeShort(int v) throws IOException {
-        out.writeShort(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeChar(int v) throws IOException {
-        out.writeChar(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeInt(int v) throws IOException {
-        out.writeInt(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeLong(long v) throws IOException {
-        out.writeLong(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeFloat(float v) throws IOException {
-        out.writeFloat(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeDouble(double v) throws IOException {
-        out.writeDouble(v);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void write(int b) throws IOException {
-        writeByte(b);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeBytes(String s) throws IOException {
-        out.writeBytes(s);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeChars(String s) throws IOException {
-        out.writeChars(s);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeUTF(String s) throws IOException {
-        out.writeUTF(s);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void useProtocolVersion(int ver) throws IOException {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeUnshared(Object obj) throws IOException {
-        writeObject0(obj);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void defaultWriteObject() throws IOException {
-        if (curObj == null)
-            throw new NotActiveException("Not in writeObject() call.");
-
-        writeFields(curObj, curFields);
-    }
-
-    /** {@inheritDoc} */
-    @Override public ObjectOutputStream.PutField putFields() throws IOException {
-        if (curObj == null)
-            throw new NotActiveException("Not in writeObject() call or fields already written.");
-
-        if (curPut == null)
-            curPut = new PutFieldImpl(this);
-
-        return curPut;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeFields() throws IOException {
-        if (curObj == null)
-            throw new NotActiveException("Not in writeObject() call.");
-
-        if (curPut == null)
-            throw new NotActiveException("putFields() was not called.");
-
-        for (IgniteBiTuple<GridOptimizedFieldType, Object> t : curPut.objs) {
-            switch (t.get1()) {
-                case BYTE:
-                    writeByte((Byte)t.get2());
-
-                    break;
-
-                case SHORT:
-                    writeShort((Short)t.get2());
-
-                    break;
-
-                case INT:
-                    writeInt((Integer)t.get2());
-
-                    break;
-
-                case LONG:
-                    writeLong((Long)t.get2());
-
-                    break;
-
-                case FLOAT:
-                    writeFloat((Float)t.get2());
-
-                    break;
-
-                case DOUBLE:
-                    writeDouble((Double)t.get2());
-
-                    break;
-
-                case CHAR:
-                    writeChar((Character)t.get2());
-
-                    break;
-
-                case BOOLEAN:
-                    writeBoolean((Boolean)t.get2());
-
-                    break;
-
-                case OTHER:
-                    writeObject0(t.get2());
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void reset() throws IOException {
-        out.reset();
-        handles.clear();
-
-        curObj = null;
-        curFields = null;
-        curPut = null;
-        curFieldInfoMap = null;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void flush() throws IOException {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void drain() throws IOException {
-        // No-op.
-    }
-
-    /**
-     * Returns objects that were added to handles table.
-     * Used ONLY for test purposes.
-     *
-     * @return Handled objects.
-     */
-    Object[] handledObjects() {
-        return handles.objects();
-    }
-
-    /**
-     * {@link PutField} implementation.
-     */
-    private static class PutFieldImpl extends PutField {
-        /** Stream. */
-        private final GridOptimizedObjectOutputStream out;
-
-        /** Field info map. */
-        private final Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap;
-
-        /** Values. */
-        private final IgniteBiTuple<GridOptimizedFieldType, Object>[] objs;
-
-        /**
-         * @param out Output stream.
-         * @throws IOException In case of error.
-         */
-        @SuppressWarnings("unchecked")
-        private PutFieldImpl(GridOptimizedObjectOutputStream out) {
-            this.out = out;
-
-            fieldInfoMap = out.curFieldInfoMap;
-
-            objs = new IgniteBiTuple[fieldInfoMap.size()];
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, boolean val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, byte val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, char val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, short val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, int val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, long val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, float val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, double val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void put(String name, Object val) {
-            value(name, val);
-        }
-
-        /** {@inheritDoc} */
-        @Override public void write(ObjectOutput out) throws IOException {
-            if (out != this.out)
-                throw new IllegalArgumentException("Wrong stream.");
-
-            this.out.writeFields();
-        }
-
-        /**
-         * @param name Field name.
-         * @param val Value.
-         */
-        private void value(String name, Object val) {
-            IgniteBiTuple<Integer, GridOptimizedFieldType> info = fieldInfoMap.get(name);
-
-            objs[info.get1()] = F.t(info.get2(), val);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamRegistry.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
deleted file mode 100644
index c95e1d8..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamRegistry.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.marshaller.optimized;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.grid.util.io.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-
-/**
- * Storage for object streams.
- */
-class GridOptimizedObjectStreamRegistry {
-    /** Holders. */
-    private static final ThreadLocal<StreamHolder> holders = new ThreadLocal<>();
-
-    /** Holders pool. */
-    private static BlockingQueue<StreamHolder> pool;
-
-    /**
-     * Ensures singleton.
-     */
-    private GridOptimizedObjectStreamRegistry() {
-        // No-op.
-    }
-
-    /**
-     * Sets streams pool size.
-     *
-     * @param size Streams pool size.
-     */
-    static void poolSize(int size) {
-        if (size > 0) {
-            pool = new LinkedBlockingQueue<>(size);
-
-            for (int i = 0; i < size; i++) {
-                boolean b = pool.offer(new StreamHolder());
-
-                assert b;
-            }
-        }
-        else
-            pool = null;
-    }
-
-    /**
-     * Gets output stream.
-     *
-     * @return Object output stream.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
-     */
-    static GridOptimizedObjectOutputStream out() throws GridInterruptedException {
-        return holder().acquireOut();
-    }
-
-    /**
-     * Gets input stream.
-     *
-     * @return Object input stream.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
-     */
-    static GridOptimizedObjectInputStream in() throws GridInterruptedException {
-        return holder().acquireIn();
-    }
-
-    /**
-     * Closes and releases output stream.
-     *
-     * @param out Object output stream.
-     */
-    static void closeOut(GridOptimizedObjectOutputStream out) {
-        U.close(out, null);
-
-        StreamHolder holder = holders.get();
-
-        holder.releaseOut();
-
-        if (pool != null) {
-            holders.remove();
-
-            boolean b = pool.offer(holder);
-
-            assert b;
-        }
-    }
-
-    /**
-     * Closes and releases input stream.
-     *
-     * @param in Object input stream.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    static void closeIn(GridOptimizedObjectInputStream in) {
-        U.close(in, null);
-
-        StreamHolder holder = holders.get();
-
-        holder.releaseIn();
-
-        if (pool != null) {
-            holders.remove();
-
-            boolean b = pool.offer(holder);
-
-            assert b;
-        }
-    }
-
-    /**
-     * Gets holder from pool or thread local.
-     *
-     * @return Stream holder.
-     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
-     */
-    private static StreamHolder holder() throws GridInterruptedException {
-        StreamHolder holder = holders.get();
-
-        if (holder == null) {
-            try {
-                holders.set(holder = pool != null ? pool.take() : new StreamHolder());
-            }
-            catch (InterruptedException e) {
-                throw new GridInterruptedException("Failed to take object stream from pool (thread interrupted).", e);
-            }
-        }
-
-        return holder;
-    }
-
-    /**
-     * Streams holder.
-     */
-    private static class StreamHolder {
-        /** Output stream. */
-        private final GridOptimizedObjectOutputStream out = createOut();
-
-        /** Input stream. */
-        private final GridOptimizedObjectInputStream in = createIn();
-
-        /** Output streams counter. */
-        private int outAcquireCnt;
-
-        /** Input streams counter. */
-        private int inAcquireCnt;
-
-        /**
-         * Gets output stream.
-         *
-         * @return Object output stream.
-         */
-        GridOptimizedObjectOutputStream acquireOut() {
-            return outAcquireCnt++ > 0 ? createOut() : out;
-        }
-
-        /**
-         * Gets input stream.
-         *
-         * @return Object input stream.
-         */
-        GridOptimizedObjectInputStream acquireIn() {
-            return inAcquireCnt++ > 0 ? createIn() : in;
-        }
-
-        /**
-         * Releases output stream.
-         */
-        void releaseOut() {
-            outAcquireCnt--;
-        }
-
-        /**
-         * Releases input stream.
-         */
-        void releaseIn() {
-            inAcquireCnt--;
-        }
-
-        /**
-         * Creates output stream.
-         *
-         * @return Object output stream.
-         */
-        private GridOptimizedObjectOutputStream createOut() {
-            try {
-                return new GridOptimizedObjectOutputStream(new GridUnsafeDataOutput(4 * 1024));
-            }
-            catch (IOException e) {
-                throw new GridRuntimeException("Failed to create object output stream.", e);
-            }
-        }
-
-        /**
-         * Creates input stream.
-         *
-         * @return Object input stream.
-         */
-        private GridOptimizedObjectInputStream createIn() {
-            try {
-                return new GridOptimizedObjectInputStream(new GridUnsafeDataInput());
-            }
-            catch (IOException e) {
-                throw new GridRuntimeException("Failed to create object input stream.", e);
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml
index ab01c16..0ae4a11 100644
--- a/modules/core/src/test/config/example-cache.xml
+++ b/modules/core/src/test/config/example-cache.xml
@@ -38,7 +38,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/ggfs-loopback.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml
index a029536..d7f2480 100644
--- a/modules/core/src/test/config/ggfs-loopback.xml
+++ b/modules/core/src/test/config/ggfs-loopback.xml
@@ -58,7 +58,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/ggfs-no-endpoint.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml
index 7d82733..5b4b861 100644
--- a/modules/core/src/test/config/ggfs-no-endpoint.xml
+++ b/modules/core/src/test/config/ggfs-no-endpoint.xml
@@ -59,7 +59,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/ggfs-shmem.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml
index 97f1a66..3602b4f 100644
--- a/modules/core/src/test/config/ggfs-shmem.xml
+++ b/modules/core/src/test/config/ggfs-shmem.xml
@@ -58,7 +58,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/io-manager-benchmark.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/io-manager-benchmark.xml b/modules/core/src/test/config/io-manager-benchmark.xml
index 6f0d589..87223bf 100644
--- a/modules/core/src/test/config/io-manager-benchmark.xml
+++ b/modules/core/src/test/config/io-manager-benchmark.xml
@@ -28,7 +28,7 @@
         </property>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <property name="requireSerializable" value="true"/>
 
                 <property name="classNames">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/jobs-load-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/jobs-load-base.xml b/modules/core/src/test/config/jobs-load-base.xml
index 88619dc..870b0e6 100644
--- a/modules/core/src/test/config/jobs-load-base.xml
+++ b/modules/core/src/test/config/jobs-load-base.xml
@@ -13,7 +13,7 @@
         <property name="localHost" value="127.0.0.1"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <property name="classNames">
                     <list>
                         <value>org.gridgain.loadtests.job.GridJobExecutionLoadTestJob</value>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/load/dsi-load-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml
index bd21c02..5cf4c20 100644
--- a/modules/core/src/test/config/load/dsi-load-base.xml
+++ b/modules/core/src/test/config/load/dsi-load-base.xml
@@ -27,7 +27,7 @@
         <property name="localHost" value="127.0.0.1"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <property name="classNames">
                     <list>
                         <value>org.gridgain.loadtests.dsi.GridDsiSession</value>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/spring-start-nodes-attr.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-start-nodes-attr.xml b/modules/core/src/test/config/spring-start-nodes-attr.xml
index f294c4b..d02d6f8 100644
--- a/modules/core/src/test/config/spring-start-nodes-attr.xml
+++ b/modules/core/src/test/config/spring-start-nodes-attr.xml
@@ -31,7 +31,7 @@
         <property name="restEnabled" value="false"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <property name="requireSerializable" value="false"/>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/config/spring-start-nodes.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-start-nodes.xml b/modules/core/src/test/config/spring-start-nodes.xml
index 3151098..ed9377c 100644
--- a/modules/core/src/test/config/spring-start-nodes.xml
+++ b/modules/core/src/test/config/spring-start-nodes.xml
@@ -25,7 +25,7 @@
         <property name="restEnabled" value="false"/>
 
         <property name="marshaller">
-            <bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
                 <property name="requireSerializable" value="false"/>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
index 2a52ec4..cc94418 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
@@ -11,7 +11,7 @@ package org.gridgain.grid;
 
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.jdk.*;
-import org.gridgain.grid.marshaller.optimized.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.testframework.junits.common.*;
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
index 2383d61..3c3ac4e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.ggfs;
 
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
index b831457..b45bb03 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
@@ -5,9 +5,9 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.failover.*;
 import org.gridgain.grid.spi.failover.always.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index 4d14c0e..412dc6e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -15,12 +15,12 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.managers.communication.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.communication.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
index b30a1ab..46b8f5f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
@@ -14,9 +14,9 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.collision.jobstealing.*;
 import org.gridgain.grid.spi.failover.jobstealing.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index 2452120..8e0c7e4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -12,9 +12,9 @@ package org.gridgain.grid.kernal;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.logger.java.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.client.ssl.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.segmentation.*;
 import org.gridgain.testframework.junits.common.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index ea3fa3b..0018cfc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.kernal;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
index 144bd9b..9912065 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
@@ -13,9 +13,9 @@ import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
index 391e6cf..96ced99 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.managers;
 
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.checkpoint.*;
@@ -21,7 +22,6 @@ import org.gridgain.grid.kernal.managers.failover.*;
 import org.gridgain.grid.kernal.managers.loadbalancer.*;
 import org.gridgain.grid.kernal.managers.swapspace.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.sharedfs.*;
 import org.gridgain.grid.spi.collision.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
index 1d07cc5..bb835c9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
@@ -11,11 +11,11 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.store.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/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 c6a8a80..bcd5f55 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
@@ -14,11 +14,11 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
index e9c3a5a..ac236d9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -12,10 +12,10 @@ package org.gridgain.grid.kernal.processors.cache;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index 490fbe6..6b52ee4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -11,11 +11,11 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java
index 2fdc5dc..c812c64 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java
@@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.eviction.lru.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
index 937798e..7ec0aed 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
@@ -13,9 +13,9 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
index 20631d6..50bb236 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
@@ -12,8 +12,8 @@ package org.gridgain.grid.kernal.processors.cache;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
index 67a81f9..2b3b073 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
@@ -12,10 +12,10 @@ package org.gridgain.grid.kernal.processors.cache.distributed;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
index e9c53a5..57567c3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.cache.distributed;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index 43281fb..6201ca8 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.optimized.*;
 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/a50fccdd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index c0575cd..b83d848 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.cache.query;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.spi.discovery.tcp.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;


[22/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3edf39ef/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/package.html b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/package.html
new file mode 100644
index 0000000..6d7a3b5
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains <b>default</b> Optimized marshaller.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3edf39ef/modules/core/src/main/java/org/gridgain/grid/cache/datastructures/GridCacheAtomicReference.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/datastructures/GridCacheAtomicReference.java b/modules/core/src/main/java/org/gridgain/grid/cache/datastructures/GridCacheAtomicReference.java
index f87cc59..de33480 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/datastructures/GridCacheAtomicReference.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/datastructures/GridCacheAtomicReference.java
@@ -10,7 +10,6 @@
 package org.gridgain.grid.cache.datastructures;
 
 import org.gridgain.grid.*;
-import org.gridgain.grid.lang.*;
 
 /**
  * This interface provides a rich API for working with distributed atomic reference.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3edf39ef/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java
index f9fa2eb..1f16ed6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/eviction/GridCacheEvictionFilter.java
@@ -10,7 +10,6 @@
 package org.gridgain.grid.cache.eviction;
 
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.lang.*;
 
 /**
  * Eviction filter to specify which entries should not be evicted. Not applicable when


[47/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 07f7212b401f83f42426526f6139a5c926b374d0
Parents: 779ddfa
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:43:11 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:43:11 2014 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/Ignite.java |   4 +-
 .../org/apache/ignite/cluster/ClusterNode.java  |   2 +-
 .../org/apache/ignite/product/GridProduct.java  |  58 ----
 .../ignite/product/GridProductLicense.java      | 175 ------------
 .../product/GridProductLicenseException.java    |  62 ----
 .../ignite/product/GridProductVersion.java      | 283 -------------------
 .../apache/ignite/product/IgniteProduct.java    |  58 ++++
 .../ignite/product/IgniteProductLicense.java    | 175 ++++++++++++
 .../product/IgniteProductLicenseException.java  |  62 ++++
 .../ignite/product/IgniteProductVersion.java    | 283 +++++++++++++++++++
 .../org/gridgain/grid/kernal/GridKernal.java    |   8 +-
 .../gridgain/grid/kernal/GridKernalContext.java |   2 +-
 .../grid/kernal/GridKernalContextImpl.java      |   6 +-
 .../gridgain/grid/kernal/GridProductImpl.java   |  14 +-
 .../grid/kernal/GridUpdateNotifier.java         |   2 +-
 .../discovery/GridDiscoveryManager.java         |  18 +-
 .../dataload/IgniteDataLoaderImpl.java          |   2 +-
 .../kernal/processors/job/GridJobProcessor.java |   2 +-
 .../license/GridLicenseProcessor.java           |  10 +-
 .../license/os/GridOsLicenseProcessor.java      |   6 +-
 .../tcp/GridTcpCommunicationSpi.java            |   8 +-
 .../grid/spi/discovery/GridDiscoverySpi.java    |   2 +-
 .../tcp/GridTcpDiscoverySpiAdapter.java         |   4 +-
 .../tcp/internal/GridTcpDiscoveryNode.java      |  10 +-
 .../java/org/gridgain/grid/util/GridUtils.java  |   4 +-
 .../grid/kernal/GridDiscoverySelfTest.java      |   4 +-
 .../grid/kernal/GridReleaseTypeSelfTest.java    |   2 +-
 .../GridTopologyBuildVersionSelfTest.java       |  12 +-
 .../grid/kernal/GridVersionSelfTest.java        |   2 +-
 ...unctionExcludeNeighborsAbstractSelfTest.java |   2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |   2 +-
 .../grid/p2p/GridP2PClassLoadingSelfTest.java   |   4 +-
 .../product/GridProductVersionSelfTest.java     |  20 +-
 .../GridAbstractDiscoverySelfTest.java          |   2 +-
 .../gridgain/testframework/GridTestNode.java    |   6 +-
 .../junits/spi/GridSpiAbstractTest.java         |   4 +-
 .../java/org/gridgain/grid/GridSpringBean.java  |   2 +-
 37 files changed, 661 insertions(+), 661 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index f0e4fa4..f509214 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -44,7 +44,7 @@ import java.util.concurrent.*;
  * <li>{@link IgniteFs} - functionality for distributed Hadoop-compliant in-memory file system and map-reduce.</li>
  * <li>{@link IgniteStreamer} - functionality for streaming events workflow with queries and indexes into rolling windows.</li>
  * <li>{@link IgniteScheduler} - functionality for scheduling jobs using UNIX Cron syntax.</li>
- * <li>{@link org.apache.ignite.product.GridProduct} - functionality for licence management and update and product related information.</li>
+ * <li>{@link org.apache.ignite.product.IgniteProduct} - functionality for licence management and update and product related information.</li>
  * <li>{@link IgniteCompute} - functionality for executing tasks and closures on all grid nodes (inherited form {@link org.apache.ignite.cluster.ClusterGroup}).</li>
  * <li>{@link IgniteMessaging} - functionality for topic-based message exchange on all grid nodes (inherited form {@link org.apache.ignite.cluster.ClusterGroup}).</li>
  * <li>{@link IgniteEvents} - functionality for querying and listening to events on all grid nodes  (inherited form {@link org.apache.ignite.cluster.ClusterGroup}).</li>
@@ -176,7 +176,7 @@ public interface Ignite extends AutoCloseable {
      *
      * @return Instance of product.
      */
-    public GridProduct product();
+    public IgniteProduct product();
 
     /**
      * Gets an instance of cron-based scheduler.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index 9ec1962..6263326 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -215,7 +215,7 @@ public interface ClusterNode extends GridMetadataAware {
      *
      * @return Node version.
      */
-    public GridProductVersion version();
+    public IgniteProductVersion version();
 
     /**
      * Tests whether or not this node is a local node.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/product/GridProduct.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/GridProduct.java b/modules/core/src/main/java/org/apache/ignite/product/GridProduct.java
deleted file mode 100644
index 51aac73..0000000
--- a/modules/core/src/main/java/org/apache/ignite/product/GridProduct.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.product;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Provides information about current release. Note that enterprise users are also
- * able to renew license. Instance of {@code GridProduct} is obtained from grid as follows:
- * <pre name="code" class="java">
- * GridProduct p = GridGain.grid().product();
- * </pre>
- */
-public interface GridProduct {
-    /**
-     * Gets license descriptor for enterprise edition or {@code null} for open source edition.
-     *
-     * @return License descriptor.
-     */
-    @Nullable public GridProductLicense license();
-
-    /**
-     * Updates to a new license in enterprise edition. This method is no-op in open source edition.
-     *
-     * @param lic The content of the license.
-     * @throws GridProductLicenseException If license could not be updated.
-     */
-    public void updateLicense(String lic) throws GridProductLicenseException;
-
-    /**
-     * Gets product version for this release.
-     *
-     * @return Product version for this release.
-     */
-    public GridProductVersion version();
-
-    /**
-     * Copyright statement for GridGain code.
-     *
-     * @return Legal copyright statement for GridGain code.
-     */
-    public String copyright();
-
-    /**
-     * Gets latest version available for download or
-     * {@code null} if information is not available.
-     *
-     * @return Latest version string or {@code null} if information is not available.
-     */
-    @Nullable public String latestVersion();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/product/GridProductLicense.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/GridProductLicense.java b/modules/core/src/main/java/org/apache/ignite/product/GridProductLicense.java
deleted file mode 100644
index a505a54..0000000
--- a/modules/core/src/main/java/org/apache/ignite/product/GridProductLicense.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.product;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * GridGain license descriptor. GridGain license is available for
- * information purposes and is checked automatically by GridGain software.
- * License descriptor can be obtains by calling {@link GridProduct#license()} method.
- * @see GridProduct#license()
- */
-public interface GridProductLicense extends Serializable {
-    /**
-     * Gets a comma separated list of disabled subsystems.
-     *
-     * @return Comma separated list of disabled subsystems or {@code null}.
-     */
-    public String disabledSubsystems();
-
-    /**
-     * Gets license version.
-     *
-     * @return License version.
-     */
-    public String version();
-
-    /**
-     * Gets license ID.
-     *
-     * @return License ID.
-     */
-    public UUID id();
-
-    /**
-     * Version regular expression.
-     *
-     * @return Version regular expression.
-     */
-    public String versionRegexp();
-
-    /**
-     * Gets issue date.
-     *
-     * @return Issue date.
-     */
-    public Date issueDate();
-
-    /**
-     * Gets maintenance time in months. If zero - no restriction.
-     *
-     * @return Maintenance time.
-     */
-    public int maintenanceTime();
-
-    /**
-     * Gets issue organization.
-     *
-     * @return Issue organization.
-     */
-    public String issueOrganization();
-
-    /**
-     * Gets user organization.
-     *
-     * @return User organization.
-     */
-    public String userOrganization();
-
-    /**
-     * Gets license note. It may include textual description of license limitations such
-     * as as "Development Only" or "Load-Testing and Staging Only".
-     *
-     * @return License note.
-     */
-    public String licenseNote();
-
-    /**
-     * Gets user organization URL.
-     *
-     * @return User organization URL.
-     */
-    public String userWww();
-
-    /**
-     * Gets user organization e-mail.
-     *
-     * @return User organization e-mail.
-     */
-    public String userEmail();
-
-    /**
-     * Gets user organization contact name.
-     *
-     * @return User organization contact name.
-     */
-    public String userName();
-
-    /**
-     * Gets expire date.
-     *
-     * @return Expire date.
-     */
-    public Date expireDate();
-
-    /**
-     * Gets maximum number of nodes. If zero - no restriction.
-     *
-     * @return Maximum number of nodes.
-     */
-    public int maxNodes();
-
-    /**
-     * Gets maximum number of physical computers or virtual instances. If zero - no restriction.
-     * Note that individual physical computer or virtual instance is determined by number of enabled
-     * MACs on each computer or instance.
-     *
-     * @return Maximum number of computers or virtual instances.
-     */
-    public int maxComputers();
-
-    /**
-     * Gets maximum number of CPUs. If zero - no restriction.
-     *
-     * @return Maximum number of CPUs.
-     */
-    public int maxCpus();
-
-    /**
-     * Gets maximum up time in minutes. If zero - no restriction.
-     *
-     * @return Maximum up time in minutes.
-     */
-    public long maxUpTime();
-
-    /**
-     * Gets license violation grace period in minutes. If zero - no grace period.
-     *
-     * @return License violation grace period in minutes.
-     */
-    public long gracePeriod();
-
-    /**
-     * Gets license attribute name if any. Attributes in license will have to match
-     * attributes in the grid node.
-     *
-     * @return Attribute name.
-     */
-    @Nullable public String attributeName();
-
-    /**
-     * Gets value for the license attribute if any. Attributes in license will have to match
-     * attributes in the grid node.
-     *
-     * @return Attribute value.
-     */
-    @Nullable public String attributeValue();
-
-    /**
-     * Gets a comma separated list of allowed cache distribution modes.
-     *
-     * @return Allowed cache distribution modes or {@code null}.
-     */
-    @Nullable public String getCacheDistributionModes();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/product/GridProductLicenseException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/GridProductLicenseException.java b/modules/core/src/main/java/org/apache/ignite/product/GridProductLicenseException.java
deleted file mode 100644
index 887106e..0000000
--- a/modules/core/src/main/java/org/apache/ignite/product/GridProductLicenseException.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.product;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This exception is thrown when license violation is detected.
- */
-public class GridProductLicenseException extends GridException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Short message. */
-    private final String shortMsg;
-
-    /**
-     * Creates new license exception with given error message.
-     *
-     * @param msg Error message.
-     * @param shortMsg Short error message presentable to the user. Note it should contain just letter and dot.
-     */
-    public GridProductLicenseException(String msg, @Nullable String shortMsg) {
-        super(msg);
-
-        this.shortMsg = shortMsg;
-    }
-
-    /**
-     * Creates new license exception with given error message and optional nested exception.
-     *
-     * @param msg Error message.
-     * @param shortMsg Short error message presentable to the user. Note it should contain just letter and dot.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public GridProductLicenseException(String msg, @Nullable String shortMsg, @Nullable Throwable cause) {
-        super(msg, cause);
-
-        this.shortMsg = shortMsg;
-    }
-
-    /**
-     * @return shortMessage Short error message presentable to the user. Note it should contain just letter and dot.
-     */
-    public final String shortMessage() {
-        return shortMsg;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridProductLicenseException.class, this, "msg", getMessage(), "shortMsg", shortMsg);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/product/GridProductVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/GridProductVersion.java b/modules/core/src/main/java/org/apache/ignite/product/GridProductVersion.java
deleted file mode 100644
index 64d68c2..0000000
--- a/modules/core/src/main/java/org/apache/ignite/product/GridProductVersion.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.product;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import java.util.regex.*;
-
-/**
- * Represents node version.
- * <p>
- * Node version can be acquired via {@link org.apache.ignite.cluster.ClusterNode#version()} method.
- * <p>
- * Two versions are compared in the following order: major number,
- * minor number, maintenance number, revision timestamp.
- */
-public class GridProductVersion implements Comparable<GridProductVersion>, Externalizable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Regexp parse pattern. */
-    private static final Pattern VER_PATTERN =
-        Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)((?!-(os|ent))-([^-]+))?(-(os|ent))?(-(\\d+))?(-([\\da-f]+))?");
-
-    /** Major version number. */
-    private byte major;
-
-    /** Minor version number. */
-    private byte minor;
-
-    /** Maintenance version number. */
-    private byte maintenance;
-
-    /** Stage of development. */
-    private String stage;
-
-    /** Revision timestamp. */
-    private long revTs;
-
-    /** Revision hash. */
-    private byte[] revHash;
-
-    /**
-     * Empty constructor required by {@link Externalizable}.
-     */
-    public GridProductVersion() {
-        // No-op.
-    }
-
-    /**
-     * @param major Major version number.
-     * @param minor Minor version number.
-     * @param maintenance Maintenance version number.
-     * @param revTs Revision timestamp.
-     * @param revHash Revision hash.
-     */
-    public GridProductVersion(byte major, byte minor, byte maintenance, long revTs, byte[] revHash) {
-        this(major, minor, maintenance, "", revTs, revHash);
-    }
-
-    /**
-     * @param major Major version number.
-     * @param minor Minor version number.
-     * @param maintenance Maintenance version number.
-     * @param stage Stage of development.
-     * @param revTs Revision timestamp.
-     * @param revHash Revision hash.
-     */
-    public GridProductVersion(byte major, byte minor, byte maintenance, String stage, long revTs, byte[] revHash) {
-        if (revHash != null && revHash.length != 20)
-            throw new IllegalArgumentException("Invalid length for SHA1 hash (must be 20): " + revHash.length);
-
-        this.major = major;
-        this.minor = minor;
-        this.maintenance = maintenance;
-        this.stage = stage;
-        this.revTs = revTs;
-        this.revHash = revHash != null ? revHash : new byte[20];
-    }
-
-    /**
-     * Gets major version number.
-     *
-     * @return Major version number.
-     */
-    public byte major() {
-        return major;
-    }
-
-    /**
-     * Gets minor version number.
-     *
-     * @return Minor version number.
-     */
-    public byte minor() {
-        return minor;
-    }
-
-    /**
-     * Gets maintenance version number.
-     *
-     * @return Maintenance version number.
-     */
-    public byte maintenance() {
-        return maintenance;
-    }
-
-    /**
-     * @return Stage of development.
-     */
-    public String stage() {
-        return stage;
-    }
-
-    /**
-     * Gets revision timestamp.
-     *
-     * @return Revision timestamp.
-     */
-    public long revisionTimestamp() {
-        return revTs;
-    }
-
-    /**
-     * Gets revision hash.
-     *
-     * @return Revision hash.
-     */
-    public byte[] revisionHash() {
-        return revHash;
-    }
-
-    /**
-     * Gets release date.
-     *
-     * @return Release date.
-     */
-    public Date releaseDate() {
-        return new Date(revTs);
-    }
-
-    /**
-     * @param major Major version number.
-     * @param minor Minor version number.
-     * @param maintenance Maintenance version number.
-     * @return {@code True} if this version is greater or equal than the one passed in.
-     */
-    public boolean greaterThanEqual(int major, int minor, int maintenance) {
-        // NOTE: Unknown version is less than any other version.
-        if (major == this.major)
-            return minor == this.minor ? this.maintenance >= maintenance : this.minor > minor;
-        else
-            return this.major > major;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int compareTo(@NotNull GridProductVersion o) {
-        // NOTE: Unknown version is less than any other version.
-        if (major == o.major) {
-            if (minor == o.minor) {
-                if (maintenance == o.maintenance)
-                    return revTs != o.revTs ? revTs < o.revTs ? -1 : 1 : 0;
-                else
-                    return maintenance < o.maintenance ? -1 : 1;
-            }
-            else
-                return minor < o.minor ? -1 : 1;
-        }
-        else
-            return major < o.major ? -1 : 1;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean equals(Object o) {
-        if (this == o)
-            return true;
-
-        if (!(o instanceof GridProductVersion))
-            return false;
-
-        GridProductVersion that = (GridProductVersion)o;
-
-        return revTs == that.revTs && maintenance == that.maintenance && minor == that.minor && major == that.major;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int hashCode() {
-        int res = major;
-
-        res = 31 * res + minor;
-        res = 31 * res + maintenance;
-        res = 31 * res + (int)(revTs ^ (revTs >>> 32));
-
-        return res;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void writeExternal(ObjectOutput out) throws IOException {
-        out.writeByte(major);
-        out.writeByte(minor);
-        out.writeByte(maintenance);
-        out.writeLong(revTs);
-        U.writeByteArray(out, revHash);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-        major = in.readByte();
-        minor = in.readByte();
-        maintenance = in.readByte();
-        revTs = in.readLong();
-        revHash = U.readByteArray(in);
-    }
-
-    /** {@inheritDoc} */
-    public String toString() {
-        String revTsStr = new SimpleDateFormat("yyyyMMdd").format(new Date(revTs * 1000));
-
-        String hash = U.byteArray2HexString(revHash).toLowerCase();
-
-        hash = hash.length() > 8 ? hash.substring(0, 8) : hash;
-
-        return major + "." + minor + "." + maintenance + "#" + revTsStr + "-sha1:" + hash;
-    }
-
-    /**
-     * Tries to parse product version from it's string representation.
-     *
-     * @param verStr String representation of version.
-     * @return Product version.
-     */
-    @SuppressWarnings({"MagicConstant", "TypeMayBeWeakened"})
-    public static GridProductVersion fromString(String verStr) {
-        assert verStr != null;
-
-        if (verStr.endsWith("-DEV")) // Development version, just cut it out.
-            verStr = verStr.substring(0, verStr.length() - 4);
-
-        Matcher match = VER_PATTERN.matcher(verStr);
-
-        if (match.matches()) {
-            try {
-                byte major = Byte.parseByte(match.group(1));
-                byte minor = Byte.parseByte(match.group(2));
-                byte maintenance = Byte.parseByte(match.group(3));
-
-                String stage = "";
-
-                if (match.group(4) != null)
-                    stage = match.group(6);
-
-                long revTs = 0;
-
-                if (match.group(9) != null)
-                    revTs = Long.parseLong(match.group(10));
-
-                byte[] revHash = null;
-
-                if (match.group(11) != null)
-                    revHash = U.decodeHex(match.group(12).toCharArray());
-
-                return new GridProductVersion(major, minor, maintenance, stage, revTs, revHash);
-            }
-            catch (IllegalStateException | IndexOutOfBoundsException | NumberFormatException | GridException e) {
-                throw new IllegalStateException("Failed to parse version: " + verStr, e);
-            }
-        }
-        else
-            throw new IllegalStateException("Failed to parse version: " + verStr);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/product/IgniteProduct.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/IgniteProduct.java b/modules/core/src/main/java/org/apache/ignite/product/IgniteProduct.java
new file mode 100644
index 0000000..100d47c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/IgniteProduct.java
@@ -0,0 +1,58 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.product;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Provides information about current release. Note that enterprise users are also
+ * able to renew license. Instance of {@code GridProduct} is obtained from grid as follows:
+ * <pre name="code" class="java">
+ * GridProduct p = GridGain.grid().product();
+ * </pre>
+ */
+public interface IgniteProduct {
+    /**
+     * Gets license descriptor for enterprise edition or {@code null} for open source edition.
+     *
+     * @return License descriptor.
+     */
+    @Nullable public IgniteProductLicense license();
+
+    /**
+     * Updates to a new license in enterprise edition. This method is no-op in open source edition.
+     *
+     * @param lic The content of the license.
+     * @throws IgniteProductLicenseException If license could not be updated.
+     */
+    public void updateLicense(String lic) throws IgniteProductLicenseException;
+
+    /**
+     * Gets product version for this release.
+     *
+     * @return Product version for this release.
+     */
+    public IgniteProductVersion version();
+
+    /**
+     * Copyright statement for GridGain code.
+     *
+     * @return Legal copyright statement for GridGain code.
+     */
+    public String copyright();
+
+    /**
+     * Gets latest version available for download or
+     * {@code null} if information is not available.
+     *
+     * @return Latest version string or {@code null} if information is not available.
+     */
+    @Nullable public String latestVersion();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductLicense.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/IgniteProductLicense.java b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductLicense.java
new file mode 100644
index 0000000..2ff8f66
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductLicense.java
@@ -0,0 +1,175 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.product;
+
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * GridGain license descriptor. GridGain license is available for
+ * information purposes and is checked automatically by GridGain software.
+ * License descriptor can be obtains by calling {@link IgniteProduct#license()} method.
+ * @see IgniteProduct#license()
+ */
+public interface IgniteProductLicense extends Serializable {
+    /**
+     * Gets a comma separated list of disabled subsystems.
+     *
+     * @return Comma separated list of disabled subsystems or {@code null}.
+     */
+    public String disabledSubsystems();
+
+    /**
+     * Gets license version.
+     *
+     * @return License version.
+     */
+    public String version();
+
+    /**
+     * Gets license ID.
+     *
+     * @return License ID.
+     */
+    public UUID id();
+
+    /**
+     * Version regular expression.
+     *
+     * @return Version regular expression.
+     */
+    public String versionRegexp();
+
+    /**
+     * Gets issue date.
+     *
+     * @return Issue date.
+     */
+    public Date issueDate();
+
+    /**
+     * Gets maintenance time in months. If zero - no restriction.
+     *
+     * @return Maintenance time.
+     */
+    public int maintenanceTime();
+
+    /**
+     * Gets issue organization.
+     *
+     * @return Issue organization.
+     */
+    public String issueOrganization();
+
+    /**
+     * Gets user organization.
+     *
+     * @return User organization.
+     */
+    public String userOrganization();
+
+    /**
+     * Gets license note. It may include textual description of license limitations such
+     * as as "Development Only" or "Load-Testing and Staging Only".
+     *
+     * @return License note.
+     */
+    public String licenseNote();
+
+    /**
+     * Gets user organization URL.
+     *
+     * @return User organization URL.
+     */
+    public String userWww();
+
+    /**
+     * Gets user organization e-mail.
+     *
+     * @return User organization e-mail.
+     */
+    public String userEmail();
+
+    /**
+     * Gets user organization contact name.
+     *
+     * @return User organization contact name.
+     */
+    public String userName();
+
+    /**
+     * Gets expire date.
+     *
+     * @return Expire date.
+     */
+    public Date expireDate();
+
+    /**
+     * Gets maximum number of nodes. If zero - no restriction.
+     *
+     * @return Maximum number of nodes.
+     */
+    public int maxNodes();
+
+    /**
+     * Gets maximum number of physical computers or virtual instances. If zero - no restriction.
+     * Note that individual physical computer or virtual instance is determined by number of enabled
+     * MACs on each computer or instance.
+     *
+     * @return Maximum number of computers or virtual instances.
+     */
+    public int maxComputers();
+
+    /**
+     * Gets maximum number of CPUs. If zero - no restriction.
+     *
+     * @return Maximum number of CPUs.
+     */
+    public int maxCpus();
+
+    /**
+     * Gets maximum up time in minutes. If zero - no restriction.
+     *
+     * @return Maximum up time in minutes.
+     */
+    public long maxUpTime();
+
+    /**
+     * Gets license violation grace period in minutes. If zero - no grace period.
+     *
+     * @return License violation grace period in minutes.
+     */
+    public long gracePeriod();
+
+    /**
+     * Gets license attribute name if any. Attributes in license will have to match
+     * attributes in the grid node.
+     *
+     * @return Attribute name.
+     */
+    @Nullable public String attributeName();
+
+    /**
+     * Gets value for the license attribute if any. Attributes in license will have to match
+     * attributes in the grid node.
+     *
+     * @return Attribute value.
+     */
+    @Nullable public String attributeValue();
+
+    /**
+     * Gets a comma separated list of allowed cache distribution modes.
+     *
+     * @return Allowed cache distribution modes or {@code null}.
+     */
+    @Nullable public String getCacheDistributionModes();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductLicenseException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/IgniteProductLicenseException.java b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductLicenseException.java
new file mode 100644
index 0000000..4ce3edf
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductLicenseException.java
@@ -0,0 +1,62 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.product;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * This exception is thrown when license violation is detected.
+ */
+public class IgniteProductLicenseException extends GridException {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Short message. */
+    private final String shortMsg;
+
+    /**
+     * Creates new license exception with given error message.
+     *
+     * @param msg Error message.
+     * @param shortMsg Short error message presentable to the user. Note it should contain just letter and dot.
+     */
+    public IgniteProductLicenseException(String msg, @Nullable String shortMsg) {
+        super(msg);
+
+        this.shortMsg = shortMsg;
+    }
+
+    /**
+     * Creates new license exception with given error message and optional nested exception.
+     *
+     * @param msg Error message.
+     * @param shortMsg Short error message presentable to the user. Note it should contain just letter and dot.
+     * @param cause Optional nested exception (can be {@code null}).
+     */
+    public IgniteProductLicenseException(String msg, @Nullable String shortMsg, @Nullable Throwable cause) {
+        super(msg, cause);
+
+        this.shortMsg = shortMsg;
+    }
+
+    /**
+     * @return shortMessage Short error message presentable to the user. Note it should contain just letter and dot.
+     */
+    public final String shortMessage() {
+        return shortMsg;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(IgniteProductLicenseException.class, this, "msg", getMessage(), "shortMsg", shortMsg);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/product/IgniteProductVersion.java b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductVersion.java
new file mode 100644
index 0000000..15720f2
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/product/IgniteProductVersion.java
@@ -0,0 +1,283 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.product;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.text.*;
+import java.util.*;
+import java.util.regex.*;
+
+/**
+ * Represents node version.
+ * <p>
+ * Node version can be acquired via {@link org.apache.ignite.cluster.ClusterNode#version()} method.
+ * <p>
+ * Two versions are compared in the following order: major number,
+ * minor number, maintenance number, revision timestamp.
+ */
+public class IgniteProductVersion implements Comparable<IgniteProductVersion>, Externalizable {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Regexp parse pattern. */
+    private static final Pattern VER_PATTERN =
+        Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)((?!-(os|ent))-([^-]+))?(-(os|ent))?(-(\\d+))?(-([\\da-f]+))?");
+
+    /** Major version number. */
+    private byte major;
+
+    /** Minor version number. */
+    private byte minor;
+
+    /** Maintenance version number. */
+    private byte maintenance;
+
+    /** Stage of development. */
+    private String stage;
+
+    /** Revision timestamp. */
+    private long revTs;
+
+    /** Revision hash. */
+    private byte[] revHash;
+
+    /**
+     * Empty constructor required by {@link Externalizable}.
+     */
+    public IgniteProductVersion() {
+        // No-op.
+    }
+
+    /**
+     * @param major Major version number.
+     * @param minor Minor version number.
+     * @param maintenance Maintenance version number.
+     * @param revTs Revision timestamp.
+     * @param revHash Revision hash.
+     */
+    public IgniteProductVersion(byte major, byte minor, byte maintenance, long revTs, byte[] revHash) {
+        this(major, minor, maintenance, "", revTs, revHash);
+    }
+
+    /**
+     * @param major Major version number.
+     * @param minor Minor version number.
+     * @param maintenance Maintenance version number.
+     * @param stage Stage of development.
+     * @param revTs Revision timestamp.
+     * @param revHash Revision hash.
+     */
+    public IgniteProductVersion(byte major, byte minor, byte maintenance, String stage, long revTs, byte[] revHash) {
+        if (revHash != null && revHash.length != 20)
+            throw new IllegalArgumentException("Invalid length for SHA1 hash (must be 20): " + revHash.length);
+
+        this.major = major;
+        this.minor = minor;
+        this.maintenance = maintenance;
+        this.stage = stage;
+        this.revTs = revTs;
+        this.revHash = revHash != null ? revHash : new byte[20];
+    }
+
+    /**
+     * Gets major version number.
+     *
+     * @return Major version number.
+     */
+    public byte major() {
+        return major;
+    }
+
+    /**
+     * Gets minor version number.
+     *
+     * @return Minor version number.
+     */
+    public byte minor() {
+        return minor;
+    }
+
+    /**
+     * Gets maintenance version number.
+     *
+     * @return Maintenance version number.
+     */
+    public byte maintenance() {
+        return maintenance;
+    }
+
+    /**
+     * @return Stage of development.
+     */
+    public String stage() {
+        return stage;
+    }
+
+    /**
+     * Gets revision timestamp.
+     *
+     * @return Revision timestamp.
+     */
+    public long revisionTimestamp() {
+        return revTs;
+    }
+
+    /**
+     * Gets revision hash.
+     *
+     * @return Revision hash.
+     */
+    public byte[] revisionHash() {
+        return revHash;
+    }
+
+    /**
+     * Gets release date.
+     *
+     * @return Release date.
+     */
+    public Date releaseDate() {
+        return new Date(revTs);
+    }
+
+    /**
+     * @param major Major version number.
+     * @param minor Minor version number.
+     * @param maintenance Maintenance version number.
+     * @return {@code True} if this version is greater or equal than the one passed in.
+     */
+    public boolean greaterThanEqual(int major, int minor, int maintenance) {
+        // NOTE: Unknown version is less than any other version.
+        if (major == this.major)
+            return minor == this.minor ? this.maintenance >= maintenance : this.minor > minor;
+        else
+            return this.major > major;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int compareTo(@NotNull IgniteProductVersion o) {
+        // NOTE: Unknown version is less than any other version.
+        if (major == o.major) {
+            if (minor == o.minor) {
+                if (maintenance == o.maintenance)
+                    return revTs != o.revTs ? revTs < o.revTs ? -1 : 1 : 0;
+                else
+                    return maintenance < o.maintenance ? -1 : 1;
+            }
+            else
+                return minor < o.minor ? -1 : 1;
+        }
+        else
+            return major < o.major ? -1 : 1;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof IgniteProductVersion))
+            return false;
+
+        IgniteProductVersion that = (IgniteProductVersion)o;
+
+        return revTs == that.revTs && maintenance == that.maintenance && minor == that.minor && major == that.major;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        int res = major;
+
+        res = 31 * res + minor;
+        res = 31 * res + maintenance;
+        res = 31 * res + (int)(revTs ^ (revTs >>> 32));
+
+        return res;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeExternal(ObjectOutput out) throws IOException {
+        out.writeByte(major);
+        out.writeByte(minor);
+        out.writeByte(maintenance);
+        out.writeLong(revTs);
+        U.writeByteArray(out, revHash);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        major = in.readByte();
+        minor = in.readByte();
+        maintenance = in.readByte();
+        revTs = in.readLong();
+        revHash = U.readByteArray(in);
+    }
+
+    /** {@inheritDoc} */
+    public String toString() {
+        String revTsStr = new SimpleDateFormat("yyyyMMdd").format(new Date(revTs * 1000));
+
+        String hash = U.byteArray2HexString(revHash).toLowerCase();
+
+        hash = hash.length() > 8 ? hash.substring(0, 8) : hash;
+
+        return major + "." + minor + "." + maintenance + "#" + revTsStr + "-sha1:" + hash;
+    }
+
+    /**
+     * Tries to parse product version from it's string representation.
+     *
+     * @param verStr String representation of version.
+     * @return Product version.
+     */
+    @SuppressWarnings({"MagicConstant", "TypeMayBeWeakened"})
+    public static IgniteProductVersion fromString(String verStr) {
+        assert verStr != null;
+
+        if (verStr.endsWith("-DEV")) // Development version, just cut it out.
+            verStr = verStr.substring(0, verStr.length() - 4);
+
+        Matcher match = VER_PATTERN.matcher(verStr);
+
+        if (match.matches()) {
+            try {
+                byte major = Byte.parseByte(match.group(1));
+                byte minor = Byte.parseByte(match.group(2));
+                byte maintenance = Byte.parseByte(match.group(3));
+
+                String stage = "";
+
+                if (match.group(4) != null)
+                    stage = match.group(6);
+
+                long revTs = 0;
+
+                if (match.group(9) != null)
+                    revTs = Long.parseLong(match.group(10));
+
+                byte[] revHash = null;
+
+                if (match.group(11) != null)
+                    revHash = U.decodeHex(match.group(12).toCharArray());
+
+                return new IgniteProductVersion(major, minor, maintenance, stage, revTs, revHash);
+            }
+            catch (IllegalStateException | IndexOutOfBoundsException | NumberFormatException | GridException e) {
+                throw new IllegalStateException("Failed to parse version: " + verStr, e);
+            }
+        }
+        else
+            throw new IllegalStateException("Failed to parse version: " + verStr);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 544255e..2f2319f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -915,7 +915,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
                     //
                     // This exception thrown here means that grace period, if any,
                     // has expired and license violation is still unresolved.
-                    catch (GridProductLicenseException ignored) {
+                    catch (IgniteProductLicenseException ignored) {
                         U.error(log, "License violation is unresolved. GridGain node will shutdown in " +
                             (SHUTDOWN_DELAY / 1000) + " sec.");
                         U.error(log, "  ^-- Contact your support for immediate assistance (!)");
@@ -1049,7 +1049,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
             String nid = localNode().id().toString().toUpperCase();
             String nid8 = U.id8(localNode().id()).toUpperCase();
 
-            GridProductLicense lic = ctx.license().license();
+            IgniteProductLicense lic = ctx.license().license();
 
             String body =
                 "GridGain node started with the following parameters:" + NL +
@@ -2045,7 +2045,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
                     " stopped " + errOk + ":";
                 String subj = "GridGain node stopped " + errOk + ": " + nid8;
 
-                GridProductLicense lic = ctx.license() != null ? ctx.license().license() : null;
+                IgniteProductLicense lic = ctx.license() != null ? ctx.license().license() : null;
 
                 String body =
                     headline + NL + NL +
@@ -3163,7 +3163,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
     }
 
     /** {@inheritDoc} */
-    @Override public GridProduct product() {
+    @Override public IgniteProduct product() {
         return ctx.product();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
index 4ba5fe7..0cf12e3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContext.java
@@ -89,7 +89,7 @@ public interface GridKernalContext extends GridMetadataAware, Iterable<GridCompo
      *
      * @return Grid product.
      */
-    public GridProduct product();
+    public IgniteProduct product();
 
     /**
      * Gets list of compatible versions.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
index 1111866..4f0f734 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java
@@ -262,7 +262,7 @@ public class GridKernalContextImpl extends GridMetadataAwareAdapter implements G
     private ExecutorService utilityCachePool;
 
     /** */
-    private GridProduct product;
+    private IgniteProduct product;
 
     /** */
     private IgniteConfiguration cfg;
@@ -717,12 +717,12 @@ public class GridKernalContextImpl extends GridMetadataAwareAdapter implements G
     /**
      * @param product Product.
      */
-    public void product(GridProduct product) {
+    public void product(IgniteProduct product) {
         this.product = product;
     }
 
     /** {@inheritDoc} */
-    @Override public GridProduct product() {
+    @Override public IgniteProduct product() {
         return product;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java
index 0504e5a..1de19c3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridProductImpl.java
@@ -18,9 +18,9 @@ import java.text.*;
 import java.util.*;
 
 /**
- * {@link org.apache.ignite.product.GridProduct} implementation.
+ * {@link org.apache.ignite.product.IgniteProduct} implementation.
  */
-public class GridProductImpl implements GridProduct, Externalizable {
+public class GridProductImpl implements IgniteProduct, Externalizable {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -58,7 +58,7 @@ public class GridProductImpl implements GridProduct, Externalizable {
     private GridKernalContext ctx;
 
     /** */
-    private GridProductVersion ver;
+    private IgniteProductVersion ver;
 
     /** Update notifier. */
     private GridUpdateNotifier verChecker;
@@ -111,11 +111,11 @@ public class GridProductImpl implements GridProduct, Externalizable {
 
         String releaseType = ctx.isEnterprise() ? "ent" : "os";
 
-        ver = GridProductVersion.fromString(VER + '-' + releaseType + '-' + BUILD_TSTAMP + '-' + REV_HASH);
+        ver = IgniteProductVersion.fromString(VER + '-' + releaseType + '-' + BUILD_TSTAMP + '-' + REV_HASH);
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public GridProductLicense license() {
+    @Nullable @Override public IgniteProductLicense license() {
         ctx.gateway().readLock();
 
         try {
@@ -127,7 +127,7 @@ public class GridProductImpl implements GridProduct, Externalizable {
     }
 
     /** {@inheritDoc} */
-    @Override public void updateLicense(String lic) throws GridProductLicenseException {
+    @Override public void updateLicense(String lic) throws IgniteProductLicenseException {
         ctx.gateway().readLock();
 
         try {
@@ -139,7 +139,7 @@ public class GridProductImpl implements GridProduct, Externalizable {
     }
 
     /** {@inheritDoc} */
-    @Override public GridProductVersion version() {
+    @Override public IgniteProductVersion version() {
         return ver;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
index ebde564..f928fcb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridUpdateNotifier.java
@@ -268,7 +268,7 @@ class GridUpdateNotifier {
         /** {@inheritDoc} */
         @Override protected void body() throws InterruptedException {
             try {
-                GridProductLicense lic = licProc != null ? licProc.license() : null;
+                IgniteProductLicense lic = licProc != null ? licProc.license() : null;
 
                 String stackTrace = gw != null ? gw.userStackTrace() : null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
index d964e90..106308f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/discovery/GridDiscoveryManager.java
@@ -189,7 +189,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<GridDiscoverySpi> {
      * @param attrs Attributes to set.
      * @param ver Version.
      */
-    public void setNodeAttributes(Map<String, Object> attrs, GridProductVersion ver) {
+    public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) {
         // TODO GG-7574 move to metrics processor?
         long totSysMemory = -1;
 
@@ -984,7 +984,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<GridDiscoverySpi> {
      *
      * @return Version to collection of nodes map.
      */
-    public NavigableMap<GridProductVersion, Collection<ClusterNode>> topologyVersionMap() {
+    public NavigableMap<IgniteProductVersion, Collection<ClusterNode>> topologyVersionMap() {
         return discoCache().versionsMap();
     }
 
@@ -1740,7 +1740,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<GridDiscoverySpi> {
         private final Set<String> nearEnabledCaches;
 
         /** Nodes grouped by version. */
-        private final NavigableMap<GridProductVersion, Collection<ClusterNode>> nodesByVer;
+        private final NavigableMap<IgniteProductVersion, Collection<ClusterNode>> nodesByVer;
 
         /** Daemon nodes. */
         private final List<ClusterNode> daemonNodes;
@@ -1858,7 +1858,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<GridDiscoverySpi> {
                     }
                 }
 
-                GridProductVersion nodeVer = U.productVersion(node);
+                IgniteProductVersion nodeVer = U.productVersion(node);
 
                 // Create collection for this version if it does not exist.
                 Collection<ClusterNode> nodes = nodesByVer.get(nodeVer);
@@ -1874,10 +1874,10 @@ public class GridDiscoveryManager extends GridManagerAdapter<GridDiscoverySpi> {
 
             // Need second iteration to add this node to all previous node versions.
             for (ClusterNode node : allNodes) {
-                GridProductVersion nodeVer = U.productVersion(node);
+                IgniteProductVersion nodeVer = U.productVersion(node);
 
                 // Get all versions lower or equal node's version.
-                NavigableMap<GridProductVersion, Collection<ClusterNode>> updateView =
+                NavigableMap<IgniteProductVersion, Collection<ClusterNode>> updateView =
                     nodesByVer.headMap(nodeVer, false);
 
                 for (Collection<ClusterNode> prevVersions : updateView.values())
@@ -1951,8 +1951,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<GridDiscoverySpi> {
          * @param ver Version to check.
          * @return Collection of nodes with version equal or greater than {@code ver}.
          */
-        Collection<ClusterNode> elderNodes(GridProductVersion ver) {
-            Map.Entry<GridProductVersion, Collection<ClusterNode>> entry = nodesByVer.ceilingEntry(ver);
+        Collection<ClusterNode> elderNodes(IgniteProductVersion ver) {
+            Map.Entry<IgniteProductVersion, Collection<ClusterNode>> entry = nodesByVer.ceilingEntry(ver);
 
             if (entry == null)
                 return Collections.emptyList();
@@ -1963,7 +1963,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<GridDiscoverySpi> {
         /**
          * @return Versions map.
          */
-        NavigableMap<GridProductVersion, Collection<ClusterNode>> versionsMap() {
+        NavigableMap<IgniteProductVersion, Collection<ClusterNode>> versionsMap() {
             return nodesByVer;
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
index 1c5ab8e..a53c63e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
@@ -48,7 +48,7 @@ import static org.gridgain.grid.kernal.managers.communication.GridIoPolicy.*;
  */
 public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delayed {
     /** */
-    public static final GridProductVersion COMPACT_MAP_ENTRIES_SINCE = GridProductVersion.fromString("6.5.6");
+    public static final IgniteProductVersion COMPACT_MAP_ENTRIES_SINCE = IgniteProductVersion.fromString("6.5.6");
 
     /** Cache updater. */
     private IgniteDataLoadCacheUpdater<K, V> updater = GridDataLoadCacheUpdaters.individual();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
index 55ebefd..b031865 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobProcessor.java
@@ -51,7 +51,7 @@ public class GridJobProcessor extends GridProcessorAdapter {
     private static final int FINISHED_JOBS_COUNT = Integer.getInteger(GG_JOBS_HISTORY_SIZE, 10240);
 
     /** Version when subject ID was added. */
-    public static final GridProductVersion SUBJECT_ID_ADDED_SINCE_VER = GridProductVersion.fromString("6.2.1");
+    public static final IgniteProductVersion SUBJECT_ID_ADDED_SINCE_VER = IgniteProductVersion.fromString("6.2.1");
 
     /** */
     private final IgniteMarshaller marsh;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java
index da76424..80bdd3f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/GridLicenseProcessor.java
@@ -21,11 +21,11 @@ public interface GridLicenseProcessor extends GridProcessor {
      * Upload the new license into the current node.
      *
      * @param licTxt The string representation of the license file.
-     * @throws GridProductLicenseException Thrown if validation check failed for specified license or
+     * @throws org.apache.ignite.product.IgniteProductLicenseException Thrown if validation check failed for specified license or
      *      license can not be updated because configured license URL use non-file scheme.
      * @see org.apache.ignite.configuration.IgniteConfiguration#getLicenseUrl()
      */
-    public void updateLicense(String licTxt) throws GridProductLicenseException;
+    public void updateLicense(String licTxt) throws IgniteProductLicenseException;
 
     /**
      * Acks the license to the log.
@@ -35,9 +35,9 @@ public interface GridLicenseProcessor extends GridProcessor {
     /**
      * This method is called periodically by the GridGain to check the license conformance.
      *
-     * @throws GridProductLicenseException Thrown in case of any license violation.
+     * @throws org.apache.ignite.product.IgniteProductLicenseException Thrown in case of any license violation.
      */
-    public void checkLicense() throws GridProductLicenseException;
+    public void checkLicense() throws IgniteProductLicenseException;
 
     /**
      * Checks if subsystem is enabled.
@@ -52,7 +52,7 @@ public interface GridLicenseProcessor extends GridProcessor {
      *
      * @return License descriptor or {@code null} for open-source edition.
      */
-    @Nullable public GridProductLicense license();
+    @Nullable public IgniteProductLicense license();
 
     /**
      * @return Grace period left in minutes if bursting or {@code -1} otherwise.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java
index c06aca0..694e9a3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/license/os/GridOsLicenseProcessor.java
@@ -27,7 +27,7 @@ public class GridOsLicenseProcessor extends GridProcessorAdapter implements Grid
     }
 
     /** {@inheritDoc} */
-    @Override public void updateLicense(String licTxt) throws GridProductLicenseException {
+    @Override public void updateLicense(String licTxt) throws IgniteProductLicenseException {
         // No-op.
     }
 
@@ -37,7 +37,7 @@ public class GridOsLicenseProcessor extends GridProcessorAdapter implements Grid
     }
 
     /** {@inheritDoc} */
-    @Override public void checkLicense() throws GridProductLicenseException {
+    @Override public void checkLicense() throws IgniteProductLicenseException {
         // No-op.
     }
 
@@ -47,7 +47,7 @@ public class GridOsLicenseProcessor extends GridProcessorAdapter implements Grid
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public GridProductLicense license() {
+    @Nullable @Override public IgniteProductLicense license() {
         return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index 20e7569..62b596d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -269,7 +269,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
 
                     assert old == null;
 
-                    GridProductVersion locVer = getSpiContext().localNode().version();
+                    IgniteProductVersion locVer = getSpiContext().localNode().version();
 
                     ClusterNode rmtNode = getSpiContext().node(sndId);
 
@@ -279,7 +279,7 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
                         return;
                     }
 
-                    GridProductVersion rmtVer = rmtNode.version();
+                    IgniteProductVersion rmtVer = rmtNode.version();
 
                     if (!locVer.equals(rmtVer))
                         ses.addMeta(GridNioServer.DIFF_VER_NODE_ID_META_KEY, sndId);
@@ -1680,8 +1680,8 @@ public class GridTcpCommunicationSpi extends GridSpiAdapter
 
                         UUID diffVerNodeId = null;
 
-                        GridProductVersion locVer = getSpiContext().localNode().version();
-                        GridProductVersion rmtVer = node.version();
+                        IgniteProductVersion locVer = getSpiContext().localNode().version();
+                        IgniteProductVersion rmtVer = node.version();
 
                         if (!locVer.equals(rmtVer))
                             diffVerNodeId = node.id();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java
index 3fc5e2f..8e6b403 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/GridDiscoverySpi.java
@@ -73,7 +73,7 @@ public interface GridDiscoverySpi extends GridSpi {
      * @param attrs Map of node attributes.
      * @param ver Product version.
      */
-    public void setNodeAttributes(Map<String, Object> attrs, GridProductVersion ver);
+    public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver);
 
     /**
      * Sets a listener for discovery events. Refer to

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
index 70d5d89..c5d39cc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
@@ -107,7 +107,7 @@ abstract class GridTcpDiscoverySpiAdapter extends GridSpiAdapter implements Grid
     protected Map<String, Object> locNodeAttrs;
 
     /** Local node version. */
-    protected GridProductVersion locNodeVer;
+    protected IgniteProductVersion locNodeVer;
 
     /** Local node. */
     protected GridTcpDiscoveryNode locNode;
@@ -287,7 +287,7 @@ abstract class GridTcpDiscoverySpiAdapter extends GridSpiAdapter implements Grid
     }
 
     /** {@inheritDoc} */
-    @Override public void setNodeAttributes(Map<String, Object> attrs, GridProductVersion ver) {
+    @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) {
         assert locNodeAttrs == null;
         assert locNodeVer == null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java
index 14973cf..d15b768 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/internal/GridTcpDiscoveryNode.java
@@ -89,7 +89,7 @@ public class GridTcpDiscoveryNode extends GridMetadataAwareAdapter implements Cl
     private boolean loc;
 
     /** Version. */
-    private GridProductVersion ver;
+    private IgniteProductVersion ver;
 
     /** Alive check (used by clients). */
     @GridToStringExclude
@@ -117,7 +117,7 @@ public class GridTcpDiscoveryNode extends GridMetadataAwareAdapter implements Cl
      * @param ver Version.
      */
     public GridTcpDiscoveryNode(UUID id, Collection<String> addrs, Collection<String> hostNames, int discPort,
-        GridDiscoveryMetricsProvider metricsProvider, GridProductVersion ver) {
+        GridDiscoveryMetricsProvider metricsProvider, IgniteProductVersion ver) {
         assert id != null;
         assert !F.isEmpty(addrs);
         assert metricsProvider != null;
@@ -236,14 +236,14 @@ public class GridTcpDiscoveryNode extends GridMetadataAwareAdapter implements Cl
     }
 
     /** {@inheritDoc} */
-    @Override public GridProductVersion version() {
+    @Override public IgniteProductVersion version() {
         return ver;
     }
 
     /**
      * @param ver Version.
      */
-    public void version(GridProductVersion ver) {
+    public void version(IgniteProductVersion ver) {
         assert ver != null;
 
         this.ver = ver;
@@ -423,7 +423,7 @@ public class GridTcpDiscoveryNode extends GridMetadataAwareAdapter implements Cl
 
         order = in.readLong();
         intOrder = in.readLong();
-        ver = (GridProductVersion)in.readObject();
+        ver = (IgniteProductVersion)in.readObject();
         clientRouterNodeId = U.readUuid(in);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index 37642c4..47dfb92 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -5997,14 +5997,14 @@ public abstract class GridUtils {
      * @param node Node to get version from.
      * @return Version object.
      */
-    public static GridProductVersion productVersion(ClusterNode node) {
+    public static IgniteProductVersion productVersion(ClusterNode node) {
         String verStr = node.attribute(ATTR_BUILD_VER);
         String buildDate = node.attribute(ATTR_BUILD_DATE);
 
         if (buildDate != null)
             verStr += '-' + buildDate;
 
-        return GridProductVersion.fromString(verStr);
+        return IgniteProductVersion.fromString(verStr);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
index a2381e6..86255b6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDiscoverySelfTest.java
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.product.GridProductVersion.*;
+import static org.apache.ignite.product.IgniteProductVersion.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 
 /**
@@ -342,7 +342,7 @@ public class GridDiscoverySelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public GridProductVersion version() {
+        @Override public IgniteProductVersion version() {
             return fromString("99.99.99");
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
index dbbf2d8..4292214 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReleaseTypeSelfTest.java
@@ -45,7 +45,7 @@ public class GridReleaseTypeSelfTest extends GridCommonAbstractTest {
 
         // Override node attributes in discovery spi.
         GridTcpDiscoverySpi discoSpi = new GridTcpDiscoverySpi() {
-            @Override public void setNodeAttributes(Map<String, Object> attrs, GridProductVersion ver) {
+            @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) {
                 super.setNodeAttributes(attrs, ver);
 
                 if (idx % 2 == 0)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
index de0de36..2e786fc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopologyBuildVersionSelfTest.java
@@ -43,7 +43,7 @@ public class GridTopologyBuildVersionSelfTest extends GridCommonAbstractTest {
 
         // Override node attributes in discovery spi.
         GridTcpDiscoverySpi discoSpi = new GridTcpDiscoverySpi() {
-            @Override public void setNodeAttributes(Map<String, Object> attrs, GridProductVersion ver) {
+            @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) {
                 super.setNodeAttributes(attrs, ver);
 
                 attrs.put(GridNodeAttributes.ATTR_BUILD_VER, idx + ".0.0" + "-ent");
@@ -74,16 +74,16 @@ public class GridTopologyBuildVersionSelfTest extends GridCommonAbstractTest {
             for (int i = 3; i >= 0; i--) {
                 GridKernal g = (GridKernal)grid(i);
 
-                NavigableMap<GridProductVersion, Collection<ClusterNode>> verMap = g.context().discovery()
+                NavigableMap<IgniteProductVersion, Collection<ClusterNode>> verMap = g.context().discovery()
                     .topologyVersionMap();
 
                 assertEquals(4, verMap.size());
 
                 // Now check the map itself.
-                assertEquals(4, verMap.get(GridProductVersion.fromString("1.0.0")).size());
-                assertEquals(3, verMap.get(GridProductVersion.fromString("2.0.0")).size());
-                assertEquals(2, verMap.get(GridProductVersion.fromString("3.0.0-ent-1385099743")).size());
-                assertEquals(1, verMap.get(GridProductVersion.fromString("4.0.0-ent-1385099743")).size());
+                assertEquals(4, verMap.get(IgniteProductVersion.fromString("1.0.0")).size());
+                assertEquals(3, verMap.get(IgniteProductVersion.fromString("2.0.0")).size());
+                assertEquals(2, verMap.get(IgniteProductVersion.fromString("3.0.0-ent-1385099743")).size());
+                assertEquals(1, verMap.get(IgniteProductVersion.fromString("4.0.0-ent-1385099743")).size());
             }
         }
         finally {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
index 60ce11f..0a2c103 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridVersionSelfTest.java
@@ -31,7 +31,7 @@ public class GridVersionSelfTest extends GridCommonAbstractTest {
         try {
             Ignite ignite = startGrid();
 
-            GridProductVersion currVer = ignite.product().version();
+            IgniteProductVersion currVer = ignite.product().version();
 
             String newVer = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
index 6189598..f18ea5c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest.java
@@ -47,7 +47,7 @@ public abstract class GridCacheAffinityFunctionExcludeNeighborsAbstractSelfTest
         IgniteConfiguration c = super.getConfiguration(gridName);
 
         GridTcpDiscoverySpi spi = new GridTcpDiscoverySpi() {
-            @Override public void setNodeAttributes(Map<String, Object> attrs, GridProductVersion ver) {
+            @Override public void setNodeAttributes(Map<String, Object> attrs, IgniteProductVersion ver) {
                 super.setNodeAttributes(attrs, ver);
 
                 // Set unique mac addresses for every group of three nodes.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/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 d638c91..92aefe0 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
@@ -881,7 +881,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
      * @throws Exception If failed.
      */
     public void testProduct() throws Exception {
-        GridProduct product = grid().product();
+        IgniteProduct product = grid().product();
 
         GridMarshallerTestBean inBean = newTestBean(product);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java
index 455067e..1d30a77 100644
--- a/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/p2p/GridP2PClassLoadingSelfTest.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import static org.apache.ignite.product.GridProductVersion.*;
+import static org.apache.ignite.product.IgniteProductVersion.*;
 
 /**
  * P2P test.
@@ -81,7 +81,7 @@ public class GridP2PClassLoadingSelfTest extends GridCommonAbstractTest {
         }
 
         /** {@inheritDoc} */
-        @Override public GridProductVersion version() {
+        @Override public IgniteProductVersion version() {
             return fromString("99.99.99");
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
index 0fd1ff6..9e7abd3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/product/GridProductVersionSelfTest.java
@@ -23,7 +23,7 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testFromString() throws Exception {
-        GridProductVersion ver = GridProductVersion.fromString("1.2.3");
+        IgniteProductVersion ver = IgniteProductVersion.fromString("1.2.3");
 
         assertEquals(1, ver.major());
         assertEquals(2, ver.minor());
@@ -32,7 +32,7 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
         assertEquals(0, ver.revisionTimestamp());
         assertArrayEquals(new byte[20], ver.revisionHash());
 
-        ver = GridProductVersion.fromString("1.2.3-ent-0-DEV");
+        ver = IgniteProductVersion.fromString("1.2.3-ent-0-DEV");
 
         assertEquals(1, ver.major());
         assertEquals(2, ver.minor());
@@ -40,7 +40,7 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
         assertEquals(0, ver.revisionTimestamp());
         assertArrayEquals(new byte[20], ver.revisionHash());
 
-        ver = GridProductVersion.fromString("1.2.3-rc1-os-4-DEV");
+        ver = IgniteProductVersion.fromString("1.2.3-rc1-os-4-DEV");
 
         assertEquals(1, ver.major());
         assertEquals(2, ver.minor());
@@ -49,7 +49,7 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
         assertEquals(4, ver.revisionTimestamp());
         assertArrayEquals(new byte[20], ver.revisionHash());
 
-        ver = GridProductVersion.fromString("1.2.3-GA1-4-DEV");
+        ver = IgniteProductVersion.fromString("1.2.3-GA1-4-DEV");
 
         assertEquals(1, ver.major());
         assertEquals(2, ver.minor());
@@ -58,7 +58,7 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
         assertEquals(4, ver.revisionTimestamp());
         assertArrayEquals(new byte[20], ver.revisionHash());
 
-        ver = GridProductVersion.fromString("1.2.3-ent");
+        ver = IgniteProductVersion.fromString("1.2.3-ent");
 
         assertEquals(1, ver.major());
         assertEquals(2, ver.minor());
@@ -67,7 +67,7 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
         assertEquals(0, ver.revisionTimestamp());
         assertArrayEquals(new byte[20], ver.revisionHash());
 
-        ver = GridProductVersion.fromString("1.2.3-os-4");
+        ver = IgniteProductVersion.fromString("1.2.3-os-4");
 
         assertEquals(1, ver.major());
         assertEquals(2, ver.minor());
@@ -76,7 +76,7 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
         assertEquals(4, ver.revisionTimestamp());
         assertArrayEquals(new byte[20], ver.revisionHash());
 
-        ver = GridProductVersion.fromString("1.2.3-ent-4-18e5a7ec9e3202126a69bc231a6b965bc1d73dee");
+        ver = IgniteProductVersion.fromString("1.2.3-ent-4-18e5a7ec9e3202126a69bc231a6b965bc1d73dee");
 
         assertEquals(1, ver.major());
         assertEquals(2, ver.minor());
@@ -86,7 +86,7 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
         assertArrayEquals(new byte[] {24,-27,-89,-20,-98,50,2,18,106,105,-68,35,26,107,-106,91,-63,-41,61,-18},
             ver.revisionHash());
 
-        ver = GridProductVersion.fromString("1.2.3-rc1-os-4-18e5a7ec9e3202126a69bc231a6b965bc1d73dee");
+        ver = IgniteProductVersion.fromString("1.2.3-rc1-os-4-18e5a7ec9e3202126a69bc231a6b965bc1d73dee");
 
         assertEquals(1, ver.major());
         assertEquals(2, ver.minor());
@@ -96,8 +96,8 @@ public class GridProductVersionSelfTest extends GridCommonAbstractTest {
         assertArrayEquals(new byte[] {24,-27,-89,-20,-98,50,2,18,106,105,-68,35,26,107,-106,91,-63,-41,61,-18},
             ver.revisionHash());
 
-        GridProductVersion.fromString(VER + '-' + "ent" + '-' + BUILD_TSTAMP + '-' + REV_HASH);
+        IgniteProductVersion.fromString(VER + '-' + "ent" + '-' + BUILD_TSTAMP + '-' + REV_HASH);
 
-        GridProductVersion.fromString(VER + '-' + "os" + '-' + BUILD_TSTAMP + '-' + REV_HASH);
+        IgniteProductVersion.fromString(VER + '-' + "os" + '-' + BUILD_TSTAMP + '-' + REV_HASH);
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
index 7e34b08..0e49e3e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
@@ -26,7 +26,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.events.IgniteEventType.*;
-import static org.apache.ignite.product.GridProductVersion.*;
+import static org.apache.ignite.product.IgniteProductVersion.*;
 
 /**
  * Base discovery self-test class.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java
index 55a0106..da867c7 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestNode.java
@@ -17,14 +17,14 @@ import org.gridgain.grid.util.lang.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
 
-import static org.apache.ignite.product.GridProductVersion.*;
+import static org.apache.ignite.product.IgniteProductVersion.*;
 
 /**
  * Test node.
  */
 public class GridTestNode extends GridMetadataAwareAdapter implements ClusterNode {
     /** */
-    private static final GridProductVersion VERSION = fromString("99.99.99");
+    private static final IgniteProductVersion VERSION = fromString("99.99.99");
 
     /** */
     private static final AtomicInteger consistentIdCtr = new AtomicInteger();
@@ -181,7 +181,7 @@ public class GridTestNode extends GridMetadataAwareAdapter implements ClusterNod
     }
 
     /** {@inheritDoc} */
-    @Override public GridProductVersion version() {
+    @Override public IgniteProductVersion version() {
         return VERSION;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java
index 4255f3e..a7be5ef 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/spi/GridSpiAbstractTest.java
@@ -33,7 +33,7 @@ import java.lang.reflect.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.product.GridProductVersion.*;
+import static org.apache.ignite.product.IgniteProductVersion.*;
 
 /**
  * Base SPI test class.
@@ -42,7 +42,7 @@ import static org.apache.ignite.product.GridProductVersion.*;
 @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors"})
 public abstract class GridSpiAbstractTest<T extends GridSpi> extends GridAbstractTest {
     /** */
-    private static final GridProductVersion VERSION = fromString("99.99.99");
+    private static final IgniteProductVersion VERSION = fromString("99.99.99");
 
     /** */
     private static final Map<Class<?>, TestData<?>> tests = new ConcurrentHashMap<>();


[30/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 22b17d73de666ed9a028f6642afee34b0c3c2b81
Parents: f997c33
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:17:14 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:17:14 2014 +0300

----------------------------------------------------------------------
 .../scala/org/gridgain/scalar/examples/ScalarCacheExample.scala   | 1 -
 .../org/gridgain/scalar/examples/ScalarContinuationExample.scala  | 3 ---
 .../org/gridgain/scalar/examples/ScalarPingPongExample.scala      | 1 -
 .../scala/org/gridgain/scalar/examples/ScalarTaskExample.scala    | 1 -
 4 files changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22b17d73/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala
index 8b9920b..d61adc5 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheExample.scala
@@ -16,7 +16,6 @@ import org.apache.ignite.lang.IgnitePredicate
 import org.gridgain.scalar.scalar
 import scalar._
 import org.gridgain.grid.cache._
-import org.gridgain.grid.events.GridEventType
 import IgniteEventType._
 import collection.JavaConversions._
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22b17d73/examples/src/main/scala/org/gridgain/scalar/examples/ScalarContinuationExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarContinuationExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarContinuationExample.scala
index 1097f99..7e8fb1b 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarContinuationExample.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarContinuationExample.scala
@@ -16,11 +16,8 @@ import org.apache.ignite.resources.IgniteJobContextResource
 import org.gridgain.scalar._
 import scalar._
 import java.math._
-import org.gridgain.grid._
-import resources._
 import org.jetbrains.annotations.Nullable
 import java.util
-import org.gridgain.grid.compute._
 
 /**
  * This example recursively calculates `Fibonacci` numbers on the grid. This is

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22b17d73/examples/src/main/scala/org/gridgain/scalar/examples/ScalarPingPongExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarPingPongExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarPingPongExample.scala
index 6da5a81..af47372 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarPingPongExample.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarPingPongExample.scala
@@ -16,7 +16,6 @@ import org.gridgain.scalar.scalar
 import scalar._
 import java.util.UUID
 import java.util.concurrent.CountDownLatch
-import org.gridgain.grid.messaging._
 
 /**
  * Demonstrates simple protocol-based exchange in playing a ping-pong between

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22b17d73/examples/src/main/scala/org/gridgain/scalar/examples/ScalarTaskExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarTaskExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarTaskExample.scala
index 8953add..43bb1ed 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarTaskExample.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarTaskExample.scala
@@ -15,7 +15,6 @@ import org.apache.ignite.compute.{ComputeTaskSplitAdapter, ComputeJob, ComputeJo
 import org.gridgain.scalar.scalar
 import scalar._
 import collection.JavaConversions._
-import org.gridgain.grid.compute._
 import java.util
 
 /**


[41/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 3dcb5222d5ac243e5f347498e80ea14301cb0bc7
Parents: 4e32727
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:38:26 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:38:26 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgnitePortables.java | 358 +++++++++++++++++++
 .../grid/cache/store/GridCacheStore.java        |   2 +-
 .../gridgain/grid/kernal/GridPortablesImpl.java |   3 +-
 .../VisorPortableMetadataCollectorTask.java     |   1 +
 .../grid/portables/GridPortableBuilder.java     |   6 +-
 .../grid/portables/GridPortableMetadata.java    |   2 +-
 .../grid/portables/GridPortableObject.java      |   2 +-
 .../grid/portables/IgnitePortables.java         | 357 ------------------
 8 files changed, 367 insertions(+), 364 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcb5222/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
new file mode 100644
index 0000000..7e8a069
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
@@ -0,0 +1,358 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite;
+
+import org.gridgain.grid.cache.*;
+import org.gridgain.grid.cache.query.*;
+import org.gridgain.grid.portables.*;
+import org.jetbrains.annotations.*;
+
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
+
+/**
+ * Defines portable objects functionality. With portable objects you are able to:
+ * <ul>
+ * <li>Seamlessly interoperate between Java, .NET, and C++.</li>
+ * <li>Make any object portable with zero code change to your existing code.</li>
+ * <li>Nest portable objects within each other.</li>
+ * <li>Automatically handle {@code circular} or {@code null} references.</li>
+ * <li>Automatically convert collections and maps between Java, .NET, and C++.</li>
+ * <li>
+ *      Optionally avoid deserialization of objects on the server side
+ *      (objects are stored in {@link org.gridgain.grid.portables.GridPortableObject} format).
+ * </li>
+ * <li>Avoid need to have concrete class definitions on the server side.</li>
+ * <li>Dynamically change structure of the classes without having to restart the cluster.</li>
+ * <li>Index into portable objects for querying purposes.</li>
+ * </ul>
+ * <h1 class="header">Working With Portables Directly</h1>
+ * Once an object is defined as portable,
+ * GridGain will always store it in memory in the portable (i.e. binary) format.
+ * User can choose to work either with the portable format or with the deserialized form
+ * (assuming that class definitions are present in the classpath).
+ * <p>
+ * To work with the portable format directly, user should create a special cache projection
+ * using {@link GridCacheProjection#keepPortable()} method and then retrieve individual fields as needed:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;GridPortableObject.class, GridPortableObject.class&gt; prj = cache.keepPortable();
+ *
+ * // Convert instance of MyKey to portable format.
+ * // We could also use GridPortableBuilder to create
+ * // the key in portable format directly.
+ * GridPortableObject key = grid.portables().toPortable(new MyKey());
+ *
+ * GridPortableObject val = prj.get(key);
+ *
+ * String field = val.field("myFieldName");
+ * </pre>
+ * Alternatively, if we have class definitions in the classpath, we may choose to work with deserialized
+ * typed objects at all times. In this case we do incur the deserialization cost, however,
+ * GridGain will only deserialize on the first access and will cache the deserialized object,
+ * so it does not have to be deserialized again:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
+ *     cache.projection(MyKey.class, MyValue.class);
+ *
+ * MyValue val = prj.get(new MyKey());
+ *
+ * // Normal java getter.
+ * String fieldVal = val.getMyFieldName();
+ * </pre>
+ * If we used, for example, one of the automatically handled portable types for a key, like integer,
+ * and still wanted to work with binary portable format for values, then we would declare cache projection
+ * as follows:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;Integer.class, GridPortableObject.class&gt; prj = cache.keepPortable();
+ * </pre>
+ * <h1 class="header">Automatic Portable Types</h1>
+ * Note that only portable classes are converted to {@link org.gridgain.grid.portables.GridPortableObject} format. Following
+ * classes are never converted (e.g., {@link #toPortable(Object)} method will return original
+ * object, and instances of these classes will be stored in cache without changes):
+ * <ul>
+ *     <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li>
+ *     <li>Arrays of primitives (byte[], int[], ...)</li>
+ *     <li>{@link String} and array of {@link String}s</li>
+ *     <li>{@link UUID} and array of {@link UUID}s</li>
+ *     <li>{@link Date} and array of {@link Date}s</li>
+ *     <li>{@link Timestamp} and array of {@link Timestamp}s</li>
+ *     <li>Enums and array of enums</li>
+ *     <li>
+ *         Maps, collections and array of objects (but objects inside
+ *         them will still be converted if they are portable)
+ *     </li>
+ * </ul>
+ * <h1 class="header">Working With Maps and Collections</h1>
+ * All maps and collections in the portable objects are serialized automatically. When working
+ * with different platforms, e.g. C++ or .NET, GridGain will automatically pick the most
+ * adequate collection or map in either language. For example, {@link ArrayList} in Java will become
+ * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap}
+ * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
+ * in C#, etc.
+ * <h1 class="header">Building Portable Objects</h1>
+ * GridGain comes with {@link org.gridgain.grid.portables.GridPortableBuilder} which allows to build portable objects dynamically:
+ * <pre name=code class=java>
+ * GridPortableBuilder builder = GridGain.grid().portables().builder();
+ *
+ * builder.typeId("MyObject");
+ *
+ * builder.stringField("fieldA", "A");
+ * build.intField("fieldB", "B");
+ *
+ * GridPortableObject portableObj = builder.build();
+ * </pre>
+ * For the cases when class definition is present
+ * in the class path, it is also possible to populate a standard POJO and then
+ * convert it to portable format, like so:
+ * <pre name=code class=java>
+ * MyObject obj = new MyObject();
+ *
+ * obj.setFieldA("A");
+ * obj.setFieldB(123);
+ *
+ * GridPortableObject portableObj = GridGain.grid().portables().toPortable(obj);
+ * </pre>
+ * NOTE: you don't need to convert typed objects to portable format before storing
+ * them in cache, GridGain will do that automatically.
+ * <h1 class="header">Portable Metadata</h1>
+ * Even though GridGain portable protocol only works with hash codes for type and field names
+ * to achieve better performance, GridGain provides metadata for all portable types which
+ * can be queried ar runtime via any of the {@link IgnitePortables#metadata(Class) GridPortables.metadata(...)}
+ * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
+ * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
+ * <h1 class="header">Dynamic Structure Changes</h1>
+ * Since objects are always cached in the portable binary format, server does not need to
+ * be aware of the class definitions. Moreover, if class definitions are not present or not
+ * used on the server, then clients can continuously change the structure of the portable
+ * objects without having to restart the cluster. For example, if one client stores a
+ * certain class with fields A and B, and another client stores the same class with
+ * fields B and C, then the server-side portable object will have the fields A, B, and C.
+ * As the structure of a portable object changes, the new fields become available for SQL queries
+ * automatically.
+ * <h1 class="header">Configuration</h1>
+ * To make any object portable, you have to specify it in {@link org.gridgain.grid.portables.GridPortableConfiguration}
+ * at startup. The only requirement GridGain imposes is that your object has an empty
+ * constructor. Note, that since server side does not have to know the class definition,
+ * you only need to list portable objects in configuration on the client side. However, if you
+ * list them on the server side as well, then you get the ability to deserialize portable objects
+ * into concrete types on the server as well as on the client.
+ * <p>
+ * Here is an example of portable configuration (note that star (*) notation is supported):
+ * <pre name=code class=xml>
+ * ...
+ * &lt;!-- Portable objects configuration. --&gt;
+ * &lt;property name="portableConfiguration"&gt;
+ *     &lt;bean class="org.gridgain.grid.portables.GridPortableConfiguration"&gt;
+ *         &lt;property name="classNames"&gt;
+ *             &lt;list&gt;
+ *                 &lt;value&gt;my.package.for.portable.objects.*&lt;/value&gt;
+ *                 &lt;value&gt;org.gridgain.examples.client.portable.Employee&lt;/value&gt;
+ *             &lt;/list&gt;
+ *         &lt;/property&gt;
+ *     &lt;/bean&gt;
+ * &lt;/property&gt;
+ * ...
+ * </pre>
+ * or from code:
+ * <pre name=code class=java>
+ * GridConfiguration gridCfg = new GridConfiguration();
+ *
+ * GridPortableConfiguration portCfg = new GridPortableConfiguration();
+ *
+ * portCfg.setClassNames(Arrays.asList(
+ *     Employee.class.getName(),
+ *     Address.class.getName())
+ * );
+ *
+ * gridCfg.setPortableConfiguration(portCfg);
+ * </pre>
+ * You can also specify class name for a portable object via {@link org.gridgain.grid.portables.GridPortableTypeConfiguration}.
+ * Do it in case if you need to override other configuration properties on per-type level, like
+ * ID-mapper, or serializer.
+ * <h1 class="header">Custom Affinity Keys</h1>
+ * Often you need to specify an alternate key (not the cache key) for affinity routing whenever
+ * storing objects in cache. For example, if you are caching {@code Employee} object with
+ * {@code Organization}, and want to colocate employees with organization they work for,
+ * so you can process them together, you need to specify an alternate affinity key.
+ * With portable objects you would have to do it as following:
+ * <pre name=code class=xml>
+ * &lt;property name="portableConfiguration"&gt;
+ *     &lt;bean class="org.gridgain.grid.portables.GridPortableConfiguration"&gt;
+ *         ...
+ *         &lt;property name="typeConfigurations"&gt;
+ *             &lt;list&gt;
+ *                 &lt;bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration"&gt;
+ *                     &lt;property name="className" value="org.gridgain.examples.client.portable.EmployeeKey"/&gt;
+ *                     &lt;property name="affinityKeyFieldName" value="organizationId"/&gt;
+ *                 &lt;/bean&gt;
+ *             &lt;/list&gt;
+ *         &lt;/property&gt;
+ *         ...
+ *     &lt;/bean&gt;
+ * &lt;/property&gt;
+ * </pre>
+ * <h1 class="header">Serialization</h1>
+ * Once portable object is specified in {@link org.gridgain.grid.portables.GridPortableConfiguration}, GridGain will
+ * be able to serialize and deserialize it. However, you can provide your own custom
+ * serialization logic by optionally implementing {@link org.gridgain.grid.portables.GridPortableMarshalAware} interface, like so:
+ * <pre name=code class=java>
+ * public class Address implements GridPortableMarshalAware {
+ *     private String street;
+ *     private int zip;
+ *
+ *     // Empty constructor required for portable deserialization.
+ *     public Address() {}
+ *
+ *     &#64;Override public void writePortable(GridPortableWriter writer) throws GridPortableException {
+ *         writer.writeString("street", street);
+ *         writer.writeInt("zip", zip);
+ *     }
+ *
+ *     &#64;Override public void readPortable(GridPortableReader reader) throws GridPortableException {
+ *         street = reader.readString("street");
+ *         zip = reader.readInt("zip");
+ *     }
+ * }
+ * </pre>
+ * Alternatively, if you cannot change class definitions, you can provide custom serialization
+ * logic in {@link org.gridgain.grid.portables.GridPortableSerializer} either globally in {@link org.gridgain.grid.portables.GridPortableConfiguration} or
+ * for a specific type via {@link org.gridgain.grid.portables.GridPortableTypeConfiguration} instance.
+ * <p>
+ * Similar to java serialization you can use {@code writeReplace()} and {@code readResolve()} methods.
+ * <ul>
+ *     <li>
+ *         {@code readResolve} is defined as follows: {@code ANY-ACCESS-MODIFIER Object readResolve()}.
+ *         It may be used to replace the de-serialized object by another one of your choice.
+ *     </li>
+ *     <li>
+ *          {@code writeReplace} is defined as follows: {@code ANY-ACCESS-MODIFIER Object writeReplace()}. This method allows the
+ *          developer to provide a replacement object that will be serialized instead of the original one.
+ *     </li>
+ * </ul>
+ *
+ * <h1 class="header">Custom ID Mappers</h1>
+ * GridGain implementation uses name hash codes to generate IDs for class names or field names
+ * internally. However, in cases when you want to provide your own ID mapping schema,
+ * you can provide your own {@link org.gridgain.grid.portables.GridPortableIdMapper} implementation.
+ * <p>
+ * ID-mapper may be provided either globally in {@link org.gridgain.grid.portables.GridPortableConfiguration},
+ * or for a specific type via {@link org.gridgain.grid.portables.GridPortableTypeConfiguration} instance.
+ * <h1 class="header">Query Indexing</h1>
+ * Portable objects can be indexed for querying by specifying index fields in
+ * {@link GridCacheQueryTypeMetadata} inside of specific {@link GridCacheConfiguration} instance,
+ * like so:
+ * <pre name=code class=xml>
+ * ...
+ * &lt;bean class="org.gridgain.grid.cache.GridCacheConfiguration"&gt;
+ *     ...
+ *     &lt;property name="queryConfiguration"&gt;
+ *         &lt;bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration"&gt;
+ *             &lt;property name="typeMetadata"&gt;
+ *                 &lt;list&gt;
+ *                     &lt;bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"&gt;
+ *                         &lt;property name="type" value="Employee"/&gt;
+ *
+ *                         &lt;!-- Fields to index in ascending order. --&gt;
+ *                         &lt;property name="ascendingFields"&gt;
+ *                             &lt;map&gt;
+ *                             	&lt;entry key="name" value="java.lang.String"/&gt;
+ *
+ *                                 &lt;!-- Nested portable objects can also be indexed. --&gt;
+ *                                 &lt;entry key="address.zip" value="java.lang.Integer"/&gt;
+ *                             &lt;/map&gt;
+ *                         &lt;/property&gt;
+ *                     &lt;/bean&gt;
+ *                 &lt;/list&gt;
+ *             &lt;/property&gt;
+ *         &lt;/bean&gt;
+ *     &lt;/property&gt;
+ * &lt;/bean&gt;
+ * </pre>
+ */
+public interface IgnitePortables {
+    /**
+     * Gets type ID for given type name.
+     *
+     * @param typeName Type name.
+     * @return Type ID.
+     */
+    public int typeId(String typeName);
+
+    /**
+     * Converts provided object to instance of {@link org.gridgain.grid.portables.GridPortableObject}.
+     * <p>
+     * Note that object's type needs to be configured in {@link org.gridgain.grid.portables.GridPortableConfiguration}.
+     *
+     * @param obj Object to convert.
+     * @return Converted object.
+     * @throws org.gridgain.grid.portables.GridPortableException In case of error.
+     */
+    public <T> T toPortable(@Nullable Object obj) throws GridPortableException;
+
+    /**
+     * Creates new portable builder.
+     *
+     * @param typeId ID of the type.
+     * @return Newly portable builder.
+     */
+    public GridPortableBuilder builder(int typeId);
+
+    /**
+     * Creates new portable builder.
+     *
+     * @param typeName Type name.
+     * @return Newly portable builder.
+     */
+    public GridPortableBuilder builder(String typeName);
+
+    /**
+     * Creates portable builder initialized by existing portable object.
+     *
+     * @param portableObj Portable object to initialize builder.
+     * @return Portable builder.
+     */
+    public GridPortableBuilder builder(GridPortableObject portableObj);
+
+    /**
+     * Gets metadata for provided class.
+     *
+     * @param cls Class.
+     * @return Metadata.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public GridPortableMetadata metadata(Class<?> cls) throws GridPortableException;
+
+    /**
+     * Gets metadata for provided class name.
+     *
+     * @param typeName Type name.
+     * @return Metadata.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public GridPortableMetadata metadata(String typeName) throws GridPortableException;
+
+    /**
+     * Gets metadata for provided type ID.
+     *
+     * @param typeId Type ID.
+     * @return Metadata.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public GridPortableMetadata metadata(int typeId) throws GridPortableException;
+
+    /**
+     * Gets metadata for all known types.
+     *
+     * @return Metadata.
+     * @throws GridPortableException In case of error.
+     */
+    public Collection<GridPortableMetadata> metadata() throws GridPortableException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcb5222/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
index c257015..e054e18 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
@@ -88,7 +88,7 @@ import java.util.Date;
  *     </li>
  * </ul>
  *
- * @see org.gridgain.grid.portables.IgnitePortables
+ * @see org.apache.ignite.IgnitePortables
  */
 public interface GridCacheStore<K, V> {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcb5222/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
index 29f36dd..146cf62 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.portable.*;
 import org.gridgain.grid.portables.*;
 import org.jetbrains.annotations.*;
@@ -16,7 +17,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 /**
- * {@link org.gridgain.grid.portables.IgnitePortables} implementation.
+ * {@link org.apache.ignite.IgnitePortables} implementation.
  */
 public class GridPortablesImpl implements IgnitePortables {
     /** */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcb5222/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
index 76744b0..938c8e5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.visor.portable;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcb5222/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
index 4201fd3..813acf8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
@@ -53,9 +53,9 @@ import org.jetbrains.annotations.*;
  * String city = personPortableObj.getField("address").getField("city");
  * </pre>
  *
- * @see IgnitePortables#builder(int)
- * @see IgnitePortables#builder(String)
- * @see IgnitePortables#builder(GridPortableObject)
+ * @see org.apache.ignite.IgnitePortables#builder(int)
+ * @see org.apache.ignite.IgnitePortables#builder(String)
+ * @see org.apache.ignite.IgnitePortables#builder(GridPortableObject)
  */
 public interface GridPortableBuilder {
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcb5222/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
index f7103c9..59dff2b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
+++ b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
@@ -15,7 +15,7 @@ import java.util.*;
 
 /**
  * Portable type meta data. Metadata for portable types can be accessed from any of the
- * {@link IgnitePortables#metadata(String) GridPortables.metadata(...)} methods.
+ * {@link org.apache.ignite.IgnitePortables#metadata(String) GridPortables.metadata(...)} methods.
  * Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
  * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcb5222/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
index c201e7b..952c5c8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
+++ b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
@@ -105,7 +105,7 @@ import java.util.*;
  * <h1 class="header">Portable Metadata</h1>
  * Even though GridGain portable protocol only works with hash codes for type and field names
  * to achieve better performance, GridGain provides metadata for all portable types which
- * can be queried ar runtime via any of the {@link IgnitePortables#metadata(Class) GridPortables.metadata(...)}
+ * can be queried ar runtime via any of the {@link org.apache.ignite.IgnitePortables#metadata(Class) GridPortables.metadata(...)}
  * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
  * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
  */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3dcb5222/modules/core/src/main/java/org/gridgain/grid/portables/IgnitePortables.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/IgnitePortables.java b/modules/core/src/main/java/org/gridgain/grid/portables/IgnitePortables.java
deleted file mode 100644
index 6471551..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/IgnitePortables.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
-import org.jetbrains.annotations.*;
-
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-
-/**
- * Defines portable objects functionality. With portable objects you are able to:
- * <ul>
- * <li>Seamlessly interoperate between Java, .NET, and C++.</li>
- * <li>Make any object portable with zero code change to your existing code.</li>
- * <li>Nest portable objects within each other.</li>
- * <li>Automatically handle {@code circular} or {@code null} references.</li>
- * <li>Automatically convert collections and maps between Java, .NET, and C++.</li>
- * <li>
- *      Optionally avoid deserialization of objects on the server side
- *      (objects are stored in {@link GridPortableObject} format).
- * </li>
- * <li>Avoid need to have concrete class definitions on the server side.</li>
- * <li>Dynamically change structure of the classes without having to restart the cluster.</li>
- * <li>Index into portable objects for querying purposes.</li>
- * </ul>
- * <h1 class="header">Working With Portables Directly</h1>
- * Once an object is defined as portable,
- * GridGain will always store it in memory in the portable (i.e. binary) format.
- * User can choose to work either with the portable format or with the deserialized form
- * (assuming that class definitions are present in the classpath).
- * <p>
- * To work with the portable format directly, user should create a special cache projection
- * using {@link GridCacheProjection#keepPortable()} method and then retrieve individual fields as needed:
- * <pre name=code class=java>
- * GridCacheProjection&lt;GridPortableObject.class, GridPortableObject.class&gt; prj = cache.keepPortable();
- *
- * // Convert instance of MyKey to portable format.
- * // We could also use GridPortableBuilder to create
- * // the key in portable format directly.
- * GridPortableObject key = grid.portables().toPortable(new MyKey());
- *
- * GridPortableObject val = prj.get(key);
- *
- * String field = val.field("myFieldName");
- * </pre>
- * Alternatively, if we have class definitions in the classpath, we may choose to work with deserialized
- * typed objects at all times. In this case we do incur the deserialization cost, however,
- * GridGain will only deserialize on the first access and will cache the deserialized object,
- * so it does not have to be deserialized again:
- * <pre name=code class=java>
- * GridCacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
- *     cache.projection(MyKey.class, MyValue.class);
- *
- * MyValue val = prj.get(new MyKey());
- *
- * // Normal java getter.
- * String fieldVal = val.getMyFieldName();
- * </pre>
- * If we used, for example, one of the automatically handled portable types for a key, like integer,
- * and still wanted to work with binary portable format for values, then we would declare cache projection
- * as follows:
- * <pre name=code class=java>
- * GridCacheProjection&lt;Integer.class, GridPortableObject.class&gt; prj = cache.keepPortable();
- * </pre>
- * <h1 class="header">Automatic Portable Types</h1>
- * Note that only portable classes are converted to {@link GridPortableObject} format. Following
- * classes are never converted (e.g., {@link #toPortable(Object)} method will return original
- * object, and instances of these classes will be stored in cache without changes):
- * <ul>
- *     <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li>
- *     <li>Arrays of primitives (byte[], int[], ...)</li>
- *     <li>{@link String} and array of {@link String}s</li>
- *     <li>{@link UUID} and array of {@link UUID}s</li>
- *     <li>{@link Date} and array of {@link Date}s</li>
- *     <li>{@link Timestamp} and array of {@link Timestamp}s</li>
- *     <li>Enums and array of enums</li>
- *     <li>
- *         Maps, collections and array of objects (but objects inside
- *         them will still be converted if they are portable)
- *     </li>
- * </ul>
- * <h1 class="header">Working With Maps and Collections</h1>
- * All maps and collections in the portable objects are serialized automatically. When working
- * with different platforms, e.g. C++ or .NET, GridGain will automatically pick the most
- * adequate collection or map in either language. For example, {@link ArrayList} in Java will become
- * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap}
- * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
- * in C#, etc.
- * <h1 class="header">Building Portable Objects</h1>
- * GridGain comes with {@link GridPortableBuilder} which allows to build portable objects dynamically:
- * <pre name=code class=java>
- * GridPortableBuilder builder = GridGain.grid().portables().builder();
- *
- * builder.typeId("MyObject");
- *
- * builder.stringField("fieldA", "A");
- * build.intField("fieldB", "B");
- *
- * GridPortableObject portableObj = builder.build();
- * </pre>
- * For the cases when class definition is present
- * in the class path, it is also possible to populate a standard POJO and then
- * convert it to portable format, like so:
- * <pre name=code class=java>
- * MyObject obj = new MyObject();
- *
- * obj.setFieldA("A");
- * obj.setFieldB(123);
- *
- * GridPortableObject portableObj = GridGain.grid().portables().toPortable(obj);
- * </pre>
- * NOTE: you don't need to convert typed objects to portable format before storing
- * them in cache, GridGain will do that automatically.
- * <h1 class="header">Portable Metadata</h1>
- * Even though GridGain portable protocol only works with hash codes for type and field names
- * to achieve better performance, GridGain provides metadata for all portable types which
- * can be queried ar runtime via any of the {@link IgnitePortables#metadata(Class) GridPortables.metadata(...)}
- * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
- * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
- * <h1 class="header">Dynamic Structure Changes</h1>
- * Since objects are always cached in the portable binary format, server does not need to
- * be aware of the class definitions. Moreover, if class definitions are not present or not
- * used on the server, then clients can continuously change the structure of the portable
- * objects without having to restart the cluster. For example, if one client stores a
- * certain class with fields A and B, and another client stores the same class with
- * fields B and C, then the server-side portable object will have the fields A, B, and C.
- * As the structure of a portable object changes, the new fields become available for SQL queries
- * automatically.
- * <h1 class="header">Configuration</h1>
- * To make any object portable, you have to specify it in {@link GridPortableConfiguration}
- * at startup. The only requirement GridGain imposes is that your object has an empty
- * constructor. Note, that since server side does not have to know the class definition,
- * you only need to list portable objects in configuration on the client side. However, if you
- * list them on the server side as well, then you get the ability to deserialize portable objects
- * into concrete types on the server as well as on the client.
- * <p>
- * Here is an example of portable configuration (note that star (*) notation is supported):
- * <pre name=code class=xml>
- * ...
- * &lt;!-- Portable objects configuration. --&gt;
- * &lt;property name="portableConfiguration"&gt;
- *     &lt;bean class="org.gridgain.grid.portables.GridPortableConfiguration"&gt;
- *         &lt;property name="classNames"&gt;
- *             &lt;list&gt;
- *                 &lt;value&gt;my.package.for.portable.objects.*&lt;/value&gt;
- *                 &lt;value&gt;org.gridgain.examples.client.portable.Employee&lt;/value&gt;
- *             &lt;/list&gt;
- *         &lt;/property&gt;
- *     &lt;/bean&gt;
- * &lt;/property&gt;
- * ...
- * </pre>
- * or from code:
- * <pre name=code class=java>
- * GridConfiguration gridCfg = new GridConfiguration();
- *
- * GridPortableConfiguration portCfg = new GridPortableConfiguration();
- *
- * portCfg.setClassNames(Arrays.asList(
- *     Employee.class.getName(),
- *     Address.class.getName())
- * );
- *
- * gridCfg.setPortableConfiguration(portCfg);
- * </pre>
- * You can also specify class name for a portable object via {@link GridPortableTypeConfiguration}.
- * Do it in case if you need to override other configuration properties on per-type level, like
- * ID-mapper, or serializer.
- * <h1 class="header">Custom Affinity Keys</h1>
- * Often you need to specify an alternate key (not the cache key) for affinity routing whenever
- * storing objects in cache. For example, if you are caching {@code Employee} object with
- * {@code Organization}, and want to colocate employees with organization they work for,
- * so you can process them together, you need to specify an alternate affinity key.
- * With portable objects you would have to do it as following:
- * <pre name=code class=xml>
- * &lt;property name="portableConfiguration"&gt;
- *     &lt;bean class="org.gridgain.grid.portables.GridPortableConfiguration"&gt;
- *         ...
- *         &lt;property name="typeConfigurations"&gt;
- *             &lt;list&gt;
- *                 &lt;bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration"&gt;
- *                     &lt;property name="className" value="org.gridgain.examples.client.portable.EmployeeKey"/&gt;
- *                     &lt;property name="affinityKeyFieldName" value="organizationId"/&gt;
- *                 &lt;/bean&gt;
- *             &lt;/list&gt;
- *         &lt;/property&gt;
- *         ...
- *     &lt;/bean&gt;
- * &lt;/property&gt;
- * </pre>
- * <h1 class="header">Serialization</h1>
- * Once portable object is specified in {@link GridPortableConfiguration}, GridGain will
- * be able to serialize and deserialize it. However, you can provide your own custom
- * serialization logic by optionally implementing {@link GridPortableMarshalAware} interface, like so:
- * <pre name=code class=java>
- * public class Address implements GridPortableMarshalAware {
- *     private String street;
- *     private int zip;
- *
- *     // Empty constructor required for portable deserialization.
- *     public Address() {}
- *
- *     &#64;Override public void writePortable(GridPortableWriter writer) throws GridPortableException {
- *         writer.writeString("street", street);
- *         writer.writeInt("zip", zip);
- *     }
- *
- *     &#64;Override public void readPortable(GridPortableReader reader) throws GridPortableException {
- *         street = reader.readString("street");
- *         zip = reader.readInt("zip");
- *     }
- * }
- * </pre>
- * Alternatively, if you cannot change class definitions, you can provide custom serialization
- * logic in {@link GridPortableSerializer} either globally in {@link GridPortableConfiguration} or
- * for a specific type via {@link GridPortableTypeConfiguration} instance.
- * <p>
- * Similar to java serialization you can use {@code writeReplace()} and {@code readResolve()} methods.
- * <ul>
- *     <li>
- *         {@code readResolve} is defined as follows: {@code ANY-ACCESS-MODIFIER Object readResolve()}.
- *         It may be used to replace the de-serialized object by another one of your choice.
- *     </li>
- *     <li>
- *          {@code writeReplace} is defined as follows: {@code ANY-ACCESS-MODIFIER Object writeReplace()}. This method allows the
- *          developer to provide a replacement object that will be serialized instead of the original one.
- *     </li>
- * </ul>
- *
- * <h1 class="header">Custom ID Mappers</h1>
- * GridGain implementation uses name hash codes to generate IDs for class names or field names
- * internally. However, in cases when you want to provide your own ID mapping schema,
- * you can provide your own {@link GridPortableIdMapper} implementation.
- * <p>
- * ID-mapper may be provided either globally in {@link GridPortableConfiguration},
- * or for a specific type via {@link GridPortableTypeConfiguration} instance.
- * <h1 class="header">Query Indexing</h1>
- * Portable objects can be indexed for querying by specifying index fields in
- * {@link GridCacheQueryTypeMetadata} inside of specific {@link GridCacheConfiguration} instance,
- * like so:
- * <pre name=code class=xml>
- * ...
- * &lt;bean class="org.gridgain.grid.cache.GridCacheConfiguration"&gt;
- *     ...
- *     &lt;property name="queryConfiguration"&gt;
- *         &lt;bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration"&gt;
- *             &lt;property name="typeMetadata"&gt;
- *                 &lt;list&gt;
- *                     &lt;bean class="org.gridgain.grid.cache.query.GridCacheQueryTypeMetadata"&gt;
- *                         &lt;property name="type" value="Employee"/&gt;
- *
- *                         &lt;!-- Fields to index in ascending order. --&gt;
- *                         &lt;property name="ascendingFields"&gt;
- *                             &lt;map&gt;
- *                             	&lt;entry key="name" value="java.lang.String"/&gt;
- *
- *                                 &lt;!-- Nested portable objects can also be indexed. --&gt;
- *                                 &lt;entry key="address.zip" value="java.lang.Integer"/&gt;
- *                             &lt;/map&gt;
- *                         &lt;/property&gt;
- *                     &lt;/bean&gt;
- *                 &lt;/list&gt;
- *             &lt;/property&gt;
- *         &lt;/bean&gt;
- *     &lt;/property&gt;
- * &lt;/bean&gt;
- * </pre>
- */
-public interface IgnitePortables {
-    /**
-     * Gets type ID for given type name.
-     *
-     * @param typeName Type name.
-     * @return Type ID.
-     */
-    public int typeId(String typeName);
-
-    /**
-     * Converts provided object to instance of {@link GridPortableObject}.
-     * <p>
-     * Note that object's type needs to be configured in {@link GridPortableConfiguration}.
-     *
-     * @param obj Object to convert.
-     * @return Converted object.
-     * @throws GridPortableException In case of error.
-     */
-    public <T> T toPortable(@Nullable Object obj) throws GridPortableException;
-
-    /**
-     * Creates new portable builder.
-     *
-     * @param typeId ID of the type.
-     * @return Newly portable builder.
-     */
-    public GridPortableBuilder builder(int typeId);
-
-    /**
-     * Creates new portable builder.
-     *
-     * @param typeName Type name.
-     * @return Newly portable builder.
-     */
-    public GridPortableBuilder builder(String typeName);
-
-    /**
-     * Creates portable builder initialized by existing portable object.
-     *
-     * @param portableObj Portable object to initialize builder.
-     * @return Portable builder.
-     */
-    public GridPortableBuilder builder(GridPortableObject portableObj);
-
-    /**
-     * Gets metadata for provided class.
-     *
-     * @param cls Class.
-     * @return Metadata.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public GridPortableMetadata metadata(Class<?> cls) throws GridPortableException;
-
-    /**
-     * Gets metadata for provided class name.
-     *
-     * @param typeName Type name.
-     * @return Metadata.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public GridPortableMetadata metadata(String typeName) throws GridPortableException;
-
-    /**
-     * Gets metadata for provided type ID.
-     *
-     * @param typeId Type ID.
-     * @return Metadata.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public GridPortableMetadata metadata(int typeId) throws GridPortableException;
-
-    /**
-     * Gets metadata for all known types.
-     *
-     * @return Metadata.
-     * @throws GridPortableException In case of error.
-     */
-    public Collection<GridPortableMetadata> metadata() throws GridPortableException;
-}


[32/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
index 22c0942..a53c004 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/spi/indexing/h2/opt/GridLuceneIndexLoadTest.java
@@ -27,7 +27,7 @@ public class GridLuceneIndexLoadTest {
      */
     @SuppressWarnings("ZeroLengthArrayAllocation")
     public static void main(String ... args) throws GridSpiException, FileNotFoundException {
-        final GridOptimizedMarshaller m = new GridOptimizedMarshaller();
+        final IgniteOptimizedMarshaller m = new IgniteOptimizedMarshaller();
 
         GridIndexingTypeDescriptor desc = new GridIndexingTypeDescriptor() {
             @Override public String name() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java b/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java
index 8c41970..6ee1029 100644
--- a/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/loadtests/h2indexing/GridH2IndexingSpiLoadTest.java
@@ -102,7 +102,7 @@ public class GridH2IndexingSpiLoadTest {
 
         c.setDiscoverySpi(discoSpi);
 
-        GridOptimizedMarshaller m = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller m = new IgniteOptimizedMarshaller();
 
         m.setClassNames(F.asList(GridTestEntity.class.getName()));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
index 05533bb..dfada7c 100644
--- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
+++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
@@ -42,7 +42,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
index e1366d7..b558d4c 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
@@ -27,7 +27,7 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest
     private static final GridTcpDiscoveryIpFinder IP_FINDER = new GridTcpDiscoveryVmIpFinder(true);
 
     /** Marshaller. */
-    private static final GridMarshaller MARSHALLER = new GridOptimizedMarshaller();
+    private static final GridMarshaller MARSHALLER = new IgniteOptimizedMarshaller();
 
     /** Attribute key. */
     private static final String ATTR_KEY = "checkAttr";


[08/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: ba7a05dbf134a1eb25ca3cf0244c9374e0e82df9
Parents: 167133f
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:42:49 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:42:49 2014 +0300

----------------------------------------------------------------------
 config/java.util.logging.properties             |   4 +-
 config/router/default-router.xml                |   2 +-
 .../processors/rest/GridTestBinaryClient.java   |   2 +-
 .../processors/rest/GridTestMemcacheClient.java |   2 +-
 .../ignite/logger/GridLoggerNodeIdAware.java    |  31 --
 .../apache/ignite/logger/GridNullLogger.java    |  83 ----
 .../ignite/logger/IgniteLoggerNodeIdAware.java  |  31 ++
 .../apache/ignite/logger/IgniteNullLogger.java  |  83 ++++
 .../ignite/logger/java/GridJavaLogger.java      | 382 -------------------
 .../logger/java/GridJavaLoggerFileHandler.java  | 182 ---------
 .../logger/java/GridJavaLoggerFormatter.java    |  71 ----
 .../ignite/logger/java/IgniteJavaLogger.java    | 382 +++++++++++++++++++
 .../java/IgniteJavaLoggerFileHandler.java       | 182 +++++++++
 .../logger/java/IgniteJavaLoggerFormatter.java  |  71 ++++
 .../GridClientConnectionManagerAdapter.java     |   2 +-
 .../client/router/impl/GridTcpRouterImpl.java   |   2 +-
 .../gridgain/grid/GridBasicWarmupClosure.java   |   2 +-
 .../org/gridgain/grid/kernal/GridGainEx.java    |   6 +-
 .../grid/kernal/GridLifecycleAwareSelfTest.java |   2 +-
 .../grid/logger/java/GridJavaLoggerTest.java    |   6 +-
 .../marshaller/GridMarshallerResourceBean.java  |   2 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |   4 +-
 ...tartupWithUndefinedGridGainHomeSelfTest.java |   2 +-
 .../shmem/GridGgfsSharedMemoryTestClient.java   |   2 +-
 .../shmem/GridIpcSharedMemoryFakeClient.java    |   6 +-
 .../GridIpcSharedMemoryBenchmarkWriter.java     |   2 +-
 .../logger/GridLog4jRollingFileAppender.java    |   2 +-
 .../junits/logger/GridTestLog4jLogger.java      |   6 +-
 .../grid/logger/log4j/GridLog4jLogger.java      |   2 +-
 29 files changed, 778 insertions(+), 778 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/config/java.util.logging.properties
----------------------------------------------------------------------
diff --git a/config/java.util.logging.properties b/config/java.util.logging.properties
index d3cf472..aa28135 100644
--- a/config/java.util.logging.properties
+++ b/config/java.util.logging.properties
@@ -54,14 +54,14 @@ handlers=java.util.logging.ConsoleHandler, org.gridgain.grid.logger.java.GridJav
 # Console handler logs all messages with importance level `INFO` and above
 # into standard error stream (`System.err`).
 #
-java.util.logging.ConsoleHandler.formatter=org.apache.ignite.logger.java.GridJavaLoggerFormatter
+java.util.logging.ConsoleHandler.formatter=org.apache.ignite.logger.java.IgniteJavaLoggerFormatter
 java.util.logging.ConsoleHandler.level=INFO
 
 #
 # File handler logs all messages into files with pattern `gridgain-%{id8}.%g.log`
 # under `$GRIDGAIN_HOME/work/log/` directory. The placeholder `%{id8}` is a truncated node ID.
 #
-org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.formatter=org.apache.ignite.logger.java.GridJavaLoggerFormatter
+org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.formatter=org.apache.ignite.logger.java.IgniteJavaLoggerFormatter
 org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.pattern=gridgain-%{id8}.%g.log
 org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.level=INFO
 org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.limit=10485760

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/config/router/default-router.xml
----------------------------------------------------------------------
diff --git a/config/router/default-router.xml b/config/router/default-router.xml
index d4fd036..735d347 100644
--- a/config/router/default-router.xml
+++ b/config/router/default-router.xml
@@ -41,5 +41,5 @@
     <!--
         Logger with the same configuration as in default grid instances.
     -->
-    <bean id="router.log" class="org.apache.ignite.logger.java.GridJavaLogger"/>
+    <bean id="router.log" class="org.apache.ignite.logger.java.IgniteJavaLogger"/>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
index 5397115..d2adfc0 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
@@ -34,7 +34,7 @@ import static org.gridgain.grid.kernal.processors.rest.client.message.GridClient
  */
 final class GridTestBinaryClient {
     /** Logger. */
-    private final IgniteLogger log = new GridJavaLogger();
+    private final IgniteLogger log = new IgniteJavaLogger();
 
     /** Marshaller. */
     private final GridClientMarshaller marsh = new GridClientOptimizedMarshaller();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
index 23656b9..4f7ac77 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
@@ -58,7 +58,7 @@ final class GridTestMemcacheClient {
     private static final short BYTE_ARR_FLAG = (8 << 8);
 
     /** Logger. */
-    private final IgniteLogger log = new GridJavaLogger();
+    private final IgniteLogger log = new IgniteJavaLogger();
 
     /** JDK marshaller. */
     private final GridMarshaller jdkMarshaller = new GridJdkMarshaller();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java b/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java
deleted file mode 100644
index 7ddcd64..0000000
--- a/modules/core/src/main/java/org/apache/ignite/logger/GridLoggerNodeIdAware.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger;
-
-import java.util.*;
-
-/**
- * Interface for GridGain file appenders to attach node ID to log file names.
- */
-public interface GridLoggerNodeIdAware {
-    /**
-     * Sets node ID.
-     *
-     * @param nodeId Node ID.
-     */
-    public void setNodeId(UUID nodeId);
-
-    /**
-     * Gets node ID.
-     *
-     * @return Node ID.
-     */
-    public UUID getNodeId();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java
deleted file mode 100644
index dfb7e31..0000000
--- a/modules/core/src/main/java/org/apache/ignite/logger/GridNullLogger.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger;
-
-import org.apache.ignite.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Logger which does not output anything.
- */
-public class GridNullLogger implements IgniteLogger {
-    /** {@inheritDoc} */
-    @Override public IgniteLogger getLogger(Object ctgr) {
-        return this;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void trace(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void debug(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void info(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg, @Nullable Throwable e) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg, @Nullable Throwable e) {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isTraceEnabled() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isDebugEnabled() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isInfoEnabled() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isQuiet() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public String fileName() {
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java b/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java
new file mode 100644
index 0000000..146ed05
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/IgniteLoggerNodeIdAware.java
@@ -0,0 +1,31 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger;
+
+import java.util.*;
+
+/**
+ * Interface for GridGain file appenders to attach node ID to log file names.
+ */
+public interface IgniteLoggerNodeIdAware {
+    /**
+     * Sets node ID.
+     *
+     * @param nodeId Node ID.
+     */
+    public void setNodeId(UUID nodeId);
+
+    /**
+     * Gets node ID.
+     *
+     * @return Node ID.
+     */
+    public UUID getNodeId();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/IgniteNullLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/IgniteNullLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/IgniteNullLogger.java
new file mode 100644
index 0000000..ad337da
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/IgniteNullLogger.java
@@ -0,0 +1,83 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger;
+
+import org.apache.ignite.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Logger which does not output anything.
+ */
+public class IgniteNullLogger implements IgniteLogger {
+    /** {@inheritDoc} */
+    @Override public IgniteLogger getLogger(Object ctgr) {
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void trace(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void debug(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void info(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg, @Nullable Throwable e) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg, @Nullable Throwable e) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isTraceEnabled() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isDebugEnabled() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isInfoEnabled() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isQuiet() {
+        return false;
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public String fileName() {
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLogger.java
deleted file mode 100644
index d2c8ff4..0000000
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLogger.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.java;
-
-import org.apache.ignite.*;
-import org.apache.ignite.logger.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.lang.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
-
-import static java.util.logging.Level.*;
-import static org.gridgain.grid.GridSystemProperties.*;
-
-/**
- * Logger to use with Java logging. Implementation simply delegates to Java Logging.
- * <p>
- * Here is an example of configuring Java logger in GridGain configuration Spring
- * file to work over log4j implementation. Note that we use the same configuration file
- * as we provide by default:
- * <pre name="code" class="xml">
- *      ...
- *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"&gt;
- *              &lt;constructor-arg type="java.util.logging.Logger"&gt;
- *                  &lt;bean class="java.util.logging.Logger"&gt;
- *                      &lt;constructor-arg type="java.lang.String" value="global"/&gt;
- *                  &lt;/bean&gt;
- *              &lt;/constructor-arg&gt;
- *          &lt;/bean&gt;
- *      &lt;/property&gt;
- *      ...
- * </pre>
- * or
- * <pre name="code" class="xml">
- *      ...
- *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"/&gt;
- *      &lt;/property&gt;
- *      ...
- * </pre>
- * And the same configuration if you'd like to configure GridGain in your code:
- * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
- *      ...
- *      GridLogger log = new GridJavaLogger(Logger.global);
- *      ...
- *      cfg.setGridLogger(log);
- * </pre>
- * or which is actually the same:
- * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
- *      ...
- *      GridLogger log = new GridJavaLogger();
- *      ...
- *      cfg.setGridLogger(log);
- * </pre>
- * Please take a look at <a target=_new href="http://java.sun.com/j2se/1.4.2/docs/api20/java/util/logging/Logger.html">Logger javadoc</a>
- * for additional information.
- * <p>
- * It's recommended to use GridGain logger injection instead of using/instantiating
- * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
- * injection.
- */
-public class GridJavaLogger extends GridMetadataAwareAdapter implements IgniteLogger, GridLoggerNodeIdAware {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
-    public static final String DFLT_CONFIG_PATH = "config/java.util.logging.properties";
-
-    /** */
-    private static final Object mux = new Object();
-
-    /** */
-    private static volatile boolean inited;
-
-    /** */
-    private static volatile boolean quiet0;
-
-    /** Java Logging implementation proxy. */
-    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-    private Logger impl;
-
-    /** Quiet flag. */
-    private final boolean quiet;
-
-    /** Node ID. */
-    private volatile UUID nodeId;
-
-    /**
-     * Creates new logger.
-     */
-    public GridJavaLogger() {
-        this(!isConfigured());
-    }
-
-    /**
-     * Checks if logger is already configured within this VM or not.
-     *
-     * @return {@code True} if logger was already configured, {@code false} otherwise.
-     */
-    public static boolean isConfigured() {
-        return System.getProperty("java.util.logging.config.file") != null;
-    }
-
-    /**
-     * Reads default JUL configuration.
-     */
-    private void defaultConfiguration() {
-        final URL cfgUrl = U.resolveGridGainUrl(DFLT_CONFIG_PATH);
-
-        if (cfgUrl == null) {
-            error("Failed to resolve default logging config file: " + DFLT_CONFIG_PATH);
-
-            return;
-        }
-
-        try (InputStream in = cfgUrl.openStream()) {
-            LogManager.getLogManager().readConfiguration(in);
-        }
-        catch (IOException e) {
-            error("Failed to read logging configuration: " + cfgUrl, e);
-        }
-    }
-
-    /**
-     * Creates new logger.
-     *
-     * @param init If {@code true}, then a default console appender will be created.
-     *      If {@code false}, then no implicit initialization will take place,
-     *      and java logger should be configured prior to calling this constructor.
-     */
-    public GridJavaLogger(boolean init) {
-        impl = Logger.getLogger("");
-
-        if (init) {
-            // Implementation has already been inited, passing NULL.
-            configure(null);
-
-            quiet = quiet0;
-        }
-        else
-            quiet = true;
-    }
-
-    /**
-     * Creates new logger with given implementation.
-     *
-     * @param impl Java Logging implementation to use.
-     */
-    public GridJavaLogger(final Logger impl) {
-        assert impl != null;
-
-        configure(impl);
-
-        quiet = quiet0;
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteLogger getLogger(Object ctgr) {
-        return new GridJavaLogger(ctgr == null ? Logger.getLogger("") : Logger.getLogger(
-            ctgr instanceof Class ? ((Class)ctgr).getName() : String.valueOf(ctgr)));
-    }
-
-    /**
-     * Configures handlers when needed.
-     *
-     * @param initImpl Optional log implementation.
-     */
-    private void configure(@Nullable Logger initImpl) {
-        if (initImpl != null)
-            impl = initImpl;
-
-        if (inited)
-            return;
-
-        synchronized (mux) {
-            if (inited)
-                return;
-
-            if (isConfigured()) {
-                boolean consoleHndFound = findHandler(impl, ConsoleHandler.class) != null;
-
-                // User configured console appender, thus log is not quiet.
-                quiet0 = !consoleHndFound;
-                inited = true;
-
-                return;
-            }
-
-            defaultConfiguration();
-
-            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
-            boolean useConsoleAppender = Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"));
-
-            if (useConsoleAppender) {
-                ConsoleHandler consoleHnd = findHandler(impl, ConsoleHandler.class);
-
-                if (consoleHnd != null)
-                    consoleHnd.setLevel(quiet ? SEVERE : INFO);
-                else
-                    System.err.println("Console logging handler is not configured.");
-            }
-            else {
-                Handler[] handlers = Logger.getLogger("").getHandlers();
-
-                if  (!F.isEmpty(handlers)) {
-                    for (Handler h : handlers) {
-                        if (h instanceof ConsoleHandler)
-                            impl.removeHandler(h);
-                    }
-                }
-            }
-
-            quiet0 = quiet;
-            inited = true;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void trace(String msg) {
-        if (!impl.isLoggable(FINEST))
-            warning("Logging at TRACE level without checking if TRACE level is enabled: " + msg);
-
-        impl.finest(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void debug(String msg) {
-        if (!impl.isLoggable(FINE))
-            warning("Logging at DEBUG level without checking if DEBUG level is enabled: " + msg);
-
-        impl.fine(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void info(String msg) {
-        if (!impl.isLoggable(INFO))
-            warning("Logging at INFO level without checking if INFO level is enabled: " + msg);
-
-        impl.info(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg) {
-        impl.warning(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg, @Nullable Throwable e) {
-        impl.log(WARNING, msg, e);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg) {
-        impl.severe(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isQuiet() {
-        return quiet;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg, @Nullable Throwable e) {
-        impl.log(SEVERE, msg, e);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isTraceEnabled() {
-        return impl.isLoggable(FINEST);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isDebugEnabled() {
-        return impl.isLoggable(FINE);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isInfoEnabled() {
-        return impl.isLoggable(INFO);
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public String fileName() {
-        GridJavaLoggerFileHandler gridFileHnd = findHandler(impl, GridJavaLoggerFileHandler.class);
-
-        if (gridFileHnd != null)
-            return gridFileHnd.fileName();
-
-        FileHandler fileHnd = findHandler(impl, FileHandler.class);
-
-        return fileName(fileHnd);
-    }
-
-    /**
-     * @param fileHnd File handler.
-     * @return Current log file or {@code null} if it can not be retrieved from file handler.
-     */
-    @Nullable static String fileName(FileHandler fileHnd) {
-        if (fileHnd == null)
-            return null;
-
-        try {
-            File[] logFiles = U.field(fileHnd, "files");
-
-            return logFiles[0].getAbsolutePath();
-        }
-        catch (Exception ignored) {
-            return null;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void setNodeId(UUID nodeId) {
-        A.notNull(nodeId, "nodeId");
-
-        if (this.nodeId != null)
-            return;
-
-        synchronized (mux) {
-            // Double check.
-            if (this.nodeId != null)
-                return;
-
-            this.nodeId = nodeId;
-        }
-
-        GridJavaLoggerFileHandler fileHnd = findHandler(impl, GridJavaLoggerFileHandler.class);
-
-        if (fileHnd == null)
-            return;
-
-        try {
-            fileHnd.nodeId(nodeId);
-        }
-        catch (GridException | IOException e) {
-            throw new RuntimeException("Failed to enable file handler.", e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public UUID getNodeId() {
-        return nodeId;
-    }
-
-    /**
-     * Returns first found handler of specified class type or {@code null} if that handler isn't configured.
-     *
-     * @param log Logger.
-     * @param cls Class.
-     * @param <T> Class type.
-     * @return First found handler of specified class type or {@code null} if that handler isn't configured.
-     */
-    @SuppressWarnings("unchecked")
-    private static <T> T findHandler(Logger log, Class<T> cls) {
-        while (log != null) {
-            for (Handler hnd : log.getHandlers()) {
-                if (cls.isInstance(hnd))
-                    return (T)hnd;
-            }
-
-            log = log.getParent();
-        }
-
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFileHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFileHandler.java b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFileHandler.java
deleted file mode 100644
index 61340dd..0000000
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFileHandler.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.java;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-
-/**
- * File logging handler which skips all the messages until node ID is set.
- */
-public final class GridJavaLoggerFileHandler extends StreamHandler {
-    /** Log manager. */
-    private static final LogManager manager = LogManager.getLogManager();
-
-    /** Handler delegate. */
-    private volatile FileHandler delegate;
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public void publish(LogRecord record) {
-        FileHandler delegate0 = delegate;
-
-        if (delegate0 != null)
-            delegate0.publish(record);
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public void flush() {
-        FileHandler delegate0 = delegate;
-
-        if (delegate0 != null)
-            delegate0.flush();
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public void close() throws SecurityException {
-        FileHandler delegate0 = delegate;
-
-        if (delegate0 != null)
-            delegate0.close();
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public boolean isLoggable(LogRecord record) {
-        FileHandler delegate0 = delegate;
-
-        return delegate0 != null && delegate0.isLoggable(record);
-    }
-
-    /**
-     * Sets Node id and instantiates {@link FileHandler} delegate.
-     *
-     * @param nodeId Node id.
-     */
-    public void nodeId(UUID nodeId) throws GridException, IOException {
-        if (delegate != null)
-            return;
-
-        String clsName = getClass().getName();
-
-        String ptrn = manager.getProperty(clsName + ".pattern");
-
-        if (ptrn == null)
-            ptrn = "gridgain-%{id8}.%g.log";
-
-        ptrn = new File(logDirectory(), ptrn.replace("%{id8}", U.id8(nodeId))).getAbsolutePath();
-
-        int limit = getIntProperty(clsName + ".limit", 0);
-
-        if (limit < 0)
-            limit = 0;
-
-        int cnt = getIntProperty(clsName + ".count", 1);
-
-        if (cnt <= 0)
-            cnt = 1;
-
-        boolean append = getBooleanProperty(clsName + ".append", false);
-
-        FileHandler delegate0;
-
-        synchronized (this) {
-            if (delegate != null)
-                return;
-
-            delegate = delegate0 = new FileHandler(ptrn, limit, cnt, append);
-        }
-
-        delegate0.setLevel(getLevel());
-        delegate0.setFormatter(getFormatter());
-        delegate0.setEncoding(getEncoding());
-        delegate0.setFilter(getFilter());
-        delegate0.setErrorManager(getErrorManager());
-    }
-
-    /**
-     * Returns current log file.
-     *
-     * @return Pattern or {@code null} if node id has not been set yet.
-     */
-    @Nullable public String fileName() {
-        return GridJavaLogger.fileName(delegate);
-    }
-
-    /**
-     * Resolves logging directory.
-     *
-     * @return Logging directory.
-     */
-    private static File logDirectory() throws GridException {
-        return !F.isEmpty(U.GRIDGAIN_LOG_DIR) ? new File(U.GRIDGAIN_LOG_DIR) : U.resolveWorkDirectory("log", false);
-    }
-
-    /**
-     * Returns integer property from logging configuration.
-     *
-     * @param name Property name.
-     * @param dfltVal Default value.
-     * @return Parsed property value if it is set and valid or default value otherwise.
-     */
-    private int getIntProperty(String name, int dfltVal) {
-        String val = manager.getProperty(name);
-
-        if (val == null)
-            return dfltVal;
-
-        try {
-            return Integer.parseInt(val.trim());
-        }
-        catch (Exception ex) {
-            ex.printStackTrace();
-
-            return dfltVal;
-        }
-    }
-
-    /**
-     * Returns boolean property from logging configuration.
-     *
-     * @param name Property name.
-     * @param dfltVal Default value.
-     * @return Parsed property value if it is set and valid or default value otherwise.
-     */
-    @SuppressWarnings("SimplifiableIfStatement")
-    private boolean getBooleanProperty(String name, boolean dfltVal) {
-        String val = manager.getProperty(name);
-
-        if (val == null)
-            return dfltVal;
-
-        val = val.toLowerCase();
-
-        if ("true".equals(val) || "1".equals(val))
-            return true;
-
-        if ("false".equals(val) || "0".equals(val))
-            return false;
-
-        return dfltVal;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridJavaLoggerFileHandler.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFormatter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFormatter.java b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFormatter.java
deleted file mode 100644
index 71d3838..0000000
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFormatter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.java;
-
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.Formatter;
-import java.util.logging.*;
-
-/**
- * Formatter for JUL logger.
- */
-public class GridJavaLoggerFormatter extends Formatter {
-    /** Name for anonymous loggers. */
-    public static final String ANONYMOUS_LOGGER_NAME = "UNKNOWN";
-
-    /** */
-    private static final ThreadLocal<SimpleDateFormat> DATE_FORMATTER = new ThreadLocal<SimpleDateFormat>() {
-        /** {@inheritDoc} */
-        @Override protected SimpleDateFormat initialValue() {
-            return new SimpleDateFormat("HH:mm:ss,SSS");
-        }
-    };
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-    @Override public String format(LogRecord record) {
-        String threadName = Thread.currentThread().getName();
-
-        String logName = record.getLoggerName();
-
-        if (logName == null)
-            logName = ANONYMOUS_LOGGER_NAME;
-        else if (logName.contains("."))
-            logName = logName.substring(logName.lastIndexOf('.') + 1);
-
-        String ex = null;
-
-        if (record.getThrown() != null) {
-            StringWriter sw = new StringWriter();
-
-            record.getThrown().printStackTrace(new PrintWriter(sw));
-
-            String stackTrace = sw.toString();
-
-            ex = "\n" + stackTrace;
-        }
-
-        return "[" + DATE_FORMATTER.get().format(new Date(record.getMillis())) + "][" +
-            record.getLevel() + "][" +
-            threadName + "][" +
-            logName + "] " +
-            record.getMessage() +
-            (ex == null ? "\n" : ex);
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridJavaLoggerFormatter.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
new file mode 100644
index 0000000..57b6ff9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLogger.java
@@ -0,0 +1,382 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.java;
+
+import org.apache.ignite.*;
+import org.apache.ignite.logger.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.lang.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.util.logging.*;
+
+import static java.util.logging.Level.*;
+import static org.gridgain.grid.GridSystemProperties.*;
+
+/**
+ * Logger to use with Java logging. Implementation simply delegates to Java Logging.
+ * <p>
+ * Here is an example of configuring Java logger in GridGain configuration Spring
+ * file to work over log4j implementation. Note that we use the same configuration file
+ * as we provide by default:
+ * <pre name="code" class="xml">
+ *      ...
+ *      &lt;property name="gridLogger"&gt;
+ *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"&gt;
+ *              &lt;constructor-arg type="java.util.logging.Logger"&gt;
+ *                  &lt;bean class="java.util.logging.Logger"&gt;
+ *                      &lt;constructor-arg type="java.lang.String" value="global"/&gt;
+ *                  &lt;/bean&gt;
+ *              &lt;/constructor-arg&gt;
+ *          &lt;/bean&gt;
+ *      &lt;/property&gt;
+ *      ...
+ * </pre>
+ * or
+ * <pre name="code" class="xml">
+ *      ...
+ *      &lt;property name="gridLogger"&gt;
+ *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"/&gt;
+ *      &lt;/property&gt;
+ *      ...
+ * </pre>
+ * And the same configuration if you'd like to configure GridGain in your code:
+ * <pre name="code" class="java">
+ *      GridConfiguration cfg = new GridConfiguration();
+ *      ...
+ *      GridLogger log = new GridJavaLogger(Logger.global);
+ *      ...
+ *      cfg.setGridLogger(log);
+ * </pre>
+ * or which is actually the same:
+ * <pre name="code" class="java">
+ *      GridConfiguration cfg = new GridConfiguration();
+ *      ...
+ *      GridLogger log = new GridJavaLogger();
+ *      ...
+ *      cfg.setGridLogger(log);
+ * </pre>
+ * Please take a look at <a target=_new href="http://java.sun.com/j2se/1.4.2/docs/api20/java/util/logging/Logger.html">Logger javadoc</a>
+ * for additional information.
+ * <p>
+ * It's recommended to use GridGain logger injection instead of using/instantiating
+ * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
+ * injection.
+ */
+public class IgniteJavaLogger extends GridMetadataAwareAdapter implements IgniteLogger, IgniteLoggerNodeIdAware {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** */
+    public static final String DFLT_CONFIG_PATH = "config/java.util.logging.properties";
+
+    /** */
+    private static final Object mux = new Object();
+
+    /** */
+    private static volatile boolean inited;
+
+    /** */
+    private static volatile boolean quiet0;
+
+    /** Java Logging implementation proxy. */
+    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+    private Logger impl;
+
+    /** Quiet flag. */
+    private final boolean quiet;
+
+    /** Node ID. */
+    private volatile UUID nodeId;
+
+    /**
+     * Creates new logger.
+     */
+    public IgniteJavaLogger() {
+        this(!isConfigured());
+    }
+
+    /**
+     * Checks if logger is already configured within this VM or not.
+     *
+     * @return {@code True} if logger was already configured, {@code false} otherwise.
+     */
+    public static boolean isConfigured() {
+        return System.getProperty("java.util.logging.config.file") != null;
+    }
+
+    /**
+     * Reads default JUL configuration.
+     */
+    private void defaultConfiguration() {
+        final URL cfgUrl = U.resolveGridGainUrl(DFLT_CONFIG_PATH);
+
+        if (cfgUrl == null) {
+            error("Failed to resolve default logging config file: " + DFLT_CONFIG_PATH);
+
+            return;
+        }
+
+        try (InputStream in = cfgUrl.openStream()) {
+            LogManager.getLogManager().readConfiguration(in);
+        }
+        catch (IOException e) {
+            error("Failed to read logging configuration: " + cfgUrl, e);
+        }
+    }
+
+    /**
+     * Creates new logger.
+     *
+     * @param init If {@code true}, then a default console appender will be created.
+     *      If {@code false}, then no implicit initialization will take place,
+     *      and java logger should be configured prior to calling this constructor.
+     */
+    public IgniteJavaLogger(boolean init) {
+        impl = Logger.getLogger("");
+
+        if (init) {
+            // Implementation has already been inited, passing NULL.
+            configure(null);
+
+            quiet = quiet0;
+        }
+        else
+            quiet = true;
+    }
+
+    /**
+     * Creates new logger with given implementation.
+     *
+     * @param impl Java Logging implementation to use.
+     */
+    public IgniteJavaLogger(final Logger impl) {
+        assert impl != null;
+
+        configure(impl);
+
+        quiet = quiet0;
+    }
+
+    /** {@inheritDoc} */
+    @Override public IgniteLogger getLogger(Object ctgr) {
+        return new IgniteJavaLogger(ctgr == null ? Logger.getLogger("") : Logger.getLogger(
+            ctgr instanceof Class ? ((Class)ctgr).getName() : String.valueOf(ctgr)));
+    }
+
+    /**
+     * Configures handlers when needed.
+     *
+     * @param initImpl Optional log implementation.
+     */
+    private void configure(@Nullable Logger initImpl) {
+        if (initImpl != null)
+            impl = initImpl;
+
+        if (inited)
+            return;
+
+        synchronized (mux) {
+            if (inited)
+                return;
+
+            if (isConfigured()) {
+                boolean consoleHndFound = findHandler(impl, ConsoleHandler.class) != null;
+
+                // User configured console appender, thus log is not quiet.
+                quiet0 = !consoleHndFound;
+                inited = true;
+
+                return;
+            }
+
+            defaultConfiguration();
+
+            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
+            boolean useConsoleAppender = Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"));
+
+            if (useConsoleAppender) {
+                ConsoleHandler consoleHnd = findHandler(impl, ConsoleHandler.class);
+
+                if (consoleHnd != null)
+                    consoleHnd.setLevel(quiet ? SEVERE : INFO);
+                else
+                    System.err.println("Console logging handler is not configured.");
+            }
+            else {
+                Handler[] handlers = Logger.getLogger("").getHandlers();
+
+                if  (!F.isEmpty(handlers)) {
+                    for (Handler h : handlers) {
+                        if (h instanceof ConsoleHandler)
+                            impl.removeHandler(h);
+                    }
+                }
+            }
+
+            quiet0 = quiet;
+            inited = true;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void trace(String msg) {
+        if (!impl.isLoggable(FINEST))
+            warning("Logging at TRACE level without checking if TRACE level is enabled: " + msg);
+
+        impl.finest(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void debug(String msg) {
+        if (!impl.isLoggable(FINE))
+            warning("Logging at DEBUG level without checking if DEBUG level is enabled: " + msg);
+
+        impl.fine(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void info(String msg) {
+        if (!impl.isLoggable(INFO))
+            warning("Logging at INFO level without checking if INFO level is enabled: " + msg);
+
+        impl.info(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg) {
+        impl.warning(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg, @Nullable Throwable e) {
+        impl.log(WARNING, msg, e);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg) {
+        impl.severe(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isQuiet() {
+        return quiet;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg, @Nullable Throwable e) {
+        impl.log(SEVERE, msg, e);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isTraceEnabled() {
+        return impl.isLoggable(FINEST);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isDebugEnabled() {
+        return impl.isLoggable(FINE);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isInfoEnabled() {
+        return impl.isLoggable(INFO);
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public String fileName() {
+        IgniteJavaLoggerFileHandler gridFileHnd = findHandler(impl, IgniteJavaLoggerFileHandler.class);
+
+        if (gridFileHnd != null)
+            return gridFileHnd.fileName();
+
+        FileHandler fileHnd = findHandler(impl, FileHandler.class);
+
+        return fileName(fileHnd);
+    }
+
+    /**
+     * @param fileHnd File handler.
+     * @return Current log file or {@code null} if it can not be retrieved from file handler.
+     */
+    @Nullable static String fileName(FileHandler fileHnd) {
+        if (fileHnd == null)
+            return null;
+
+        try {
+            File[] logFiles = U.field(fileHnd, "files");
+
+            return logFiles[0].getAbsolutePath();
+        }
+        catch (Exception ignored) {
+            return null;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void setNodeId(UUID nodeId) {
+        A.notNull(nodeId, "nodeId");
+
+        if (this.nodeId != null)
+            return;
+
+        synchronized (mux) {
+            // Double check.
+            if (this.nodeId != null)
+                return;
+
+            this.nodeId = nodeId;
+        }
+
+        IgniteJavaLoggerFileHandler fileHnd = findHandler(impl, IgniteJavaLoggerFileHandler.class);
+
+        if (fileHnd == null)
+            return;
+
+        try {
+            fileHnd.nodeId(nodeId);
+        }
+        catch (GridException | IOException e) {
+            throw new RuntimeException("Failed to enable file handler.", e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public UUID getNodeId() {
+        return nodeId;
+    }
+
+    /**
+     * Returns first found handler of specified class type or {@code null} if that handler isn't configured.
+     *
+     * @param log Logger.
+     * @param cls Class.
+     * @param <T> Class type.
+     * @return First found handler of specified class type or {@code null} if that handler isn't configured.
+     */
+    @SuppressWarnings("unchecked")
+    private static <T> T findHandler(Logger log, Class<T> cls) {
+        while (log != null) {
+            for (Handler hnd : log.getHandlers()) {
+                if (cls.isInstance(hnd))
+                    return (T)hnd;
+            }
+
+            log = log.getParent();
+        }
+
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java
new file mode 100644
index 0000000..80d56f3
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFileHandler.java
@@ -0,0 +1,182 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.java;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+
+/**
+ * File logging handler which skips all the messages until node ID is set.
+ */
+public final class IgniteJavaLoggerFileHandler extends StreamHandler {
+    /** Log manager. */
+    private static final LogManager manager = LogManager.getLogManager();
+
+    /** Handler delegate. */
+    private volatile FileHandler delegate;
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public void publish(LogRecord record) {
+        FileHandler delegate0 = delegate;
+
+        if (delegate0 != null)
+            delegate0.publish(record);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public void flush() {
+        FileHandler delegate0 = delegate;
+
+        if (delegate0 != null)
+            delegate0.flush();
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public void close() throws SecurityException {
+        FileHandler delegate0 = delegate;
+
+        if (delegate0 != null)
+            delegate0.close();
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public boolean isLoggable(LogRecord record) {
+        FileHandler delegate0 = delegate;
+
+        return delegate0 != null && delegate0.isLoggable(record);
+    }
+
+    /**
+     * Sets Node id and instantiates {@link FileHandler} delegate.
+     *
+     * @param nodeId Node id.
+     */
+    public void nodeId(UUID nodeId) throws GridException, IOException {
+        if (delegate != null)
+            return;
+
+        String clsName = getClass().getName();
+
+        String ptrn = manager.getProperty(clsName + ".pattern");
+
+        if (ptrn == null)
+            ptrn = "gridgain-%{id8}.%g.log";
+
+        ptrn = new File(logDirectory(), ptrn.replace("%{id8}", U.id8(nodeId))).getAbsolutePath();
+
+        int limit = getIntProperty(clsName + ".limit", 0);
+
+        if (limit < 0)
+            limit = 0;
+
+        int cnt = getIntProperty(clsName + ".count", 1);
+
+        if (cnt <= 0)
+            cnt = 1;
+
+        boolean append = getBooleanProperty(clsName + ".append", false);
+
+        FileHandler delegate0;
+
+        synchronized (this) {
+            if (delegate != null)
+                return;
+
+            delegate = delegate0 = new FileHandler(ptrn, limit, cnt, append);
+        }
+
+        delegate0.setLevel(getLevel());
+        delegate0.setFormatter(getFormatter());
+        delegate0.setEncoding(getEncoding());
+        delegate0.setFilter(getFilter());
+        delegate0.setErrorManager(getErrorManager());
+    }
+
+    /**
+     * Returns current log file.
+     *
+     * @return Pattern or {@code null} if node id has not been set yet.
+     */
+    @Nullable public String fileName() {
+        return IgniteJavaLogger.fileName(delegate);
+    }
+
+    /**
+     * Resolves logging directory.
+     *
+     * @return Logging directory.
+     */
+    private static File logDirectory() throws GridException {
+        return !F.isEmpty(U.GRIDGAIN_LOG_DIR) ? new File(U.GRIDGAIN_LOG_DIR) : U.resolveWorkDirectory("log", false);
+    }
+
+    /**
+     * Returns integer property from logging configuration.
+     *
+     * @param name Property name.
+     * @param dfltVal Default value.
+     * @return Parsed property value if it is set and valid or default value otherwise.
+     */
+    private int getIntProperty(String name, int dfltVal) {
+        String val = manager.getProperty(name);
+
+        if (val == null)
+            return dfltVal;
+
+        try {
+            return Integer.parseInt(val.trim());
+        }
+        catch (Exception ex) {
+            ex.printStackTrace();
+
+            return dfltVal;
+        }
+    }
+
+    /**
+     * Returns boolean property from logging configuration.
+     *
+     * @param name Property name.
+     * @param dfltVal Default value.
+     * @return Parsed property value if it is set and valid or default value otherwise.
+     */
+    @SuppressWarnings("SimplifiableIfStatement")
+    private boolean getBooleanProperty(String name, boolean dfltVal) {
+        String val = manager.getProperty(name);
+
+        if (val == null)
+            return dfltVal;
+
+        val = val.toLowerCase();
+
+        if ("true".equals(val) || "1".equals(val))
+            return true;
+
+        if ("false".equals(val) || "0".equals(val))
+            return false;
+
+        return dfltVal;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(IgniteJavaLoggerFileHandler.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFormatter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFormatter.java b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFormatter.java
new file mode 100644
index 0000000..62154de
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/IgniteJavaLoggerFormatter.java
@@ -0,0 +1,71 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.java;
+
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+import java.text.*;
+import java.util.*;
+import java.util.logging.Formatter;
+import java.util.logging.*;
+
+/**
+ * Formatter for JUL logger.
+ */
+public class IgniteJavaLoggerFormatter extends Formatter {
+    /** Name for anonymous loggers. */
+    public static final String ANONYMOUS_LOGGER_NAME = "UNKNOWN";
+
+    /** */
+    private static final ThreadLocal<SimpleDateFormat> DATE_FORMATTER = new ThreadLocal<SimpleDateFormat>() {
+        /** {@inheritDoc} */
+        @Override protected SimpleDateFormat initialValue() {
+            return new SimpleDateFormat("HH:mm:ss,SSS");
+        }
+    };
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+    @Override public String format(LogRecord record) {
+        String threadName = Thread.currentThread().getName();
+
+        String logName = record.getLoggerName();
+
+        if (logName == null)
+            logName = ANONYMOUS_LOGGER_NAME;
+        else if (logName.contains("."))
+            logName = logName.substring(logName.lastIndexOf('.') + 1);
+
+        String ex = null;
+
+        if (record.getThrown() != null) {
+            StringWriter sw = new StringWriter();
+
+            record.getThrown().printStackTrace(new PrintWriter(sw));
+
+            String stackTrace = sw.toString();
+
+            ex = "\n" + stackTrace;
+        }
+
+        return "[" + DATE_FORMATTER.get().format(new Date(record.getMillis())) + "][" +
+            record.getLevel() + "][" +
+            threadName + "][" +
+            logName + "] " +
+            record.getMessage() +
+            (ex == null ? "\n" : ex);
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(IgniteJavaLoggerFormatter.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
index 8592f93..c181141 100644
--- a/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -169,7 +169,7 @@ abstract class GridClientConnectionManagerAdapter implements GridClientConnectio
 
         if (cfg.getProtocol() == GridClientProtocol.TCP) {
             try {
-                IgniteLogger gridLog = new GridJavaLogger(false);
+                IgniteLogger gridLog = new IgniteJavaLogger(false);
 
                 GridNioFilter[] filters;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
index 6c4d6c5..2179417 100644
--- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
+++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
@@ -73,7 +73,7 @@ public class GridTcpRouterImpl implements GridTcpRouter, GridTcpRouterMBean, Lif
         this.cfg = cfg;
 
         log = cfg.getLogger() != null ?
-            cfg.getLogger().getLogger(getClass()) : new GridJavaLogger().getLogger(getClass());
+            cfg.getLogger().getLogger(getClass()) : new IgniteJavaLogger().getLogger(getClass());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
index e89ce75..43720d0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
+++ b/modules/core/src/main/java/org/gridgain/grid/GridBasicWarmupClosure.java
@@ -201,7 +201,7 @@ public class GridBasicWarmupClosure implements IgniteInClosure<IgniteConfigurati
 
                 cfg0.setDiscoverySpi(discoSpi);
 
-                cfg0.setGridLogger(new GridNullLogger());
+                cfg0.setGridLogger(new IgniteNullLogger());
 
                 cfg0.setGridName("gridgain-warmup-grid-" + i);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index f9ac8e1..d9db364 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -2002,12 +2002,12 @@ public class GridGainEx {
                             cfgLog = (IgniteLogger)log4jCls.newInstance();
                     }
                     else
-                        cfgLog = new GridJavaLogger();
+                        cfgLog = new IgniteJavaLogger();
                 }
 
                 // Set node IDs for all file appenders.
-                if (cfgLog instanceof GridLoggerNodeIdAware)
-                    ((GridLoggerNodeIdAware)cfgLog).setNodeId(nodeId);
+                if (cfgLog instanceof IgniteLoggerNodeIdAware)
+                    ((IgniteLoggerNodeIdAware)cfgLog).setNodeId(nodeId);
 
                 return cfgLog;
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index 4257740..2452120 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -117,7 +117,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
 
     /**
      */
-    private static class TestLogger extends GridJavaLogger implements LifecycleAware {
+    private static class TestLogger extends IgniteJavaLogger implements LifecycleAware {
         /** */
         private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/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 174b0e7..5dd0355 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
@@ -31,9 +31,9 @@ public class GridJavaLoggerTest extends TestCase {
     public void testLogInitialize() throws Exception {
         U.setWorkDirectory(null, U.getGridGainHome());
 
-        log = new GridJavaLogger();
+        log = new IgniteJavaLogger();
 
-        ((GridLoggerNodeIdAware)log).setNodeId(UUID.fromString("00000000-1111-2222-3333-444444444444"));
+        ((IgniteLoggerNodeIdAware)log).setNodeId(UUID.fromString("00000000-1111-2222-3333-444444444444"));
 
         if (log.isDebugEnabled())
             log.debug("This is 'debug' message.");
@@ -46,7 +46,7 @@ public class GridJavaLoggerTest extends TestCase {
         log.error("This is 'error' message.");
         log.error("This is 'error' message.", new Exception("It's a test error exception"));
 
-        assert log.getLogger(GridJavaLoggerTest.class.getName()) instanceof GridJavaLogger;
+        assert log.getLogger(GridJavaLoggerTest.class.getName()) instanceof IgniteJavaLogger;
 
         assert log.fileName() != null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/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 bc4b95a..9e7af1d 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
@@ -58,7 +58,7 @@ class GridMarshallerResourceBean implements Serializable {
      * Initialization.
      */
     GridMarshallerResourceBean() {
-        log = new GridJavaLogger();
+        log = new IgniteJavaLogger();
         marshaller = new GridJdkMarshaller();
         mbeanSrv = ManagementFactory.getPlatformMBeanServer();
         ses = new GridTestTaskSession();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/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 71b8827..2224e80 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
@@ -88,7 +88,7 @@ public class GridStartupWithSpecifiedWorkDirectorySelfTest extends TestCase {
      * @throws Exception If failed.
      */
     public void testStartStopWithUndefinedHomeAndWorkDirs() throws Exception {
-        IgniteLogger log = new GridJavaLogger();
+        IgniteLogger log = new IgniteJavaLogger();
 
         log.info(">>> Test started: " + getName());
         log.info("Grid start-stop test count: " + GRID_COUNT);
@@ -123,7 +123,7 @@ public class GridStartupWithSpecifiedWorkDirectorySelfTest extends TestCase {
      * @throws Exception If failed.
      */
     public void testStartStopWithUndefinedHomeAndConfiguredWorkDirs() throws Exception {
-        IgniteLogger log = new GridJavaLogger();
+        IgniteLogger log = new IgniteJavaLogger();
 
         log.info(">>> Test started: " + getName());
         log.info("Grid start-stop test count: " + GRID_COUNT);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/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 523057f..7163494 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
@@ -64,7 +64,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase {
 
         assert ggHome0 == null;
 
-        IgniteLogger log = new GridJavaLogger();
+        IgniteLogger log = new IgniteJavaLogger();
 
         log.info(">>> Test started: " + getName());
         log.info("Grid start-stop test count: " + GRID_COUNT);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java
index 6df6491..e66e616 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java
@@ -42,7 +42,7 @@ public class GridGgfsSharedMemoryTestClient {
 
         try {
             GridIpcSharedMemoryClientEndpoint client = (GridIpcSharedMemoryClientEndpoint)GridIpcEndpointFactory.connectEndpoint(
-                "shmem:" + GridIpcSharedMemoryServerEndpoint.DFLT_IPC_PORT, new GridJavaLogger());
+                "shmem:" + GridIpcSharedMemoryServerEndpoint.DFLT_IPC_PORT, new IgniteJavaLogger());
 
             os = client.outputStream();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java
index b4f852b..567b367 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java
@@ -21,8 +21,8 @@ public class GridIpcSharedMemoryFakeClient {
      * @throws Exception If failed.
      */
     public static void main(String[] args) throws Exception{
-        GridIpcEndpointFactory.connectEndpoint("shmem:10500", new GridJavaLogger());
-        GridIpcEndpointFactory.connectEndpoint("shmem:10500", new GridJavaLogger());
-        GridIpcEndpointFactory.connectEndpoint("shmem:10500", new GridJavaLogger());
+        GridIpcEndpointFactory.connectEndpoint("shmem:10500", new IgniteJavaLogger());
+        GridIpcEndpointFactory.connectEndpoint("shmem:10500", new IgniteJavaLogger());
+        GridIpcEndpointFactory.connectEndpoint("shmem:10500", new IgniteJavaLogger());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java
index 8f98b23..a2c9fea 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java
@@ -76,7 +76,7 @@ public class GridIpcSharedMemoryBenchmarkWriter implements GridIpcSharedMemoryBe
 
                     try {
                         client = GridIpcEndpointFactory.connectEndpoint("shmem:" +
-                            GridIpcSharedMemoryServerEndpoint.DFLT_IPC_PORT, new GridJavaLogger());
+                            GridIpcSharedMemoryServerEndpoint.DFLT_IPC_PORT, new IgniteJavaLogger());
 
                         OutputStream space = client.outputStream();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
index 211b951..041b460 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/logger/GridLog4jRollingFileAppender.java
@@ -20,7 +20,7 @@ import java.util.*;
 /**
  * Log4J {@link org.apache.log4j.RollingFileAppender} with added support for grid node IDs.
  */
-public class GridLog4jRollingFileAppender extends RollingFileAppender implements GridLoggerNodeIdAware {
+public class GridLog4jRollingFileAppender extends RollingFileAppender implements IgniteLoggerNodeIdAware {
     /** Node ID. */
     private UUID nodeId;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/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 224fd79..f0c05dc 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
@@ -58,7 +58,7 @@ import static org.gridgain.grid.GridSystemProperties.*;
  * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
  * injection.
  */
-public class GridTestLog4jLogger extends GridMetadataAwareAdapter implements IgniteLogger, GridLoggerNodeIdAware {
+public class GridTestLog4jLogger extends GridMetadataAwareAdapter implements IgniteLogger, IgniteLoggerNodeIdAware {
     /** */
     private static final long serialVersionUID = 0L;
 
@@ -395,8 +395,8 @@ public class GridTestLog4jLogger extends GridMetadataAwareAdapter implements Ign
         this.nodeId = nodeId;
 
         for (FileAppender a : fileAppenders) {
-            if (a instanceof GridLoggerNodeIdAware) {
-                ((GridLoggerNodeIdAware)a).setNodeId(nodeId);
+            if (a instanceof IgniteLoggerNodeIdAware) {
+                ((IgniteLoggerNodeIdAware)a).setNodeId(nodeId);
 
                 a.activateOptions();
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba7a05db/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 4fda087..c0bbdaa 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
@@ -58,7 +58,7 @@ import static org.gridgain.grid.GridSystemProperties.*;
  * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
  * injection.
  */
-public class GridLog4jLogger extends GridMetadataAwareAdapter implements IgniteLogger, GridLoggerNodeIdAware,
+public class GridLog4jLogger extends GridMetadataAwareAdapter implements IgniteLogger, IgniteLoggerNodeIdAware,
     GridLog4jFileAware {
     /** */
     private static final long serialVersionUID = 0L;


[43/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableWriter.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableWriter.java
new file mode 100644
index 0000000..0e91d55
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableWriter.java
@@ -0,0 +1,242 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.jetbrains.annotations.*;
+
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
+
+/**
+ * Writer for portable object used in {@link GridPortableMarshalAware} implementations.
+ * Useful for the cases when user wants a fine-grained control over serialization.
+ * <p>
+ * Note that GridGain never writes full strings for field or type names. Instead,
+ * for performance reasons, GridGain writes integer hash codes for type and field names.
+ * It has been tested that hash code conflicts for the type names or the field names
+ * within the same type are virtually non-existent and, to gain performance, it is safe
+ * to work with hash codes. For the cases when hash codes for different types or fields
+ * actually do collide, GridGain provides {@link GridPortableIdMapper} which
+ * allows to override the automatically generated hash code IDs for the type and field names.
+ */
+public interface GridPortableWriter {
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeByte(String fieldName, byte val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeShort(String fieldName, short val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeInt(String fieldName, int val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeLong(String fieldName, long val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeFloat(String fieldName, float val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeDouble(String fieldName, double val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeChar(String fieldName, char val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeBoolean(String fieldName, boolean val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeString(String fieldName, @Nullable String val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val UUID to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeUuid(String fieldName, @Nullable UUID val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Date to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeDate(String fieldName, @Nullable Date val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Timestamp to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeTimestamp(String fieldName, @Nullable Timestamp val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param obj Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeObject(String fieldName, @Nullable Object obj) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeByteArray(String fieldName, @Nullable byte[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeShortArray(String fieldName, @Nullable short[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeIntArray(String fieldName, @Nullable int[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeLongArray(String fieldName, @Nullable long[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeFloatArray(String fieldName, @Nullable float[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeDoubleArray(String fieldName, @Nullable double[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeCharArray(String fieldName, @Nullable char[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeBooleanArray(String fieldName, @Nullable boolean[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeStringArray(String fieldName, @Nullable String[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeUuidArray(String fieldName, @Nullable UUID[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeDateArray(String fieldName, @Nullable Date[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeObjectArray(String fieldName, @Nullable Object[] val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param col Collection to write.
+     * @throws GridPortableException In case of error.
+     */
+    public <T> void writeCollection(String fieldName, @Nullable Collection<T> col) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param map Map to write.
+     * @throws GridPortableException In case of error.
+     */
+    public <K, V> void writeMap(String fieldName, @Nullable Map<K, V> map) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public <T extends Enum<?>> void writeEnum(String fieldName, T val) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public <T extends Enum<?>> void writeEnumArray(String fieldName, T[] val) throws GridPortableException;
+
+    /**
+     * Gets raw writer. Raw writer does not write field name hash codes, therefore,
+     * making the format even more compact. However, if the raw writer is used,
+     * dynamic structure changes to the portable objects are not supported.
+     *
+     * @return Raw writer.
+     */
+    public GridPortableRawWriter rawWriter();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/package.html b/modules/core/src/main/java/org/apache/ignite/portables/package.html
new file mode 100644
index 0000000..cacbc3e
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains <b>Portable Objects</b> related functionality.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/client/GridClientCacheFlag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/GridClientCacheFlag.java b/modules/core/src/main/java/org/gridgain/client/GridClientCacheFlag.java
index 9ffe4b0..263ed17 100644
--- a/modules/core/src/main/java/org/gridgain/client/GridClientCacheFlag.java
+++ b/modules/core/src/main/java/org/gridgain/client/GridClientCacheFlag.java
@@ -9,8 +9,6 @@
 
 package org.gridgain.client;
 
-import org.gridgain.grid.portables.*;
-
 import java.util.*;
 
 /**
@@ -37,7 +35,7 @@ public enum GridClientCacheFlag {
      * Disable deserialization of portable objects on get operations.
      * If set and portable marshaller is used, {@link GridClientData#get(Object)}
      * and {@link GridClientData#getAll(Collection)} methods will return
-     * instances of {@link GridPortableObject} class instead of user objects.
+     * instances of {@link org.apache.ignite.portables.GridPortableObject} class instead of user objects.
      * Use this flag if you don't have corresponding class on your client of
      * if you want to get access to some individual fields, but do not want to
      * fully deserialize the object.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/GridClientConfiguration.java b/modules/core/src/main/java/org/gridgain/client/GridClientConfiguration.java
index b898fdb..9f30724 100644
--- a/modules/core/src/main/java/org/gridgain/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/client/GridClientConfiguration.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.client;
 
+import org.apache.ignite.portables.*;
 import org.gridgain.client.balancer.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.client.marshaller.jdk.*;
 import org.gridgain.client.marshaller.optimized.*;
 import org.gridgain.client.ssl.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java
index e62c19e..79da6ad 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java
@@ -18,7 +18,6 @@ import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.cache.store.*;
 import org.gridgain.grid.dr.cache.receiver.*;
 import org.gridgain.grid.dr.cache.sender.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.spi.indexing.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
@@ -1789,7 +1788,7 @@ public class GridCacheConfiguration {
 
     /**
      * Flag indicating whether GridGain should store portable keys and values
-     * as instances of {@link GridPortableObject}.
+     * as instances of {@link org.apache.ignite.portables.GridPortableObject}.
      *
      * @return Portable enabled flag.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
index 1a77502..3b402a0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
@@ -15,7 +15,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.cache.store.*;
-import org.gridgain.grid.portables.*;
 import org.jetbrains.annotations.*;
 
 import java.sql.*;
@@ -279,7 +278,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V>
      * so keys and values will be returned from cache API methods without changes. Therefore,
      * signature of the projection can contain only following types:
      * <ul>
-     *     <li>{@link GridPortableObject} for portable classes</li>
+     *     <li>{@link org.apache.ignite.portables.GridPortableObject} for portable classes</li>
      *     <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li>
      *     <li>Arrays of primitives (byte[], int[], ...)</li>
      *     <li>{@link String} and array of {@link String}s</li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
index e054e18..2bdbb7a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/cache/store/GridCacheStore.java
@@ -13,7 +13,6 @@ import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.store.jdbc.*;
-import org.gridgain.grid.portables.*;
 import org.jetbrains.annotations.*;
 
 import java.sql.*;
@@ -58,7 +57,7 @@ import java.util.Date;
  * </pre>
  * <h1 class="header">Working With Portable Objects</h1>
  * When portables are enabled for cache by setting {@link GridCacheConfiguration#isPortableEnabled()} to
- * {@code true}), all portable keys and values are converted to instances of {@link GridPortableObject}.
+ * {@code true}), all portable keys and values are converted to instances of {@link org.apache.ignite.portables.GridPortableObject}.
  * Therefore, all cache store methods will take parameters in portable format. To avoid class
  * cast exceptions, store must have signature compatible with portables. E.g., if you use {@link Integer}
  * as a key and {@code Value} class as a value (which will be converted to portable format), cache store
@@ -72,7 +71,7 @@ import java.util.Date;
  *     ...
  * }
  * </pre>
- * Note that only portable classes are converted to {@link GridPortableObject} format. Following
+ * Note that only portable classes are converted to {@link org.apache.ignite.portables.GridPortableObject} format. Following
  * types are stored in cache without changes and therefore should not affect cache store signature:
  * <ul>
  *     <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
index 6074cbb..0cccd46 100644
--- a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.dotnet;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableConfiguration.java
index 58ac503..f20ac76 100644
--- a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableConfiguration.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.dotnet;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableTypeConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableTypeConfiguration.java
index 626baae..5fbca5c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableTypeConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableTypeConfiguration.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.dotnet;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
index 146cf62..bf1c86b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridPortablesImpl.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.kernal.processors.portable.*;
-import org.gridgain.grid.portables.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
index d461138..c20a966 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/indexing/GridIndexingManager.java
@@ -11,13 +11,13 @@ package org.gridgain.grid.kernal.managers.indexing;
 
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.indexing.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
index 25feb24..214e4e3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityAssignmentCache.java
@@ -13,11 +13,11 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.portables.*;
 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/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index a9034b5..8b521dc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -30,7 +31,6 @@ import org.gridgain.grid.kernal.processors.cache.dr.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
 import org.gridgain.grid.kernal.processors.dr.*;
 import org.gridgain.grid.kernal.processors.task.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
index 5c1492c..c3be292 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheContext.java
@@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.cloner.*;
@@ -36,7 +37,6 @@ import org.gridgain.grid.kernal.processors.closure.*;
 import org.gridgain.grid.kernal.processors.offheap.*;
 import org.gridgain.grid.kernal.processors.portable.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -1570,7 +1570,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     /**
      * @param obj Object.
      * @return Portable object.
-     * @throws GridPortableException In case of error.
+     * @throws org.apache.ignite.portables.GridPortableException In case of error.
      */
     @Nullable public Object marshalToPortable(@Nullable Object obj) throws GridPortableException {
         assert portableEnabled();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
index 3d4a311..5ec12a9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDefaultAffinityKeyMapper.java
@@ -10,11 +10,11 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.*;
+import org.apache.ignite.portables.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
index a27a1c4..f9b89f2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
@@ -11,12 +11,12 @@ package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.processors.cache.dr.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
index e39d8b1..d8b74b4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
@@ -10,12 +10,12 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
 import org.gridgain.grid.kernal.processors.cache.dr.*;
 import org.gridgain.grid.kernal.processors.dr.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java
index c11b676..2f6988a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.cache.affinity;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.portables.*;
 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/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index d1511ff..3060093 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -12,11 +12,11 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 64e1b5e..0b2d3a7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -11,6 +11,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
 
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.managers.communication.*;
@@ -20,7 +21,6 @@ import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
 import org.gridgain.grid.kernal.processors.cache.dr.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 6568d45..3899ca6 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -11,13 +11,13 @@ package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
 
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 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.near.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
index 507094a..a62b37b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/GridPortableProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/GridPortableProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/GridPortableProcessor.java
index 954b841..af9045f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/GridPortableProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/GridPortableProcessor.java
@@ -9,10 +9,9 @@
 
 package org.gridgain.grid.kernal.processors.portable;
 
+import org.apache.ignite.portables.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.grid.kernal.processors.*;
-import org.gridgain.grid.portables.*;
-import org.gridgain.grid.product.*;
 import org.jetbrains.annotations.*;
 
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/os/GridOsPortableProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/os/GridOsPortableProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/os/GridOsPortableProcessor.java
index 033d543..3587b73 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/os/GridOsPortableProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/portable/os/GridOsPortableProcessor.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.portable.os;
 
+import org.apache.ignite.portables.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.*;
 import org.gridgain.grid.kernal.processors.portable.*;
-import org.gridgain.grid.portables.*;
 import org.jetbrains.annotations.*;
 
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAbstractMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAbstractMessage.java
index 5dd5c7e..f47832a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAbstractMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAbstractMessage.java
@@ -8,12 +8,11 @@
  */
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;
 import java.util.*;
-import java.util.concurrent.atomic.*;
 
 /**
  * This class provides implementation for commit message fields and cannot be used directly.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAuthenticationRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAuthenticationRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAuthenticationRequest.java
index f843d57..44fc512 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAuthenticationRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientAuthenticationRequest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheQueryRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheQueryRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheQueryRequest.java
index ca4c17b..9a7034a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheQueryRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheQueryRequest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.S;
 import org.gridgain.grid.util.typedef.internal.U;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheRequest.java
index 89affe1..e564e8b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientCacheRequest.java
@@ -8,7 +8,7 @@
  */
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.portable.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientGetMetaDataRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientGetMetaDataRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientGetMetaDataRequest.java
index 1b3d0e6..802d46e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientGetMetaDataRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientGetMetaDataRequest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientLogRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientLogRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientLogRequest.java
index 6938b20..3a5bef7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientLogRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientLogRequest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java
index 7ba1c5d..25f6c8a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientMetaDataResponse.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java
index 675aaed..7c99074 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeBean.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java
index 5dabea0..0c9fdcf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientNodeMetricsBean.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 
 import java.io.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java
index bca1d9a..4b2c34b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPortableMetaData.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java
index b5dd596..47557cc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientPutMetaDataRequest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java
index 7f28937..f9d9999 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientResponse.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java
index 8abea9e..acc6b92 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskRequest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.portable.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java
index fddc9b4..0079ad1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTaskResultBean.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.portable.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java
index ac22b88..8ebb677 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/client/message/GridClientTopologyRequest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.client.message;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java
index ebd7486..dddb1a5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/cache/GridCacheClientQueryResult.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.handlers.cache;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 
 import java.io.Serializable;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
index 16e7798..c55651f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/metadata/GridPortableMetadataHandler.java
@@ -10,13 +10,13 @@
 package org.gridgain.grid.kernal.processors.rest.handlers.metadata;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.rest.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
 import org.gridgain.grid.kernal.processors.rest.handlers.*;
 import org.gridgain.grid.kernal.processors.rest.request.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
index 07f047c..4653e85 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -14,6 +14,7 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
@@ -24,7 +25,6 @@ import org.gridgain.grid.kernal.processors.rest.client.message.*;
 import org.gridgain.grid.kernal.processors.rest.handlers.*;
 import org.gridgain.grid.kernal.processors.rest.request.*;
 import org.gridgain.grid.kernal.processors.task.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
index 938c8e5..d9a608b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/portable/VisorPortableMetadataCollectorTask.java
@@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.visor.portable;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.visor.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
deleted file mode 100644
index 813acf8..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableBuilder.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Portable object builder. Provides ability to build portable objects dynamically
- * without having class definitions.
- * <p>
- * Here is an example of how a portable object can be built dynamically:
- * <pre name=code class=java>
- * GridPortableBuilder builder = GridGain.grid().portables().builder("org.project.MyObject");
- *
- * builder.setField("fieldA", "A");
- * builder.setField("fieldB", "B");
- *
- * GridPortableObject portableObj = builder.build();
- * </pre>
- *
- * <p>
- * Also builder can be initialized by existing portable object. This allows changing some fields without affecting
- * other fields.
- * <pre name=code class=java>
- * GridPortableBuilder builder = GridGain.grid().portables().builder(person);
- *
- * builder.setField("name", "John");
- *
- * person = builder.build();
- * </pre>
- * </p>
- *
- * If you need to modify nested portable object you can get builder for nested object using
- * {@link #getField(String)}, changes made on nested builder will affect parent object,
- * for example:
- *
- * <pre name=code class=java>
- * GridPortableBuilder personBuilder = grid.portables().createBuilder(personPortableObj);
- * GridPortableBuilder addressBuilder = personBuilder.setField("address");
- *
- * addressBuilder.setField("city", "New York");
- *
- * personPortableObj = personBuilder.build();
- *
- * // Should be "New York".
- * String city = personPortableObj.getField("address").getField("city");
- * </pre>
- *
- * @see org.apache.ignite.IgnitePortables#builder(int)
- * @see org.apache.ignite.IgnitePortables#builder(String)
- * @see org.apache.ignite.IgnitePortables#builder(GridPortableObject)
- */
-public interface GridPortableBuilder {
-    /**
-     * Returns value assigned to the specified field.
-     * If the value is a portable object instance of {@code GridPortableBuilder} will be returned,
-     * which can be modified.
-     * <p>
-     * Collections and maps returned from this method are modifiable.
-     *
-     * @param name Field name.
-     * @return Filed value.
-     */
-    public <T> T getField(String name);
-
-    /**
-     * Sets field value.
-     *
-     * @param name Field name.
-     * @param val Field value (cannot be {@code null}).
-     * @see GridPortableObject#metaData()
-     */
-    public GridPortableBuilder setField(String name, Object val);
-
-    /**
-     * Sets field value with value type specification.
-     * <p>
-     * Field type is needed for proper metadata update.
-     *
-     * @param name Field name.
-     * @param val Field value.
-     * @param type Field type.
-     * @see GridPortableObject#metaData()
-     */
-    public <T> GridPortableBuilder setField(String name, @Nullable T val, Class<? super T> type);
-
-    /**
-     * Sets field value.
-     * <p>
-     * This method should be used if field is portable object.
-     *
-     * @param name Field name.
-     * @param builder Builder for object field.
-     */
-    public GridPortableBuilder setField(String name, @Nullable GridPortableBuilder builder);
-
-    /**
-     * Removes field from this builder.
-     *
-     * @param fieldName Field name.
-     * @return {@code this} instance for chaining.
-     */
-    public GridPortableBuilder removeField(String fieldName);
-
-    /**
-     * Sets hash code for resulting portable object returned by {@link #build()} method.
-     * <p>
-     * If not set {@code 0} is used.
-     *
-     * @param hashCode Hash code.
-     * @return {@code this} instance for chaining.
-     */
-    public GridPortableBuilder hashCode(int hashCode);
-
-    /**
-     * Builds portable object.
-     *
-     * @return Portable object.
-     * @throws GridPortableException In case of error.
-     */
-    public GridPortableObject build() throws GridPortableException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableConfiguration.java
deleted file mode 100644
index 8198a93..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableConfiguration.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.sql.Timestamp;
-import java.util.*;
-
-/**
- * Defines configuration for GridGain portable functionality. All configuration
- * properties defined here can be overridden on per-type level in
- * {@link GridPortableTypeConfiguration}. Type configurations are provided via
- * {@link #getTypeConfigurations()} method.
- */
-public class GridPortableConfiguration {
-    /** Class names. */
-    private Collection<String> clsNames;
-
-    /** ID mapper. */
-    private GridPortableIdMapper idMapper;
-
-    /** Serializer. */
-    private GridPortableSerializer serializer;
-
-    /** Types. */
-    private Collection<GridPortableTypeConfiguration> typeCfgs;
-
-    /** Use timestamp flag. */
-    private boolean useTs = true;
-
-    /** Meta data enabled flag. */
-    private boolean metaDataEnabled = true;
-
-    /** Keep deserialized flag. */
-    private boolean keepDeserialized = true;
-
-    /**
-     * Gets class names.
-     *
-     * @return Class names.
-     */
-    public Collection<String> getClassNames() {
-        return clsNames;
-    }
-
-    /**
-     * Sets class names.
-     *
-     * @param clsNames Class names.
-     */
-    public void setClassNames(Collection<String> clsNames) {
-        this.clsNames = clsNames;
-    }
-
-    /**
-     * Gets ID mapper.
-     *
-     * @return ID mapper.
-     */
-    public GridPortableIdMapper getIdMapper() {
-        return idMapper;
-    }
-
-    /**
-     * Sets ID mapper.
-     *
-     * @param idMapper ID mapper.
-     */
-    public void setIdMapper(GridPortableIdMapper idMapper) {
-        this.idMapper = idMapper;
-    }
-
-    /**
-     * Gets serializer.
-     *
-     * @return Serializer.
-     */
-    public GridPortableSerializer getSerializer() {
-        return serializer;
-    }
-
-    /**
-     * Sets serializer.
-     *
-     * @param serializer Serializer.
-     */
-    public void setSerializer(GridPortableSerializer serializer) {
-        this.serializer = serializer;
-    }
-
-    /**
-     * Gets types configuration.
-     *
-     * @return Types configuration.
-     */
-    public Collection<GridPortableTypeConfiguration> getTypeConfigurations() {
-        return typeCfgs;
-    }
-
-    /**
-     * Sets type configurations.
-     *
-     * @param typeCfgs Type configurations.
-     */
-    public void setTypeConfigurations(Collection<GridPortableTypeConfiguration> typeCfgs) {
-        this.typeCfgs = typeCfgs;
-    }
-
-    /**
-     * If {@code true} then date values converted to {@link Timestamp} on deserialization.
-     * <p>
-     * Default value is {@code true}.
-     *
-     * @return Flag indicating whether date values converted to {@link Timestamp} during unmarshalling.
-     */
-    public boolean isUseTimestamp() {
-        return useTs;
-    }
-
-    /**
-     * @param useTs Flag indicating whether date values converted to {@link Timestamp} during unmarshalling.
-     */
-    public void setUseTimestamp(boolean useTs) {
-        this.useTs = useTs;
-    }
-
-    /**
-     * If {@code true}, meta data will be collected or all types. If you need to override this behaviour for
-     * some specific type, use {@link GridPortableTypeConfiguration#setMetaDataEnabled(Boolean)} method.
-     * <p>
-     * Default value if {@code true}.
-     *
-     * @return Whether meta data is collected.
-     */
-    public boolean isMetaDataEnabled() {
-        return metaDataEnabled;
-    }
-
-    /**
-     * @param metaDataEnabled Whether meta data is collected.
-     */
-    public void setMetaDataEnabled(boolean metaDataEnabled) {
-        this.metaDataEnabled = metaDataEnabled;
-    }
-
-    /**
-     * If {@code true}, {@link GridPortableObject} will cache deserialized instance after
-     * {@link GridPortableObject#deserialize()} is called. All consequent calls of this
-     * method on the same instance of {@link GridPortableObject} will return that cached
-     * value without actually deserializing portable object. If you need to override this
-     * behaviour for some specific type, use {@link GridPortableTypeConfiguration#setKeepDeserialized(Boolean)}
-     * method.
-     * <p>
-     * Default value if {@code true}.
-     *
-     * @return Whether deserialized value is kept.
-     */
-    public boolean isKeepDeserialized() {
-        return keepDeserialized;
-    }
-
-    /**
-     * @param keepDeserialized Whether deserialized value is kept.
-     */
-    public void setKeepDeserialized(boolean keepDeserialized) {
-        this.keepDeserialized = keepDeserialized;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridPortableConfiguration.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableException.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableException.java
deleted file mode 100644
index 8586e71..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.gridgain.grid.*;
-import org.jetbrains.annotations.*;
-
-/**
- * Exception indicating portable object serialization error.
- */
-public class GridPortableException extends GridRuntimeException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates portable exception with error message.
-     *
-     * @param msg Error message.
-     */
-    public GridPortableException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates portable exception with {@link Throwable} as a cause.
-     *
-     * @param cause Cause.
-     */
-    public GridPortableException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Creates portable exception with error message and {@link Throwable} as a cause.
-     *
-     * @param msg Error message.
-     * @param cause Cause.
-     */
-    public GridPortableException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableIdMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableIdMapper.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableIdMapper.java
deleted file mode 100644
index ccce3bb..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableIdMapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-/**
- * Type and field ID mapper for portable objects. GridGain never writes full
- * strings for field or type names. Instead, for performance reasons, GridGain
- * writes integer hash codes for type and field names. It has been tested that
- * hash code conflicts for the type names or the field names
- * within the same type are virtually non-existent and, to gain performance, it is safe
- * to work with hash codes. For the cases when hash codes for different types or fields
- * actually do collide {@code GridPortableIdMapper} allows to override the automatically
- * generated hash code IDs for the type and field names.
- * <p>
- * Portable ID mapper can be configured for all portable objects via
- * {@link GridPortableConfiguration#getIdMapper()} method, or for a specific
- * portable type via {@link GridPortableTypeConfiguration#getIdMapper()} method.
- */
-public interface GridPortableIdMapper {
-    /**
-     * Gets type ID for provided class name.
-     * <p>
-     * If {@code 0} is returned, hash code of class simple name will be used.
-     *
-     * @param clsName Class name.
-     * @return Type ID.
-     */
-    public int typeId(String clsName);
-
-    /**
-     * Gets ID for provided field.
-     * <p>
-     * If {@code 0} is returned, hash code of field name will be used.
-     *
-     * @param typeId Type ID.
-     * @param fieldName Field name.
-     * @return Field ID.
-     */
-    public int fieldId(int typeId, String fieldName);
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableInvalidClassException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableInvalidClassException.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableInvalidClassException.java
deleted file mode 100644
index 4891844..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableInvalidClassException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.jetbrains.annotations.*;
-
-/**
- * Exception indicating that class needed for deserialization of portable object does not exist.
- * <p>
- * Thrown from {@link GridPortableObject#deserialize()} method.
- */
-public class GridPortableInvalidClassException extends GridPortableException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates invalid class exception with error message.
-     *
-     * @param msg Error message.
-     */
-    public GridPortableInvalidClassException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates invalid class exception with {@link Throwable} as a cause.
-     *
-     * @param cause Cause.
-     */
-    public GridPortableInvalidClassException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Creates invalid class exception with error message and {@link Throwable} as a cause.
-     *
-     * @param msg Error message.
-     * @param cause Cause.
-     */
-    public GridPortableInvalidClassException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMarshalAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMarshalAware.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMarshalAware.java
deleted file mode 100644
index 7d44998..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMarshalAware.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-/**
- * Interface that allows to implement custom serialization
- * logic for portable objects. Portable objects are not required
- * to implement this interface, in which case GridGain will automatically
- * serialize portable objects using reflection.
- * <p>
- * This interface, in a way, is analogous to {@link java.io.Externalizable}
- * interface, which allows users to override default serialization logic,
- * usually for performance reasons. The only difference here is that portable
- * serialization is already very fast and implementing custom serialization
- * logic for portables does not provide significant performance gains.
- */
-public interface GridPortableMarshalAware {
-    /**
-     * Writes fields to provided writer.
-     *
-     * @param writer Portable object writer.
-     * @throws GridPortableException In case of error.
-     */
-    public void writePortable(GridPortableWriter writer) throws GridPortableException;
-
-    /**
-     * Reads fields from provided reader.
-     *
-     * @param reader Portable object reader.
-     * @throws GridPortableException In case of error.
-     */
-    public void readPortable(GridPortableReader reader) throws GridPortableException;
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
deleted file mode 100644
index 59dff2b..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableMetadata.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.jetbrains.annotations.*;
-
-import java.util.*;
-
-/**
- * Portable type meta data. Metadata for portable types can be accessed from any of the
- * {@link org.apache.ignite.IgnitePortables#metadata(String) GridPortables.metadata(...)} methods.
- * Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
- * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
- */
-public interface GridPortableMetadata {
-    /**
-     * Gets portable type name.
-     *
-     * @return Portable type name.
-     */
-    public String typeName();
-
-    /**
-     * Gets collection of all field names for this portable type.
-     *
-     * @return Collection of all field names for this portable type.
-     */
-    public Collection<String> fields();
-
-    /**
-     * Gets name of the field type for a given field.
-     *
-     * @param fieldName Field name.
-     * @return Field type name.
-     */
-    @Nullable public String fieldTypeName(String fieldName);
-
-    /**
-     * Portable objects can optionally specify custom key-affinity mapping in the
-     * configuration. This method returns the name of the field which should be
-     * used for the key-affinity mapping.
-     *
-     * @return Affinity key field name.
-     */
-    @Nullable public String affinityKeyFieldName();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java b/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
deleted file mode 100644
index 952c5c8..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/portables/GridPortableObject.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.portables;
-
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Wrapper for portable object in portable binary format. Once an object is defined as portable,
- * GridGain will always store it in memory in the portable (i.e. binary) format.
- * User can choose to work either with the portable format or with the deserialized form
- * (assuming that class definitions are present in the classpath).
- * <p>
- * <b>NOTE:</b> user does not need to (and should not) implement this interface directly.
- * <p>
- * To work with the portable format directly, user should create a cache projection
- * over {@code GridPortableObject} class and then retrieve individual fields as needed:
- * <pre name=code class=java>
- * GridCacheProjection&lt;GridPortableObject.class, GridPortableObject.class&gt; prj =
- *     cache.projection(GridPortableObject.class, GridPortableObject.class);
- *
- * // Convert instance of MyKey to portable format.
- * // We could also use GridPortableBuilder to create
- * // the key in portable format directly.
- * GridPortableObject key = grid.portables().toPortable(new MyKey());
- *
- * GridPortableObject val = prj.get(key);
- *
- * String field = val.field("myFieldName");
- * </pre>
- * Alternatively, we could also choose a hybrid approach, where, for example,
- * the keys are concrete deserialized objects and the values are returned in portable
- * format, like so:
- * <pre name=code class=java>
- * GridCacheProjection&lt;MyKey.class, GridPortableObject.class&gt; prj =
- *     cache.projection(MyKey.class, GridPortableObject.class);
- *
- * GridPortableObject val = prj.get(new MyKey());
- *
- * String field = val.field("myFieldName");
- * </pre>
- * We could also have the values as concrete deserialized objects and the keys in portable format,
- * but such use case is a lot less common because cache keys are usually a lot smaller than values, and
- * it may be very cheap to deserialize the keys, but not the values.
- * <p>
- * And finally, if we have class definitions in the classpath, we may choose to work with deserialized
- * typed objects at all times. In this case we do incur the deserialization cost, however,
- * GridGain will only deserialize on the first access and will cache the deserialized object,
- * so it does not have to be deserialized again:
- * <pre name=code class=java>
- * GridCacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
- *     cache.projection(MyKey.class, MyValue.class);
- *
- * MyValue val = prj.get(new MyKey());
- *
- * // Normal java getter.
- * String fieldVal = val.getMyFieldName();
- * </pre>
- * <h1 class="header">Working With Maps and Collections</h1>
- * All maps and collections in the portable objects are serialized automatically. When working
- * with different platforms, e.g. C++ or .NET, GridGain will automatically pick the most
- * adequate collection or map in either language. For example, {@link ArrayList} in Java will become
- * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap}
- * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
- * in C#, etc.
- * <h1 class="header">Dynamic Structure Changes</h1>
- * Since objects are always cached in the portable binary format, server does not need to
- * be aware of the class definitions. Moreover, if class definitions are not present or not
- * used on the server, then clients can continuously change the structure of the portable
- * objects without having to restart the cluster. For example, if one client stores a
- * certain class with fields A and B, and another client stores the same class with
- * fields B and C, then the server-side portable object will have the fields A, B, and C.
- * As the structure of a portable object changes, the new fields become available for SQL queries
- * automatically.
- * <h1 class="header">Building Portable Objects</h1>
- * GridGain comes with {@link GridPortableBuilder} which allows to build portable objects dynamically:
- * <pre name=code class=java>
- * GridPortableBuilder builder = GridGain.grid().portables().builder("org.project.MyObject");
- *
- * builder.setField("fieldA", "A");
- * builder.setField("fieldB", "B");
- *
- * GridPortableObject portableObj = builder.build();
- * </pre>
- * For the cases when class definition is present
- * in the class path, it is also possible to populate a standard POJO and then
- * convert it to portable format, like so:
- * <pre name=code class=java>
- * MyObject obj = new MyObject();
- *
- * obj.setFieldA("A");
- * obj.setFieldB(123);
- *
- * GridPortableObject portableObj = GridGain.grid().portables().toPortable(obj);
- * </pre>
- * <h1 class="header">Portable Metadata</h1>
- * Even though GridGain portable protocol only works with hash codes for type and field names
- * to achieve better performance, GridGain provides metadata for all portable types which
- * can be queried ar runtime via any of the {@link org.apache.ignite.IgnitePortables#metadata(Class) GridPortables.metadata(...)}
- * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
- * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
- */
-public interface GridPortableObject extends Serializable, Cloneable {
-    /**
-     * Gets portable object type ID.
-     *
-     * @return Type ID.
-     */
-    public int typeId();
-
-    /**
-     * Gets meta data for this portable object.
-     *
-     * @return Meta data.
-     * @throws GridPortableException In case of error.
-     */
-    @Nullable public GridPortableMetadata metaData() throws GridPortableException;
-
-    /**
-     * Gets field value.
-     *
-     * @param fieldName Field name.
-     * @return Field value.
-     * @throws GridPortableException In case of any other error.
-     */
-    @Nullable public <F> F field(String fieldName) throws GridPortableException;
-
-    /**
-     * Gets fully deserialized instance of portable object.
-     *
-     * @return Fully deserialized instance of portable object.
-     * @throws GridPortableInvalidClassException If class doesn't exist.
-     * @throws GridPortableException In case of any other error.
-     */
-    @Nullable public <T> T deserialize() throws GridPortableException;
-
-    /**
-     * Creates a copy of this portable object and optionally changes field values
-     * if they are provided in map. If map is empty or {@code null}, clean copy
-     * is created.
-     *
-     * @param fields Fields to modify in copy.
-     * @return Copy of this portable object.
-     * @throws GridPortableException In case of error.
-     * @deprecated Use {@link GridPortableBuilder} instead.
-     * @see GridPortableBuilder
-     */
-    @Deprecated
-    public GridPortableObject copy(@Nullable Map<String, Object> fields) throws GridPortableException;
-
-    /**
-     * Copies this portable object.
-     *
-     * @return Copy of this portable object.
-     */
-    public GridPortableObject clone() throws CloneNotSupportedException;
-}


[46/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07f7212b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
index c164c03..7d17fda 100644
--- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
+++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
@@ -126,7 +126,7 @@ public class GridSpringBean extends GridMetadataAwareAdapter implements Ignite,
     }
 
     /** {@inheritDoc} */
-    @Override public GridProduct product() {
+    @Override public IgniteProduct product() {
         assert g != null;
 
         return g.product();


[53/53] [abbrv] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into gg-9470-rename-1

Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into gg-9470-rename-1


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

Branch: refs/heads/master
Commit: 09169c7f9b03e17d255adf6ff50a534a0f4eb803
Parents: e816134
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 5 01:10:09 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 5 01:10:09 2014 +0300

----------------------------------------------------------------------
 readme.md | 63 ++--------------------------------------------------------
 1 file changed, 2 insertions(+), 61 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09169c7f/readme.md
----------------------------------------------------------------------
diff --git a/readme.md b/readme.md
index abb760d..2cc2f0d 100644
--- a/readme.md
+++ b/readme.md
@@ -1,61 +1,2 @@
-<center>
-![GridGain Logo](http://www.gridgain.com/images/logo/logo_mid.png "GridGain Logo")
-</center>
-
-<div style="height: 5px"></div>
-
-## GridGain In-Memory Data Fabric
-<blockquote>In-Memory Computing uses high-performance, integrated, distributed memory systems to compute and transact on large-scale data sets in real-time, orders of magnitude faster than possible with traditional disk-based or flash technologies.
-</blockquote>
-
-GridGain’s In-Memory Data Fabric is designed to deliver uncompromised performance for a widest set of in-memory computing use cases from high performance computing, to the industry most advanced data grid, to streaming and plug-n-play Hadoop accelerator:
-
-### In-Memory Data Grid
-Natively distributed, ACID transactional, MVCC-based, SQL+NoSQL, in-memory object key-value store. The only in-memory data grid proven to scale to billions of transactions per second on commodity hardware.
-
-### In-Memory Streaming
-Massively distributed processing meets Complex Event Processing (CEP) and Streaming Processing with advanced workflow support, windowing, user-defined indexes and more.
-
-### In-Memory Accelerator for Hadoop
-Combination of In-Memory File System 100% compatible with Hadoop HDFS and In-Memory MapReduce delivering 100x performance increase. Minimal integration, plug-n-play acceleration with any Hadoop distro.
-
-## Maven Install
-The easiest way to get started with GridGain in your project is to use Maven dependency management:
-
-### Fabric Edition
-`Fabric` edition includes all GridGain functionality except for `hadoop accelerator`.
-
-```xml
-<dependency>
-    <groupId>org.gridgain</groupId>
-    <artifactId>gridgain-fabric</artifactId>
-    <version>${gridgain.version}</version>
-    <type>pom</type>
-</dependency>
-```
-
-### Legacy Editions
-Following editions are supported for legacy downloads and projects started before `Fabric` edition has been introduced. It is strongly recommended to use `Fabric` edition.
-
-#### HPC Edition
-`HPC` edition includes all GridGain functionality except for `data grid`, `streaming` and `hadoop accelerator`.
-
-#### Data Grid Edition
-`Data Grid` edition includes all GridGain functionality except for `streaming` and `hadoop accelerator`.
-
-#### Streaming Edition
-`Streaming` edition includes all GridGain functionality except for `data grid` and `hadoop accelerator`.
-
-You can copy and paste this snippet into your Maven POM file. Make sure to replace version with the one you need.
-
-## Binary Downloads & Documentation
-Grab the latest binary release and current documentation at [www.gridgain.com](http://www.gridgain.com)
-
-## Issues
-Use GitHub [issues](https://github.com/gridgain/gridgain/issues) to file bugs.
-
-## License
-GridGain is available under [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) license.
-
-## Copyright
-Copyright (C) 2007-2014, GridGain Systems, Inc. All Rights Reserved.
+ignite-test
+===========


[50/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: a74cf2aa561b8e91aa854aea6070383b0bae4218
Parents: 07f7212
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 23:32:38 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 23:32:38 2014 +0300

----------------------------------------------------------------------
 assembly/core-jar.xml                           |    4 +-
 assembly/dependencies-fabric.xml                |    6 +-
 assembly/dependencies-hadoop.xml                |    8 +-
 assembly/dependencies-optional-fabric.xml       |   26 +-
 assembly/dependencies-optional-hadoop.xml       |   30 +-
 assembly/dependencies-visor-console.xml         |    6 +-
 assembly/dependencies-visor-trial.xml           |    6 +-
 assembly/test.xml                               |    2 +-
 examples/pom.xml                                |   56 +-
 modules/aop/pom.xml                             |   26 +-
 modules/aws/pom.xml                             |   20 +-
 modules/clients/pom.xml                         |   36 +-
 modules/core/pom.xml                            |   12 +-
 .../src/main/java/org/apache/ignite/Ignite.java |    1 -
 .../org/gridgain/grid/kernal/GridKernal.java    |    1 -
 modules/email/pom.xml                           |   14 +-
 modules/extdata/p2p/pom.xml                     |   20 +-
 modules/extdata/uri/pom.xml                     |   20 +-
 modules/hadoop/pom.xml                          |   32 +-
 modules/hibernate/pom.xml                       |   26 +-
 modules/indexing/pom.xml                        |   20 +-
 modules/jcl/pom.xml                             |   20 +-
 modules/jdk8-backport/pom.xml                   |    6 +-
 modules/jta/pom.xml                             |   20 +-
 modules/log4j/pom.xml                           |   20 +-
 modules/rest-http/pom.xml                       |   14 +-
 modules/scalar/pom.xml                          |   32 +-
 modules/schedule/pom.xml                        |   20 +-
 modules/slf4j/pom.xml                           |   14 +-
 modules/spring/pom.xml                          |   32 +-
 .../java/org/gridgain/grid/GridSpringBean.java  |    1 -
 modules/ssh/pom.xml                             |   32 +-
 modules/tools/pom.xml                           |    8 +-
 modules/urideploy/pom.xml                       |   26 +-
 modules/visor-console/pom.xml                   |   34 +-
 modules/visor-plugins/pom.xml                   |   14 +-
 modules/visor-trial/pom.xml                     |   14 +-
 modules/web/pom.xml                             |   32 +-
 pom-standalone.xml                              | 1253 ------------------
 pom.xml                                         | 1200 ++++++++++++++++-
 40 files changed, 1523 insertions(+), 1641 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/core-jar.xml
----------------------------------------------------------------------
diff --git a/assembly/core-jar.xml b/assembly/core-jar.xml
index 17d824f..62ed9cf 100644
--- a/assembly/core-jar.xml
+++ b/assembly/core-jar.xml
@@ -38,8 +38,8 @@
     <moduleSets>
         <moduleSet>
             <includes>
-                <include>org.gridgain:jdk8-backport</include>
-                <include>org.gridgain:gridgain-core</include>
+                <include>org.apache.ignite:jdk8-backport</include>
+                <include>org.apache.ignite:ignite-core</include>
             </includes>
             <sources>
                 <includeModuleDirectory>false</includeModuleDirectory>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-fabric.xml b/assembly/dependencies-fabric.xml
index 8506d10..72281a7 100644
--- a/assembly/dependencies-fabric.xml
+++ b/assembly/dependencies-fabric.xml
@@ -38,8 +38,8 @@
     <moduleSets>
         <moduleSet>
             <includes>
-                <include>org.gridgain:gridgain-spring</include>
-                <include>org.gridgain:gridgain-indexing</include>
+                <include>org.apache.ignite:ignite-spring</include>
+                <include>org.apache.ignite:ignite-indexing</include>
             </includes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>
@@ -82,7 +82,7 @@
 
     <files>
         <file>
-            <source>target/gridgain-core-${gridgain.version}.jar</source>
+            <source>target/ignite-core-${ignite.version}.jar</source>
             <outputDirectory>/</outputDirectory>
         </file>
     </files>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-hadoop.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-hadoop.xml b/assembly/dependencies-hadoop.xml
index 26a7e74..4210083 100644
--- a/assembly/dependencies-hadoop.xml
+++ b/assembly/dependencies-hadoop.xml
@@ -38,8 +38,8 @@
     <moduleSets>
         <moduleSet>
             <includes>
-                <include>org.gridgain:gridgain-spring</include>
-                <include>org.gridgain:gridgain-log4j</include>
+                <include>org.apache.ignite:ignite-spring</include>
+                <include>org.apache.ignite:ignite-log4j</include>
             </includes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>
@@ -74,7 +74,7 @@
 
         <moduleSet>
             <includes>
-                <include>org.gridgain:gridgain-hadoop</include>
+                <include>org.apache.ignite:ignite-hadoop</include>
             </includes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>
@@ -120,7 +120,7 @@
 
     <files>
         <file>
-            <source>target/gridgain-core-${gridgain.version}.jar</source>
+            <source>target/ignite-core-${ignite.version}.jar</source>
             <outputDirectory>/</outputDirectory>
         </file>
     </files>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-optional-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-optional-fabric.xml b/assembly/dependencies-optional-fabric.xml
index aa63686..fd4245c 100644
--- a/assembly/dependencies-optional-fabric.xml
+++ b/assembly/dependencies-optional-fabric.xml
@@ -39,19 +39,19 @@
         <moduleSet>
             <includeSubModules>true</includeSubModules>
             <excludes>
-                <exclude>org.gridgain:jdk8-backport</exclude>
-                <exclude>org.gridgain:gridgain-core</exclude>
-                <exclude>org.gridgain:gridgain-clients</exclude>
-                <exclude>org.gridgain:gridgain-spring</exclude>
-                <exclude>org.gridgain:gridgain-tools</exclude>
-                <exclude>org.gridgain:gridgain-extdata-p2p</exclude>
-                <exclude>org.gridgain:gridgain-extdata-uri</exclude>
-                <exclude>org.gridgain:gridgain-examples</exclude>
-                <exclude>org.gridgain:gridgain-indexing</exclude>
-                <exclude>org.gridgain:gridgain-visor-console</exclude>
-                <exclude>org.gridgain:gridgain-visor-plugins</exclude>
-                <exclude>org.gridgain:gridgain-visor-trial</exclude>
-                <exclude>org.gridgain:gridgain-hadoop</exclude>
+                <exclude>org.apache.ignite:jdk8-backport</exclude>
+                <exclude>org.apache.ignite:ignite-core</exclude>
+                <exclude>org.apache.ignite:ignite-clients</exclude>
+                <exclude>org.apache.ignite:ignite-spring</exclude>
+                <exclude>org.apache.ignite:ignite-tools</exclude>
+                <exclude>org.apache.ignite:ignite-extdata-p2p</exclude>
+                <exclude>org.apache.ignite:ignite-extdata-uri</exclude>
+                <exclude>org.apache.ignite:ignite-examples</exclude>
+                <exclude>org.apache.ignite:ignite-indexing</exclude>
+                <exclude>org.apache.ignite:ignite-visor-console</exclude>
+                <exclude>org.apache.ignite:ignite-visor-plugins</exclude>
+                <exclude>org.apache.ignite:ignite-visor-trial</exclude>
+                <exclude>org.apache.ignite:ignite-hadoop</exclude>
             </excludes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-optional-hadoop.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-optional-hadoop.xml b/assembly/dependencies-optional-hadoop.xml
index 48b94f8..9fa6e76 100644
--- a/assembly/dependencies-optional-hadoop.xml
+++ b/assembly/dependencies-optional-hadoop.xml
@@ -39,21 +39,21 @@
         <moduleSet>
             <includeSubModules>true</includeSubModules>
             <excludes>
-                <exclude>org.gridgain:jdk8-backport</exclude>
-                <exclude>org.gridgain:gridgain-core</exclude>
-                <exclude>org.gridgain:gridgain-clients</exclude>
-                <exclude>org.gridgain:gridgain-spring</exclude>
-                <exclude>org.gridgain:gridgain-tools</exclude>
-                <exclude>org.gridgain:gridgain-extdata-p2p</exclude>
-                <exclude>org.gridgain:gridgain-extdata-uri</exclude>
-                <exclude>org.gridgain:gridgain-examples</exclude>
-                <exclude>org.gridgain:gridgain-hibernate</exclude>
-                <exclude>org.gridgain:gridgain-indexing</exclude>
-                <exclude>org.gridgain:gridgain-jta</exclude>
-                <exclude>org.gridgain:gridgain-hadoop</exclude>
-                <exclude>org.gridgain:gridgain-visor-console</exclude>
-                <exclude>org.gridgain:gridgain-visor-plugins</exclude>
-                <exclude>org.gridgain:gridgain-visor-trial</exclude>
+                <exclude>org.apache.ignite:jdk8-backport</exclude>
+                <exclude>org.apache.ignite:ignite-core</exclude>
+                <exclude>org.apache.ignite:ignite-clients</exclude>
+                <exclude>org.apache.ignite:ignite-spring</exclude>
+                <exclude>org.apache.ignite:ignite-tools</exclude>
+                <exclude>org.apache.ignite:ignite-extdata-p2p</exclude>
+                <exclude>org.apache.ignite:ignite-extdata-uri</exclude>
+                <exclude>org.apache.ignite:ignite-examples</exclude>
+                <exclude>org.apache.ignite:ignite-hibernate</exclude>
+                <exclude>org.apache.ignite:ignite-indexing</exclude>
+                <exclude>org.apache.ignite:ignite-jta</exclude>
+                <exclude>org.apache.ignite:ignite-hadoop</exclude>
+                <exclude>org.apache.ignite:ignite-visor-console</exclude>
+                <exclude>org.apache.ignite:ignite-visor-plugins</exclude>
+                <exclude>org.apache.ignite:ignite-visor-trial</exclude>
             </excludes>
             <sources>
                 <includeModuleDirectory>true</includeModuleDirectory>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-visor-console.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-visor-console.xml b/assembly/dependencies-visor-console.xml
index 7c8eaae..c2b9d1b 100644
--- a/assembly/dependencies-visor-console.xml
+++ b/assembly/dependencies-visor-console.xml
@@ -38,7 +38,7 @@
     <moduleSets>
         <moduleSet>
             <includes>
-                <include>org.gridgain:gridgain-visor-console</include>
+                <include>org.apache.ignite:ignite-visor-console</include>
             </includes>
             <sources>
                 <includeModuleDirectory>false</includeModuleDirectory>
@@ -87,8 +87,8 @@
 
         <moduleSet>
             <includes>
-                <include>org.gridgain:gridgain-ssh</include>
-                <include>org.gridgain:gridgain-spring</include>
+                <include>org.apache.ignite:ignite-ssh</include>
+                <include>org.apache.ignite:ignite-spring</include>
             </includes>
             <sources>
                 <includeModuleDirectory>false</includeModuleDirectory>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/dependencies-visor-trial.xml
----------------------------------------------------------------------
diff --git a/assembly/dependencies-visor-trial.xml b/assembly/dependencies-visor-trial.xml
index 2af86ac..f6e7140 100644
--- a/assembly/dependencies-visor-trial.xml
+++ b/assembly/dependencies-visor-trial.xml
@@ -38,7 +38,7 @@
     <moduleSets>
         <moduleSet>
             <includes>
-                <include>org.gridgain:gridgain-visor-trial</include>
+                <include>org.apache.ignite:ignite-visor-trial</include>
             </includes>
 
             <sources>
@@ -64,8 +64,8 @@
                         <directory>${basedir}/target/libs</directory>
                         <outputDirectory>/include/visorui</outputDirectory>
                         <excludes>
-                            <exclude>gridgain-spring-*.jar</exclude>
-                            <exclude>gridgain-ssh-*.jar</exclude>
+                            <exclude>ignite-spring-*.jar</exclude>
+                            <exclude>ignite-ssh-*.jar</exclude>
                             <exclude>commons-logging-*.jar</exclude>
                             <exclude>jsch-*.jar</exclude>
                             <exclude>scala-library-*.jar</exclude>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/assembly/test.xml
----------------------------------------------------------------------
diff --git a/assembly/test.xml b/assembly/test.xml
index 045e0f0..b5d3413 100644
--- a/assembly/test.xml
+++ b/assembly/test.xml
@@ -38,7 +38,7 @@
     <moduleSets>
         <moduleSet>
             <includes>
-                <include>org.gridgain:gridgain-aop</include>
+                <include>org.apache.ignite:ignite-aop</include>
             </includes>
             <sources>
                 <includeModuleDirectory>false</includeModuleDirectory>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 22fc5a7..ec4db45 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -19,49 +19,49 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>..</relativePath>
     </parent>
 
-    <artifactId>gridgain-examples</artifactId>
+    <artifactId>ignite-examples</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-hibernate</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-hibernate</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-scalar</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-scalar</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-spring</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-spring</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-log4j</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-log4j</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-indexing</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-indexing</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -149,17 +149,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-schedule</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-schedule</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/aop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aop/pom.xml b/modules/aop/pom.xml
index 06de5e0..0641038 100644
--- a/modules/aop/pom.xml
+++ b/modules/aop/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-aop</artifactId>
+    <artifactId>ignite-aop</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -65,16 +65,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-log4j</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-log4j</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/aws/pom.xml
----------------------------------------------------------------------
diff --git a/modules/aws/pom.xml b/modules/aws/pom.xml
index d6eaeb7..8ebfef9 100644
--- a/modules/aws/pom.xml
+++ b/modules/aws/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-aws</artifactId>
+    <artifactId>ignite-aws</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -59,9 +59,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index c150030..c9e4c3e 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -19,9 +19,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
@@ -29,9 +29,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -48,23 +48,23 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-indexing</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-indexing</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-log4j</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-log4j</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-rest-http</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-rest-http</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -77,9 +77,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 1761c3b..cf84023 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -19,13 +19,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>gridgain-core</artifactId>
+    <artifactId>ignite-core</artifactId>
 
     <dependencies>
         <dependency>
@@ -35,9 +35,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
+            <groupId>org.apache.ignite</groupId>
             <artifactId>jdk8-backport</artifactId>
-            <version>${gridgain.version}</version>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/core/src/main/java/org/apache/ignite/Ignite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java
index f509214..2cc3f9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignite.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java
@@ -18,7 +18,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.dr.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.hadoop.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 2f2319f..2d59610 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -60,7 +60,6 @@ import org.gridgain.grid.kernal.processors.session.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.authentication.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/email/pom.xml
----------------------------------------------------------------------
diff --git a/modules/email/pom.xml b/modules/email/pom.xml
index 2c6156f..80a7ae0 100644
--- a/modules/email/pom.xml
+++ b/modules/email/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-email</artifactId>
+    <artifactId>ignite-email</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/extdata/p2p/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/pom.xml b/modules/extdata/p2p/pom.xml
index 101116c..9b8581e 100644
--- a/modules/extdata/p2p/pom.xml
+++ b/modules/extdata/p2p/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../..</relativePath>
     </parent>
 
-    <artifactId>gridgain-extdata-p2p</artifactId>
+    <artifactId>ignite-extdata-p2p</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
     </dependencies>
 
@@ -63,9 +63,9 @@
                 <version>1.7</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.gridgain</groupId>
-                        <artifactId>gridgain-tools</artifactId>
-                        <version>${gridgain.version}</version>
+                        <groupId>org.apache.ignite</groupId>
+                        <artifactId>ignite-tools</artifactId>
+                        <version>${ignite.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/extdata/uri/pom.xml
----------------------------------------------------------------------
diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml
index 9bf19a8..3d7c343 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../..</relativePath>
     </parent>
 
-    <artifactId>gridgain-extdata-uri</artifactId>
+    <artifactId>ignite-extdata-uri</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -84,9 +84,9 @@
                 <version>1.7</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.gridgain</groupId>
-                        <artifactId>gridgain-tools</artifactId>
-                        <version>${gridgain.version}</version>
+                        <groupId>org.apache.ignite</groupId>
+                        <artifactId>ignite-tools</artifactId>
+                        <version>${ignite.version}</version>
                     </dependency>
 
                     <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hadoop/pom.xml b/modules/hadoop/pom.xml
index 86b48a1..d1306d0 100644
--- a/modules/hadoop/pom.xml
+++ b/modules/hadoop/pom.xml
@@ -19,25 +19,25 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-hadoop</artifactId>
+    <artifactId>ignite-hadoop</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-log4j</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-log4j</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -103,16 +103,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-spring</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-spring</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/modules/hibernate/pom.xml b/modules/hibernate/pom.xml
index 7034d63..7d8af78 100644
--- a/modules/hibernate/pom.xml
+++ b/modules/hibernate/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-hibernate</artifactId>
+    <artifactId>ignite-hibernate</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -41,9 +41,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-jta</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-jta</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -76,9 +76,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index f856f47..d0a6023 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-indexing</artifactId>
+    <artifactId>ignite-indexing</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -59,9 +59,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/jcl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index a2b9aed..1328a24 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-jcl</artifactId>
+    <artifactId>ignite-jcl</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -41,9 +41,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/jdk8-backport/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jdk8-backport/pom.xml b/modules/jdk8-backport/pom.xml
index 2033edf..d7bb05c 100644
--- a/modules/jdk8-backport/pom.xml
+++ b/modules/jdk8-backport/pom.xml
@@ -18,9 +18,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../..</relativePath>
     </parent>
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/jta/pom.xml
----------------------------------------------------------------------
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index a08fe92..abd8dae 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-jta</artifactId>
+    <artifactId>ignite-jta</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -55,9 +55,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/log4j/pom.xml b/modules/log4j/pom.xml
index 365ad8b..35bca8a 100644
--- a/modules/log4j/pom.xml
+++ b/modules/log4j/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-log4j</artifactId>
+    <artifactId>ignite-log4j</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -40,9 +40,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/rest-http/pom.xml
----------------------------------------------------------------------
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index fa57bae..26eafa0 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-rest-http</artifactId>
+    <artifactId>ignite-rest-http</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/scalar/pom.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/pom.xml b/modules/scalar/pom.xml
index b7e7700..0e69c06 100644
--- a/modules/scalar/pom.xml
+++ b/modules/scalar/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>gridgain-scalar</artifactId>
+    <artifactId>ignite-scalar</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -41,16 +41,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-spring</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-spring</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-indexing</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-indexing</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -109,9 +109,9 @@
                 <version>1.7</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.gridgain</groupId>
-                        <artifactId>gridgain-tools</artifactId>
-                        <version>${gridgain.version}</version>
+                        <groupId>org.apache.ignite</groupId>
+                        <artifactId>ignite-tools</artifactId>
+                        <version>${ignite.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/schedule/pom.xml
----------------------------------------------------------------------
diff --git a/modules/schedule/pom.xml b/modules/schedule/pom.xml
index 938bad5..0db5c3f 100644
--- a/modules/schedule/pom.xml
+++ b/modules/schedule/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-schedule</artifactId>
+    <artifactId>ignite-schedule</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -41,9 +41,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/slf4j/pom.xml
----------------------------------------------------------------------
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 5f960aa..9fc225b 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-slf4j</artifactId>
+    <artifactId>ignite-slf4j</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/spring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index a1a99fc..74a4568 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-spring</artifactId>
+    <artifactId>ignite-spring</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -77,23 +77,23 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-urideploy</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-urideploy</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-log4j</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-log4j</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
index 7d17fda..6e034ae 100644
--- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
+++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java
@@ -17,7 +17,6 @@ import org.apache.ignite.product.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.dr.*;
 import org.gridgain.grid.hadoop.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/ssh/pom.xml
----------------------------------------------------------------------
diff --git a/modules/ssh/pom.xml b/modules/ssh/pom.xml
index 4f48ae2..6b648d3 100644
--- a/modules/ssh/pom.xml
+++ b/modules/ssh/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-ssh</artifactId>
+    <artifactId>ignite-ssh</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -41,23 +41,23 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-spring</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-spring</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-log4j</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-log4j</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/tools/pom.xml
----------------------------------------------------------------------
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 94b949e..4235ccd 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -18,13 +18,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>gridgain-tools</artifactId>
+    <artifactId>ignite-tools</artifactId>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/urideploy/pom.xml
----------------------------------------------------------------------
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 7543ae8..6434f07 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-urideploy</artifactId>
+    <artifactId>ignite-urideploy</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -96,17 +96,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-tools</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-tools</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/visor-console/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-console/pom.xml b/modules/visor-console/pom.xml
index 202be7e..541bd5a 100644
--- a/modules/visor-console/pom.xml
+++ b/modules/visor-console/pom.xml
@@ -19,31 +19,31 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>gridgain-visor-console</artifactId>
+    <artifactId>ignite-visor-console</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-ssh</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-ssh</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-spring</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-spring</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <!-- Third party dependencies -->
@@ -86,9 +86,9 @@
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-indexing</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-indexing</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -155,7 +155,7 @@
                          <phase>prepare-package</phase>
                          <configuration>
                              <target>
-                                 <zip destfile="target/gridgain-visor-console-${gridgain.version}-javadoc.jar"
+                                 <zip destfile="target/ignite-visor-console-${ignite.version}-javadoc.jar"
                                       basedir="target/site/scaladocs"
                                       encoding="UTF-8"/>
                              </target>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/visor-plugins/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-plugins/pom.xml b/modules/visor-plugins/pom.xml
index ea82b93..de00914 100644
--- a/modules/visor-plugins/pom.xml
+++ b/modules/visor-plugins/pom.xml
@@ -19,20 +19,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>gridgain-visor-plugins</artifactId>
+    <artifactId>ignite-visor-plugins</artifactId>
 
     <dependencies>
         <!-- Gridgain dependencies -->
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
         <!-- Gridgain dependencies -->
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/visor-trial/pom.xml
----------------------------------------------------------------------
diff --git a/modules/visor-trial/pom.xml b/modules/visor-trial/pom.xml
index 03edde4..299e01e 100644
--- a/modules/visor-trial/pom.xml
+++ b/modules/visor-trial/pom.xml
@@ -19,13 +19,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../..</relativePath>
     </parent>
 
-    <artifactId>gridgain-visor-trial</artifactId>
+    <artifactId>ignite-visor-trial</artifactId>
 
     <packaging>pom</packaging>
 
@@ -40,8 +40,8 @@
         <!-- Gridgain dependencies -->
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-visor</artifactId>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-visor</artifactId>
             <version>RELEASE</version>
         </dependency>
 
@@ -92,7 +92,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration combine.self="override">
-                            <excludeArtifactIds>gridgain-core,jdk8-backport</excludeArtifactIds>
+                            <excludeArtifactIds>ignite-core,jdk8-backport</excludeArtifactIds>
                             <outputDirectory>target/libs</outputDirectory>
                             <includeScope>runtime</includeScope>
                             <excludeTransitive>false</excludeTransitive>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/modules/web/pom.xml
----------------------------------------------------------------------
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index 7eb775c..6f90a1a 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -19,19 +19,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.gridgain</groupId>
-        <artifactId>gridgain</artifactId>
-        <version>${gridgain.version}</version>
+        <groupId>org.apache.ignite</groupId>
+        <artifactId>ignite</artifactId>
+        <version>${ignite.version}</version>
         <relativePath>../../</relativePath>
     </parent>
 
-    <artifactId>gridgain-web</artifactId>
+    <artifactId>ignite-web</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
         </dependency>
 
         <dependency>
@@ -41,16 +41,16 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-spring</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-spring</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-indexing</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-indexing</artifactId>
+            <version>${ignite.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -69,9 +69,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.gridgain</groupId>
-            <artifactId>gridgain-core</artifactId>
-            <version>${gridgain.version}</version>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-core</artifactId>
+            <version>${ignite.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>


[03/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/logger/IgniteLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/IgniteLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/IgniteLogger.java
deleted file mode 100644
index 77200f2..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/logger/IgniteLogger.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger;
-
-import org.gridgain.grid.util.tostring.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This interface defines basic logging functionality used throughout the system. We had to
- * abstract it out so that we can use whatever logging is used by the hosting environment.
- * Currently, <a target=_new href="http://logging.apache.org/log4j/docs/">log4j</a>,
- * <a target=_new href="http://www.jboss.org/developers/guides/logging">JBoss</a>,
- * <a target=_new href="http://jakarta.apache.org/commons/logging/">JCL</a> and
- * console logging are provided as supported implementations.
- * <p>
- * GridGain logger could be configured either from code (for example log4j logger):
- * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
- *      ...
- *      URL xml = U.resolveGridGainUrl("config/custom-log4j.xml");
- *      GridLogger log = new GridLog4jLogger(xml);
- *      ...
- *      cfg.setGridLogger(log);
- * </pre>
- * or in grid configuration file (see JCL logger example below):
- * <pre name="code" class="xml">
- *      ...
- *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.jcl.GridJclLogger"&gt;
- *              &lt;constructor-arg type="org.apache.commons.logging.Log"&gt;
- *                  &lt;bean class="org.apache.commons.logging.impl.Log4JLogger"&gt;
- *                      &lt;constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/&gt;
- *                  &lt;/bean&gt;
- *              &lt;/constructor-arg&gt;
- *          &lt;/bean&gt;
- *      &lt;/property&gt;
- *      ...
- * </pre>
- * It's recommended to use GridGain's logger injection instead of using/instantiating
- * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
- * injection.
- * <h1 class="header">Quiet Mode</h1>
- * By default GridGain 3.0 and later starts in "quiet" mode suppressing {@code INFO} and {@code DEBUG}
- * log output. If system property {@code GRIDGAIN_QUIET} is set to {@code false} than GridGain
- * will operate in normal un-suppressed logging mode. Note that all output in "quiet" mode is
- * done through standard output (STDOUT).
- * <p>
- * Note that GridGain's standard startup scripts <tt>$GRIDGAIN_HOME/bin/ggstart.{sh|bat}</tt> start
- * by default in "quiet" mode. Both scripts accept {@code -v} arguments to turn off "quiet" mode.
- */
-@GridToStringExclude
-public interface IgniteLogger {
-    /**
-     * Creates new logger with given category based off the current instance.
-     *
-     * @param ctgr Category for new logger.
-     * @return New logger with given category.
-     */
-    public IgniteLogger getLogger(Object ctgr);
-
-    /**
-     * Logs out trace message.
-     *
-     * @param msg Trace message.
-     */
-    public void trace(String msg);
-
-    /**
-     * Logs out debug message.
-     *
-     * @param msg Debug message.
-     */
-    public void debug(String msg);
-
-    /**
-     * Logs out information message.
-     *
-     * @param msg Information message.
-     */
-    public void info(String msg);
-
-    /**
-     * Logs out warning message.
-     *
-     * @param msg Warning message.
-     */
-    public void warning(String msg);
-
-    /**
-     * Logs out warning message with optional exception.
-     *
-     * @param msg Warning message.
-     * @param e Optional exception (can be {@code null}).
-     */
-    public void warning(String msg, @Nullable Throwable e);
-
-    /**
-     * Logs out error message.
-     *
-     * @param msg Error message.
-     */
-    public void error(String msg);
-
-    /**
-     * Logs error message with optional exception.
-     *
-     * @param msg Error message.
-     * @param e Optional exception (can be {@code null}).
-     */
-    public void error(String msg, @Nullable Throwable e);
-
-    /**
-     * Tests whether {@code trace} level is enabled.
-     *
-     * @return {@code true} in case when {@code trace} level is enabled, {@code false} otherwise.
-     */
-    public boolean isTraceEnabled();
-
-    /**
-     * Tests whether {@code debug} level is enabled.
-     *
-     * @return {@code true} in case when {@code debug} level is enabled, {@code false} otherwise.
-     */
-    public boolean isDebugEnabled();
-
-    /**
-     * Tests whether {@code info} level is enabled.
-     *
-     * @return {@code true} in case when {@code info} level is enabled, {@code false} otherwise.
-     */
-    public boolean isInfoEnabled();
-
-    /**
-     * Tests whether {@code info} and {@code debug} levels are turned off.
-     *
-     * @return Whether {@code info} and {@code debug} levels are turned off.
-     */
-    public boolean isQuiet();
-
-    /**
-     * Gets name of the file being logged to if one is configured or {@code null} otherwise.
-     *
-     * @return Name of the file being logged to if one is configured or {@code null} otherwise.
-     */
-    @Nullable public String fileName();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
index c292234..c5da9cf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
+++ b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.logger.java;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java
index 32f885f..76b81bc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java
+++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/GridMarshallerExclusions.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.marshaller;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.executor.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
index 399eebb..b8fc789 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiAdapter.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.spi;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.resources.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.authentication.*;
 import org.gridgain.grid.spi.securesession.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java
index 6d0fbfc..72264bb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThread.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.util.concurrent.atomic.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java
index ed14b95..fd4c08e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/GridSpiThreadFactory.java
@@ -9,7 +9,8 @@
 
 package org.gridgain.grid.spi;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
+
 import java.util.concurrent.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java
index 05b5c3c..1338faf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/authentication/noop/GridNoopAuthenticationSpi.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.authentication.noop;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.kernal.managers.security.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.authentication.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java
index 1b65b48..e1fe7d7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/cache/GridCacheCheckpointSpi.java
@@ -1,10 +1,10 @@
 package org.gridgain.grid.spi.checkpoint.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java
index 881059a..d4571f2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/jdbc/GridJdbcCheckpointSpi.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.checkpoint.jdbc;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java
index 762c8f2..bb7d394 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/noop/GridNoopCheckpointSpi.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.checkpoint.noop;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
index 18b4e47..3af3d65 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.checkpoint.sharedfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
index a7e2996..4e9174f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.checkpoint.sharedfs;
 
+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.checkpoint.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
index 868be56..d668ffc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.checkpoint.sharedfs;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 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/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java
index 71c2153..79dcd0a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/collision/fifoqueue/GridFifoQueueCollisionSpi.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.collision.fifoqueue;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.collision.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java
index 9d197f1..3a0de30 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/collision/jobstealing/GridJobStealingCollisionSpi.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.spi.collision.jobstealing;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.collision.*;
 import org.gridgain.grid.spi.failover.jobstealing.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java
index 3d52551..4899976 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/collision/priorityqueue/GridPriorityQueueCollisionSpi.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.collision.priorityqueue;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.collision.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index 51250a4..f184747 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.spi.communication.tcp;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java
index 336e52b..9fdfb0d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/deployment/local/GridLocalDeploymentSpi.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.deployment.local;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.deployment.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
index 459b0d0..c5a7276 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.spi.discovery.tcp;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.security.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
index 09523aa..970d9d2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.spi.discovery.tcp;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.product.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java
index 3b0cae3..3ff78b9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinder.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.discovery.tcp.ipfinder.jdbc;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
index c1ccff5..f525818 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java
index 1230724..5a0b1d3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/sharedfs/GridTcpDiscoverySharedFsIpFinder.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.discovery.tcp.ipfinder.sharedfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
index af924dc..4906f2c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinder.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.discovery.tcp.ipfinder.vm;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java
index 2df41a0..7ada03d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/eventstorage/memory/GridMemoryEventStorageSpi.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.spi.eventstorage.memory;
 
+import org.apache.ignite.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.eventstorage.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java
index edc5390..357144e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/failover/always/GridAlwaysFailoverSpi.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.spi.failover.always;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.failover.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java
index afdda0f..f6037ff 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/failover/jobstealing/GridJobStealingFailoverSpi.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.spi.failover.jobstealing;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.collision.jobstealing.*;
 import org.gridgain.grid.spi.failover.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java
index 11340fc..57fc35f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/failover/never/GridNeverFailoverSpi.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.failover.never;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.failover.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java
index b049241..b5f7ad3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridNoopIndexingSpi.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.indexing;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java
index 49eed35..98f803a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/adaptive/GridAdaptiveLoadBalancingSpi.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.spi.loadbalancing.adaptive;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
@@ -16,7 +17,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.*;
 import org.gridgain.grid.spi.loadbalancing.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java
index adc3c36..d3855fe 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinGlobalLoadBalancer.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.spi.loadbalancing.roundrobin;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 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/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java
index 24b4072..95fdc61 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpi.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.spi.loadbalancing.roundrobin;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
@@ -16,7 +17,6 @@ import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.loadbalancing.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java
index 200847f..c71f20e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/loadbalancing/weightedrandom/GridWeightedRandomLoadBalancingSpi.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.spi.loadbalancing.weightedrandom;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.loadbalancing.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java
index fc5632d..3efdaf0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/securesession/noop/GridNoopSecureSessionSpi.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.spi.securesession.noop;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.securesession.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
index 26791eb..4369071 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.spi.swapspace.file;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.swapspace.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java
index e87860b..b098a0c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/noop/GridNoopSwapSpaceSpi.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.spi.swapspace.noop;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.swapspace.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java b/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java
index fa1bc10..ecddfd0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridJavaProcess.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.lang.*;
 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/main/java/org/gridgain/grid/util/GridLogThrottle.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java b/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java
index e2c23bb..8360b9e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridLogThrottle.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jdk8.backport.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index 8fbee98..82c59e3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -23,7 +23,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.streamer.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;
@@ -3734,7 +3733,7 @@ public abstract class GridUtils {
     }
 
     /**
-     * Shortcut for {@link #error(org.gridgain.grid.logger.IgniteLogger, Object, Object, Throwable)}.
+     * Shortcut for {@link #error(org.apache.ignite.IgniteLogger, Object, Object, Throwable)}.
      *
      * @param log Optional logger.
      * @param shortMsg Message to log using quiet logger.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
index c233a36..03d07bb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/future/GridFutureAdapter.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.util.future;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.tostring.*;
 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/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java
index 90e5e66..4378f4a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcEndpointFactory.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.ipc;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.ipc.loopback.*;
 import org.gridgain.grid.util.ipc.shmem.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java
index 772fdb8..cc52959 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/GridIpcToNioAdapter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.ipc;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.nio.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java
index 5912c31..699b033 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/loopback/GridIpcServerTcpEndpoint.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.util.ipc.loopback;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.ipc.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
index e17d5d4..cf96ed8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryClientEndpoint.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.ipc.shmem;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.ipc.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java
index e096e01..5fcdc26 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryServerEndpoint.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.util.ipc.shmem;
 
+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.thread.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
index ccaf250..9180c1d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemorySpace.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.ipc.shmem;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 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/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java
index 87301ab..45a4019 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridConnectionBytesVerifyFilter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.nio;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java
index 343af03..53beb21 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioAsyncNotifyFilter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.nio;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.worker.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java
index 9259b62..4a730a5 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioCodecFilter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.nio;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java
index c18de6f..70bf0bf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioFilterChain.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.nio;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java
index 02f36d9..0f6acb4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridNioServer.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.util.nio;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.direct.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java
index 8b4fee1..d5dec86 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/GridShmemCommunicationClient.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.nio;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.ipc.shmem.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java
index f29efcf..282c0e1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslFilter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.nio.ssl;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.nio.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java b/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java
index 56a58f6..dbfd293 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nio/ssl/GridNioSslHandler.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.nio.ssl;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.nio.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java
index a47a3f8..d15a636 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridNodeStartUtils.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.util.nodestart;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
-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/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java b/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java
index 7646e73..6d77a3f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/nodestart/GridRemoteStartSpecification.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.util.nodestart;
 
-import org.gridgain.grid.logger.*;
+import org.apache.ignite.*;
 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/main/java/org/gridgain/grid/util/worker/GridWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java b/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java
index 7bfdf51..1775505 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorker.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.worker;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java b/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java
index ef01c72..02b0f86 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/worker/GridWorkerPool.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.util.worker;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 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/GridTestJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java b/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java
index f96890a..de509c7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridTestJob.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 
 /**
  * Test job.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java b/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java
index bbfffe4..a509db4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridTestTask.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
-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/kernal/GridCancelUnusedJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.java
index 8426009..96bb536 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelUnusedJobSelfTest.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/kernal/GridCancelledJobsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java
index 43e29b8..20b4d29 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCancelledJobsMetricsSelfTest.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.*;
 import org.gridgain.grid.spi.collision.*;
 import org.gridgain.grid.spi.discovery.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java
index 76d9e1d..fd382ab 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridCollisionJobsContextSelfTest.java
@@ -13,7 +13,6 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.collision.*;
 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/kernal/GridContinuousJobSiblingsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java
index 3ee3672..bf7cd1f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousJobSiblingsSelfTest.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.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/kernal/GridContinuousTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java
index c5b66cb..1cd05ec 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridContinuousTaskSelfTest.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.*;
 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/GridDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java
index a3eefe8..0278a98 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridDeploymentSelfTest.java
@@ -17,7 +17,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.deployment.local.*;
 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/GridEventStorageCheckAllEventsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java
index 77c6b88..dcf2dfb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridEventStorageCheckAllEventsSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 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/GridExplicitImplicitDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java
index 0286580..672c87b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridExplicitImplicitDeploymentSelfTest.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.*;
 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/kernal/GridFailoverCustomTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java
index e01d16d..ddc2741 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverCustomTopologySelfTest.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.spi.failover.*;
 import org.gridgain.grid.spi.failover.always.*;
 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/GridJobCollisionCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java
index 4eb585c..eff3732 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobCollisionCancelSelfTest.java
@@ -13,7 +13,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.*;
 import org.gridgain.grid.spi.collision.*;
 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/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index 03c5ef3..023de74 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -19,7 +19,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.managers.communication.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
index a9ab7c3..b30a1ab 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.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.collision.jobstealing.*;
 import org.gridgain.grid.spi.failover.jobstealing.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
index eff41a7..fc1ccc2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingZeroActiveJobsSelfTest.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.spi.collision.jobstealing.*;
 import org.gridgain.grid.spi.failover.jobstealing.*;
 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/GridMultipleVersionsDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
index 53c915f..443027c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultipleVersionsDeploymentSelfTest.java
@@ -17,7 +17,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 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/kernal/GridMultithreadedJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
index a88138e..2cbfda4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridMultithreadedJobStealingSelfTest.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.spi.collision.jobstealing.*;
 import org.gridgain.grid.spi.failover.jobstealing.*;
 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/kernal/GridNonHistoryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
index 8c006ff..93f06d7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridNonHistoryMetricsSelfTest.java
@@ -17,7 +17,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.lang.*;
 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/GridReduceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java
index f6bec61..3f24b06 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridReduceSelfTest.java
@@ -12,7 +12,6 @@ package org.gridgain.grid.kernal;
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 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/GridRuntimeExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
index 6edb3f5..1a7536c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridRuntimeExceptionSelfTest.java
@@ -16,7 +16,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 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/GridStopWithWaitSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
index c623363..44722d2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridStopWithWaitSelfTest.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.spi.failover.always.*;
 import org.gridgain.grid.util.typedef.*;
 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/GridTaskCancelSingleNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
index 99a5fea..11b2a3a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskCancelSingleNodeSelfTest.java
@@ -15,7 +15,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 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.*;
 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/GridTaskContinuousMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
index 96965f4..cc4b34f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskContinuousMapperSelfTest.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/kernal/GridTaskFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
index 818a856..9b463d2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFailoverSelfTest.java
@@ -12,7 +12,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.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/kernal/GridTaskFutureImplStopGridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
index b8162bc..9285081 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskFutureImplStopGridSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 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/GridTaskInstanceExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
index 9ef4422..ebe348e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskInstanceExecutionSelfTest.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.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
index 49d7b7a..a58ee8f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskMapAsyncSelfTest.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/kernal/GridTaskTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
index 222fc12..2500b0d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskTimeoutSelfTest.java
@@ -14,7 +14,6 @@ import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 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/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
index 66105bd..e0771a0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/checkpoint/GridCheckpointManagerAbstractSelfTest.java
@@ -737,7 +737,7 @@ public abstract class GridCheckpointManagerAbstractSelfTest extends GridCommonAb
     }
 
     /**
-     * Wrapper around {@link GridTestUtils#retryAssert(org.gridgain.grid.logger.IgniteLogger, int, long, GridAbsClosure)}.
+     * Wrapper around {@link GridTestUtils#retryAssert(org.apache.ignite.IgniteLogger, int, long, GridAbsClosure)}.
      * For the given closure provides count of retries, configured by {@link #retries} attribute.
      * @param assertion Closure with assertion inside.
      * @throws GridInterruptedException If was interrupted.


[36/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallerUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallerUtils.java
new file mode 100644
index 0000000..fb163fd
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedMarshallerUtils.java
@@ -0,0 +1,450 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.*;
+import org.jdk8.backport.*;
+import org.jetbrains.annotations.*;
+import sun.misc.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.nio.charset.*;
+import java.security.*;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshallable.*;
+
+/**
+ * Miscellaneous utility methods to facilitate {@link IgniteOptimizedMarshaller}.
+ */
+class IgniteOptimizedMarshallerUtils {
+    /** Unsafe. */
+    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
+
+    /** {@code Null} object reference. */
+    static final byte NULL = (byte)0x70;
+
+    /** Handle reference. */
+    static final byte HANDLE = (byte)0x71;
+
+    /** Object reference. */
+    static final byte OBJECT = (byte)0x72;
+
+    /** UTF-8 character name. */
+    static final Charset UTF_8 = Charset.forName("UTF-8");
+
+    /** Class descriptors cache. */
+    private static final ConcurrentMap<Class<?>, IgniteOptimizedClassDescriptor> CLS_DESC_CACHE =
+        new ConcurrentHashMap8<>(256);
+
+    /** Classes cache by name. */
+    private static final ConcurrentHashMap8<ClassLoader, ConcurrentHashMap8<String, Class<?>>> CLS_BY_NAME_CACHE =
+        new ConcurrentHashMap8<>();
+
+    /**
+     * Suppresses default constructor, ensuring non-instantiability.
+     */
+    private IgniteOptimizedMarshallerUtils() {
+        // No-op.
+    }
+
+    /**
+     * Gets class for given name and class loader.
+     *
+     * @param name Class name.
+     * @param ldr Class loader.
+     * @return Class.
+     * @throws ClassNotFoundException If class was not found.
+     */
+    static Class<?> forName(String name, ClassLoader ldr) throws ClassNotFoundException {
+        assert ldr != null;
+        assert name != null;
+
+        ConcurrentHashMap8<String, Class<?>> cache = CLS_BY_NAME_CACHE.get(ldr);
+
+        Class<?> cls = null;
+
+        if (cache == null) {
+            cache = new ConcurrentHashMap8<>();
+
+            ConcurrentHashMap8<String, Class<?>> old = CLS_BY_NAME_CACHE.putIfAbsent(ldr, cache);
+
+            if (old != null) {
+                cache = old;
+
+                cls = cache.get(name);
+            }
+        }
+        else
+            cls = cache.get(name);
+
+        if (cls == null) {
+            cls = Class.forName(name, true, ldr);
+
+            cache.put(name, cls);
+        }
+
+        return cls;
+    }
+
+    /**
+     * Gets descriptor for provided class.
+     *
+     * @param cls Class.
+     * @param obj Object.
+     * @return Descriptor.
+     * @throws IOException In case of error.
+     */
+    static IgniteOptimizedClassDescriptor classDescriptor(Class<?> cls, @Nullable Object obj) throws IOException {
+        if (obj != null) {
+            if (obj instanceof IgniteOptimizedMarshallable) {
+                IgniteOptimizedMarshallable m = (IgniteOptimizedMarshallable)obj;
+
+                Object clsId = m.ggClassId();
+
+                if (clsId != null && !(clsId instanceof IgniteOptimizedClassDescriptor))
+                    throw new IOException("Method '" + obj.getClass().getName() + ".ggClassId() must return " +
+                        "the value of the field '" + CLS_ID_FIELD_NAME + "'.");
+
+                IgniteOptimizedClassDescriptor desc = (IgniteOptimizedClassDescriptor)clsId;
+
+                if (desc == null) {
+                    desc = new IgniteOptimizedClassDescriptor(cls);
+
+                    try {
+                        Field field = obj.getClass().getDeclaredField(CLS_ID_FIELD_NAME);
+
+                        field.setAccessible(true);
+
+                        Object o = field.get(null);
+
+                        if (o == null) {
+                            if ((field.getModifiers() & Modifier.STATIC) == 0)
+                                throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared static: " +
+                                    obj.getClass().getName());
+
+                            field.set(null, desc);
+
+                            if (m.ggClassId() == null)
+                                throw new IOException( "Method '" + obj.getClass().getName() + ".ggClassId() must " +
+                                    "return the value of the field '" + CLS_ID_FIELD_NAME + "': "
+                                    + obj.getClass().getName());
+                        }
+                        else if (!(o instanceof IgniteOptimizedClassDescriptor))
+                            throw new IOException("Field '" + CLS_ID_FIELD_NAME + "' must be declared with " +
+                                "null value: " + obj.getClass().getName());
+                    }
+                    catch (NoSuchFieldException e) {
+                        throw new IOException("GridOptimizedMarshallable classes must have static field declared " +
+                            "[fieldName=" + CLS_ID_FIELD_NAME + ", cls=" + obj.getClass().getName() + ']', e);
+                    }
+                    catch (IllegalAccessException e) {
+                        throw new IOException("Failed to set field '" + CLS_ID_FIELD_NAME + "' on '" +
+                            obj.getClass().getName() + "' class.", e);
+                    }
+                }
+
+                return desc;
+            }
+        }
+
+        IgniteOptimizedClassDescriptor desc = CLS_DESC_CACHE.get(cls);
+
+        if (desc == null) {
+            IgniteOptimizedClassDescriptor existing = CLS_DESC_CACHE.putIfAbsent(cls,
+                desc = new IgniteOptimizedClassDescriptor(cls));
+
+            if (existing != null)
+                desc = existing;
+        }
+
+        return desc;
+    }
+
+    /**
+     * Undeployment callback.
+     *
+     * @param ldr Undeployed class loader.
+     */
+    public static void onUndeploy(ClassLoader ldr) {
+        CLS_BY_NAME_CACHE.remove(ldr);
+
+        for (Class<?> cls : CLS_DESC_CACHE.keySet()) {
+            if (ldr.equals(cls.getClassLoader()))
+                CLS_DESC_CACHE.remove(cls);
+        }
+    }
+
+    /**
+     * Intended for test purposes only.
+     */
+    public static void clearCache() {
+        CLS_BY_NAME_CACHE.clear();
+        CLS_DESC_CACHE.clear();
+    }
+
+    /**
+     *
+     */
+    public static void printMemoryStats() {
+        X.println(">>>");
+        X.println(">>> GridOptimizedMarshallerUtils memory stats:");
+        X.println(" Cache size: " + CLS_DESC_CACHE.size());
+
+        for (Map.Entry<Class<?>, IgniteOptimizedClassDescriptor> e : CLS_DESC_CACHE.entrySet())
+            X.println(" " + e.getKey() + " : " + e.getValue());
+    }
+
+    /**
+     * Computes the serial version UID value for the given class.
+     * The code is taken from {@link ObjectStreamClass#computeDefaultSUID(Class)}.
+     *
+     * @param cls A class.
+     * @param fields Fields.
+     * @return A serial version UID.
+     * @throws IOException If failed.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    static Long computeSerialVersionUid(Class cls, List<Field> fields) throws IOException {
+        if (Serializable.class.isAssignableFrom(cls) && !Enum.class.isAssignableFrom(cls))
+            return ObjectStreamClass.lookup(cls).getSerialVersionUID();
+
+        MessageDigest md;
+
+        try {
+            md = MessageDigest.getInstance("SHA");
+        }
+        catch (NoSuchAlgorithmException e) {
+            throw new IOException("Failed to get digest for SHA.", e);
+        }
+
+        md.update(cls.getName().getBytes(UTF_8));
+
+        if (!F.isEmpty(fields)) {
+            for (int i = 0; i < fields.size(); i++) {
+                Field f = fields.get(i);
+
+                md.update(f.getName().getBytes(UTF_8));
+                md.update(f.getType().getName().getBytes(UTF_8));
+            }
+        }
+
+        byte[] hashBytes = md.digest();
+
+        long hash = 0;
+
+        // Composes a single-long hash from the byte[] hash.
+        for (int i = Math.min(hashBytes.length, 8) - 1; i >= 0; i--)
+            hash = (hash << 8) | (hashBytes[i] & 0xFF);
+
+        return hash;
+    }
+
+    /**
+     * Gets byte field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Byte value.
+     */
+    static byte getByte(Object obj, long off) {
+        return UNSAFE.getByte(obj, off);
+    }
+
+    /**
+     * Sets byte field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setByte(Object obj, long off, byte val) {
+        UNSAFE.putByte(obj, off, val);
+    }
+
+    /**
+     * Gets short field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Short value.
+     */
+    static short getShort(Object obj, long off) {
+        return UNSAFE.getShort(obj, off);
+    }
+
+    /**
+     * Sets short field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setShort(Object obj, long off, short val) {
+        UNSAFE.putShort(obj, off, val);
+    }
+
+    /**
+     * Gets integer field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Integer value.
+     */
+    static int getInt(Object obj, long off) {
+        return UNSAFE.getInt(obj, off);
+    }
+
+    /**
+     * Sets integer field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setInt(Object obj, long off, int val) {
+        UNSAFE.putInt(obj, off, val);
+    }
+
+    /**
+     * Gets long field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Long value.
+     */
+    static long getLong(Object obj, long off) {
+        return UNSAFE.getLong(obj, off);
+    }
+
+    /**
+     * Sets long field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setLong(Object obj, long off, long val) {
+        UNSAFE.putLong(obj, off, val);
+    }
+
+    /**
+     * Gets float field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Float value.
+     */
+    static float getFloat(Object obj, long off) {
+        return UNSAFE.getFloat(obj, off);
+    }
+
+    /**
+     * Sets float field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setFloat(Object obj, long off, float val) {
+        UNSAFE.putFloat(obj, off, val);
+    }
+
+    /**
+     * Gets double field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Double value.
+     */
+    static double getDouble(Object obj, long off) {
+        return UNSAFE.getDouble(obj, off);
+    }
+
+    /**
+     * Sets double field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setDouble(Object obj, long off, double val) {
+        UNSAFE.putDouble(obj, off, val);
+    }
+
+    /**
+     * Gets char field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Char value.
+     */
+    static char getChar(Object obj, long off) {
+        return UNSAFE.getChar(obj, off);
+    }
+
+    /**
+     * Sets char field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setChar(Object obj, long off, char val) {
+        UNSAFE.putChar(obj, off, val);
+    }
+
+    /**
+     * Gets boolean field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Boolean value.
+     */
+    static boolean getBoolean(Object obj, long off) {
+        return UNSAFE.getBoolean(obj, off);
+    }
+
+    /**
+     * Sets boolean field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setBoolean(Object obj, long off, boolean val) {
+        UNSAFE.putBoolean(obj, off, val);
+    }
+
+    /**
+     * Gets field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @return Value.
+     */
+    static Object getObject(Object obj, long off) {
+        return UNSAFE.getObject(obj, off);
+    }
+
+    /**
+     * Sets field value.
+     *
+     * @param obj Object.
+     * @param off Field offset.
+     * @param val Value.
+     */
+    static void setObject(Object obj, long off, Object val) {
+        UNSAFE.putObject(obj, off, val);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
new file mode 100644
index 0000000..b3362de
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectInputStream.java
@@ -0,0 +1,1008 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.io.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import sun.misc.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import static org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshallerUtils.*;
+
+/**
+ * Optimized object input stream.
+ */
+class IgniteOptimizedObjectInputStream extends ObjectInputStream {
+    /** Unsafe. */
+    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
+
+    /** Dummy object for HashSet. */
+    private static final Object DUMMY = new Object();
+
+    /** */
+    private final HandleTable handles = new HandleTable(10);
+
+    /** */
+    private ClassLoader clsLdr;
+
+    /** */
+    private GridDataInput in;
+
+    /** */
+    private Object curObj;
+
+    /** */
+    private List<T2<IgniteOptimizedFieldType, Long>> curFields;
+
+    /** */
+    private List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoList;
+
+    /** */
+    private Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoMap;
+
+    /** */
+    private Class<?> curCls;
+
+    /**
+     * @param in Input.
+     * @throws IOException In case of error.
+     */
+    IgniteOptimizedObjectInputStream(GridDataInput in) throws IOException {
+        this.in = in;
+    }
+
+    /**
+     * @throws IOException In case of error.
+     */
+    IgniteOptimizedObjectInputStream() throws IOException {
+        // No-op.
+    }
+
+    /**
+     * @param clsLdr Class loader.
+     */
+    void classLoader(ClassLoader clsLdr) {
+        this.clsLdr = clsLdr;
+    }
+
+    /**
+     * @return Class loader.
+     */
+    ClassLoader classLoader() {
+        return clsLdr;
+    }
+
+    /**
+     * @return Input.
+     */
+    public GridDataInput in() {
+        return in;
+    }
+
+    /**
+     * @param in Input.
+     */
+    public void in(GridDataInput in) {
+        this.in = in;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void close() throws IOException {
+        reset();
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public void reset() throws IOException {
+        in.reset();
+        handles.clear();
+
+        curObj = null;
+        curFields = null;
+        curFieldInfoList = null;
+        curFieldInfoMap = null;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Object readObjectOverride() throws ClassNotFoundException, IOException {
+        curObj = null;
+        curFields = null;
+        curFieldInfoList = null;
+        curFieldInfoMap = null;
+
+        byte ref = in.readByte();
+
+        switch (ref) {
+            case NULL:
+                return null;
+
+            case HANDLE:
+                return handles.lookup(readInt());
+
+            case OBJECT:
+                IgniteOptimizedClassDescriptor desc = IgniteOptimizedClassResolver.readClass(this, clsLdr);
+
+                curCls = desc.describedClass();
+
+                return desc.read(this);
+
+            default:
+                SB msg = new SB("Unexpected error occurred during unmarshalling");
+
+                if (curCls != null)
+                    msg.a(" of an instance of the class: ").a(curCls.getName());
+
+                msg.a(". Check that all nodes are running the same version of GridGain and that all nodes have " +
+                    "GridOptimizedMarshaller configured with identical optimized classes lists, if any " +
+                    "(see setClassNames and setClassNamesPath methods). If your serialized classes implement " +
+                    "java.io.Externalizable interface, verify that serialization logic is correct.");
+
+                throw new IOException(msg.toString());
+        }
+    }
+
+    /**
+     * Reads array from this stream.
+     *
+     * @param compType Array component type.
+     * @return Array.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    <T> T[] readArray(Class<T> compType) throws ClassNotFoundException, IOException {
+        int len = in.readInt();
+
+        T[] arr = (T[])Array.newInstance(compType, len);
+
+        handles.assign(arr);
+
+        for (int i = 0; i < len; i++)
+            arr[i] = (T)readObject();
+
+        return arr;
+    }
+
+    /**
+     * Reads {@link UUID} from this stream.
+     *
+     * @return UUID.
+     * @throws IOException In case of error.
+     */
+    UUID readUuid() throws IOException {
+        UUID uuid = new UUID(readLong(), readLong());
+
+        handles.assign(uuid);
+
+        return uuid;
+    }
+
+    /**
+     * Reads {@link Properties} from this stream.
+     *
+     * @return Properties.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    Properties readProperties() throws ClassNotFoundException, IOException {
+        Properties dflts = readBoolean() ? null : (Properties)readObject();
+
+        Properties props = new Properties(dflts);
+
+        int size = in.readInt();
+
+        for (int i = 0; i < size; i++)
+            props.setProperty(readUTF(), readUTF());
+
+        handles.assign(props);
+
+        return props;
+    }
+
+    /**
+     * Reads and sets all non-static and non-transient field values from this stream.
+     *
+     * @param obj Object.
+     * @param fieldOffs Field offsets.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    void readFields(Object obj, List<T2<IgniteOptimizedFieldType, Long>> fieldOffs) throws ClassNotFoundException,
+        IOException {
+        for (int i = 0; i < fieldOffs.size(); i++) {
+            T2<IgniteOptimizedFieldType, Long> t = fieldOffs.get(i);
+
+            switch ((t.get1())) {
+                case BYTE:
+                    setByte(obj, t.get2(), readByte());
+
+                    break;
+
+                case SHORT:
+                    setShort(obj, t.get2(), readShort());
+
+                    break;
+
+                case INT:
+                    setInt(obj, t.get2(), readInt());
+
+                    break;
+
+                case LONG:
+                    setLong(obj, t.get2(), readLong());
+
+                    break;
+
+                case FLOAT:
+                    setFloat(obj, t.get2(), readFloat());
+
+                    break;
+
+                case DOUBLE:
+                    setDouble(obj, t.get2(), readDouble());
+
+                    break;
+
+                case CHAR:
+                    setChar(obj, t.get2(), readChar());
+
+                    break;
+
+                case BOOLEAN:
+                    setBoolean(obj, t.get2(), readBoolean());
+
+                    break;
+
+                case OTHER:
+                    setObject(obj, t.get2(), readObject());
+            }
+        }
+    }
+
+    /**
+     * Reads {@link Externalizable} object.
+     *
+     * @param constructor Constructor.
+     * @param readResolveMtd {@code readResolve} method.
+     * @return Object.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    Object readExternalizable(Constructor<?> constructor, Method readResolveMtd)
+        throws ClassNotFoundException, IOException {
+        Object obj;
+
+        try {
+            obj = constructor.newInstance();
+        }
+        catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+            throw new IOException(e);
+        }
+
+        int handle = handles.assign(obj);
+
+        Externalizable extObj = ((Externalizable)obj);
+
+        extObj.readExternal(this);
+
+        if (readResolveMtd != null) {
+            try {
+                obj = readResolveMtd.invoke(obj);
+
+                handles.set(handle, obj);
+            }
+            catch (IllegalAccessException | InvocationTargetException e) {
+                throw new IOException(e);
+            }
+        }
+
+        return obj;
+    }
+
+    /**
+     * Reads serializable object.
+     *
+     * @param cls Class.
+     * @param mtds {@code readObject} methods.
+     * @param readResolveMtd {@code readResolve} method.
+     * @param fields class fields details.
+     * @return Object.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    Object readSerializable(Class<?> cls, List<Method> mtds, Method readResolveMtd,
+        IgniteOptimizedClassDescriptor.Fields fields) throws ClassNotFoundException, IOException {
+        Object obj;
+
+        try {
+            obj = UNSAFE.allocateInstance(cls);
+        }
+        catch (InstantiationException e) {
+            throw new IOException(e);
+        }
+
+        int handle = handles.assign(obj);
+
+        for (int i = 0; i < mtds.size(); i++) {
+            Method mtd = mtds.get(i);
+
+            if (mtd != null) {
+                curObj = obj;
+                curFields = fields.fieldOffs(i);
+                curFieldInfoList = fields.fieldInfoList(i);
+                curFieldInfoMap = fields.fieldInfoMap(i);
+
+                try {
+                    mtd.invoke(obj, this);
+                }
+                catch (IllegalAccessException | InvocationTargetException e) {
+                    throw new IOException(e);
+                }
+            }
+            else
+                readFields(obj, fields.fieldOffs(i));
+        }
+
+        if (readResolveMtd != null) {
+            try {
+                obj = readResolveMtd.invoke(obj);
+
+                handles.set(handle, obj);
+            }
+            catch (IllegalAccessException | InvocationTargetException e) {
+                throw new IOException(e);
+            }
+        }
+
+        return obj;
+    }
+
+    /**
+     * Reads {@link ArrayList}.
+     *
+     * @return List.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    ArrayList<?> readArrayList() throws ClassNotFoundException, IOException {
+        int size = readInt();
+
+        ArrayList<Object> list = new ArrayList<>(size);
+
+        handles.assign(list);
+
+        for (int i = 0; i < size; i++)
+            list.add(readObject());
+
+        return list;
+    }
+
+    /**
+     * Reads {@link HashMap}.
+     *
+     * @param set Whether reading underlying map from {@link HashSet}.
+     * @return Map.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    HashMap<?, ?> readHashMap(boolean set) throws ClassNotFoundException, IOException {
+        int size = readInt();
+        float loadFactor = readFloat();
+
+        HashMap<Object, Object> map = new HashMap<>(size, loadFactor);
+
+        if (!set)
+            handles.assign(map);
+
+        for (int i = 0; i < size; i++) {
+            Object key = readObject();
+            Object val = !set ? readObject() : DUMMY;
+
+            map.put(key, val);
+        }
+
+        return map;
+    }
+
+    /**
+     * Reads {@link HashSet}.
+     *
+     * @param mapFieldOff Map field offset.
+     * @return Set.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    HashSet<?> readHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
+        try {
+            HashSet<Object> set = (HashSet<Object>)UNSAFE.allocateInstance(HashSet.class);
+
+            handles.assign(set);
+
+            setObject(set, mapFieldOff, readHashMap(true));
+
+            return set;
+        }
+        catch (InstantiationException e) {
+            throw new IOException(e);
+        }
+    }
+
+    /**
+     * Reads {@link LinkedList}.
+     *
+     * @return List.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    LinkedList<?> readLinkedList() throws ClassNotFoundException, IOException {
+        int size = readInt();
+
+        LinkedList<Object> list = new LinkedList<>();
+
+        handles.assign(list);
+
+        for (int i = 0; i < size; i++)
+            list.add(readObject());
+
+        return list;
+    }
+
+    /**
+     * Reads {@link LinkedHashMap}.
+     *
+     * @param set Whether reading underlying map from {@link LinkedHashSet}.
+     * @return Map.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    LinkedHashMap<?, ?> readLinkedHashMap(boolean set) throws ClassNotFoundException, IOException {
+        int size = readInt();
+        float loadFactor = readFloat();
+        boolean accessOrder = readBoolean();
+
+        LinkedHashMap<Object, Object> map = new LinkedHashMap<>(size, loadFactor, accessOrder);
+
+        if (!set)
+            handles.assign(map);
+
+        for (int i = 0; i < size; i++) {
+            Object key = readObject();
+            Object val = !set ? readObject() : DUMMY;
+
+            map.put(key, val);
+        }
+
+        return map;
+    }
+
+    /**
+     * Reads {@link LinkedHashSet}.
+     *
+     * @param mapFieldOff Map field offset.
+     * @return Set.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    LinkedHashSet<?> readLinkedHashSet(long mapFieldOff) throws ClassNotFoundException, IOException {
+        try {
+            LinkedHashSet<Object> set = (LinkedHashSet<Object>)UNSAFE.allocateInstance(LinkedHashSet.class);
+
+            handles.assign(set);
+
+            setObject(set, mapFieldOff, readLinkedHashMap(true));
+
+            return set;
+        }
+        catch (InstantiationException e) {
+            throw new IOException(e);
+        }
+    }
+
+    /**
+     * Reads {@link Date}.
+     *
+     * @return Date.
+     * @throws ClassNotFoundException If class not found.
+     * @throws IOException In case of error.
+     */
+    Date readDate() throws ClassNotFoundException, IOException {
+        Date date = new Date(readLong());
+
+        handles.assign(date);
+
+        return date;
+    }
+
+    /**
+     * Reads array of {@code byte}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    byte[] readByteArray() throws IOException {
+        byte[] arr = in.readByteArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code short}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    short[] readShortArray() throws IOException {
+        short[] arr = in.readShortArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code int}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    int[] readIntArray() throws IOException {
+        int[] arr = in.readIntArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code long}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    long[] readLongArray() throws IOException {
+        long[] arr = in.readLongArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code float}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    float[] readFloatArray() throws IOException {
+        float[] arr = in.readFloatArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code double}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    double[] readDoubleArray() throws IOException {
+        double[] arr = in.readDoubleArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code char}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    char[] readCharArray() throws IOException {
+        char[] arr = in.readCharArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads array of {@code boolean}s.
+     *
+     * @return Array.
+     * @throws IOException In case of error.
+     */
+    boolean[] readBooleanArray() throws IOException {
+        boolean[] arr = in.readBooleanArray();
+
+        handles.assign(arr);
+
+        return arr;
+    }
+
+    /**
+     * Reads {@link String}.
+     *
+     * @return String.
+     * @throws IOException In case of error.
+     */
+    public String readString() throws IOException {
+        String str = in.readUTF();
+
+        handles.assign(str);
+
+        return str;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readFully(byte[] b) throws IOException {
+        in.readFully(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void readFully(byte[] b, int off, int len) throws IOException {
+        in.readFully(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int skipBytes(int n) throws IOException {
+        return in.skipBytes(n);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean readBoolean() throws IOException {
+        return in.readBoolean();
+    }
+
+    /** {@inheritDoc} */
+    @Override public byte readByte() throws IOException {
+        return in.readByte();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int readUnsignedByte() throws IOException {
+        return in.readUnsignedByte();
+    }
+
+    /** {@inheritDoc} */
+    @Override public short readShort() throws IOException {
+        return in.readShort();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int readUnsignedShort() throws IOException {
+        return in.readUnsignedShort();
+    }
+
+    /** {@inheritDoc} */
+    @Override public char readChar() throws IOException {
+        return in.readChar();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int readInt() throws IOException {
+        return in.readInt();
+    }
+
+    /** {@inheritDoc} */
+    @Override public long readLong() throws IOException {
+        return in.readLong();
+    }
+
+    /** {@inheritDoc} */
+    @Override public float readFloat() throws IOException {
+        return in.readFloat();
+    }
+
+    /** {@inheritDoc} */
+    @Override public double readDouble() throws IOException {
+        return in.readDouble();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read() throws IOException {
+        return in.read();
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read(byte[] b) throws IOException {
+        return in.read(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public int read(byte[] b, int off, int len) throws IOException {
+        return in.read(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("deprecation")
+    @Override public String readLine() throws IOException {
+        return in.readLine();
+    }
+
+    /** {@inheritDoc} */
+    @Override public String readUTF() throws IOException {
+        return in.readUTF();
+    }
+
+    /** {@inheritDoc} */
+    @Override public Object readUnshared() throws IOException, ClassNotFoundException {
+        return readObject();
+    }
+
+    /** {@inheritDoc} */
+    @Override public void defaultReadObject() throws IOException, ClassNotFoundException {
+        if (curObj == null)
+            throw new NotActiveException("Not in readObject() call.");
+
+        readFields(curObj, curFields);
+    }
+
+    /** {@inheritDoc} */
+    @Override public ObjectInputStream.GetField readFields() throws IOException, ClassNotFoundException {
+        if (curObj == null)
+            throw new NotActiveException("Not in readObject() call.");
+
+        return new GetFieldImpl(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void registerValidation(ObjectInputValidation obj, int pri) {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public int available() throws IOException {
+        return -1;
+    }
+
+    /**
+     * Returns objects that were added to handles table.
+     * Used ONLY for test purposes.
+     *
+     * @return Handled objects.
+     */
+    Object[] handledObjects() {
+        return handles.entries;
+    }
+
+    /**
+     * Lightweight identity hash table which maps objects to integer handles,
+     * assigned in ascending order.
+     */
+    private static class HandleTable {
+        /** Array mapping handle -> object/exception (depending on status). */
+        private Object[] entries;
+
+        /** Number of handles in table. */
+        private int size;
+
+        /**
+         * Creates handle table with the given initial capacity.
+         *
+         * @param initCap Initial capacity.
+         */
+        HandleTable(int initCap) {
+            entries = new Object[initCap];
+        }
+
+        /**
+         * Assigns next available handle to given object, and returns assigned
+         * handle.
+         *
+         * @param obj Object.
+         * @return Handle.
+         */
+        int assign(Object obj) {
+            if (size >= entries.length)
+                grow();
+
+            entries[size] = obj;
+
+            return size++;
+        }
+
+        /**
+         * Assigns new object to existing handle. Old object is forgotten.
+         *
+         * @param handle Handle.
+         * @param obj Object.
+         */
+        void set(int handle, Object obj) {
+            entries[handle] = obj;
+        }
+
+        /**
+         * Looks up and returns object associated with the given handle.
+         *
+         * @param handle Handle.
+         * @return Object.
+         */
+        Object lookup(int handle) {
+            return entries[handle];
+        }
+
+        /**
+         * Resets table to its initial state.
+         */
+        void clear() {
+            Arrays.fill(entries, 0, size, null);
+
+            size = 0;
+        }
+
+        /**
+         * Expands capacity of internal arrays.
+         */
+        private void grow() {
+            int newCap = (entries.length << 1) + 1;
+
+            Object[] newEntries = new Object[newCap];
+
+            System.arraycopy(entries, 0, newEntries, 0, size);
+
+            entries = newEntries;
+        }
+    }
+
+    /**
+     * {@link GetField} implementation.
+     */
+    private static class GetFieldImpl extends GetField {
+        /** Field info map. */
+        private final Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoMap;
+
+        /** Values. */
+        private final Object[] objs;
+
+        /**
+         * @param in Stream.
+         * @throws IOException In case of error.
+         * @throws ClassNotFoundException If class not found.
+         */
+        @SuppressWarnings("ForLoopReplaceableByForEach")
+        private GetFieldImpl(IgniteOptimizedObjectInputStream in) throws IOException, ClassNotFoundException {
+            fieldInfoMap = in.curFieldInfoMap;
+
+            List<IgniteBiTuple<Integer, IgniteOptimizedFieldType>> infos = in.curFieldInfoList;
+
+            objs = new Object[infos.size()];
+
+            for (int i = 0; i < infos.size(); i++) {
+                IgniteBiTuple<Integer, IgniteOptimizedFieldType> t = infos.get(i);
+
+                Object obj = null;
+
+                switch (t.get2()) {
+                    case BYTE:
+                        obj = in.readByte();
+
+                        break;
+
+                    case SHORT:
+                        obj = in.readShort();
+
+                        break;
+
+                    case INT:
+                        obj = in.readInt();
+
+                        break;
+
+                    case LONG:
+                        obj = in.readLong();
+
+                        break;
+
+                    case FLOAT:
+                        obj = in.readFloat();
+
+                        break;
+
+                    case DOUBLE:
+                        obj = in.readDouble();
+
+                        break;
+
+                    case CHAR:
+                        obj = in.readChar();
+
+                        break;
+
+                    case BOOLEAN:
+                        obj = in.readBoolean();
+
+                        break;
+
+                    case OTHER:
+                        obj = in.readObject();
+                }
+
+                objs[t.get1()] = obj;
+            }
+        }
+
+        /** {@inheritDoc} */
+        @Override public ObjectStreamClass getObjectStreamClass() {
+            throw new UnsupportedOperationException();
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean defaulted(String name) throws IOException {
+            return objs[fieldInfoMap.get(name).get1()] == null;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean get(String name, boolean dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public byte get(String name, byte dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public char get(String name, char dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public short get(String name, short dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public int get(String name, int dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public long get(String name, long dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public float get(String name, float dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public double get(String name, double dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /** {@inheritDoc} */
+        @Override public Object get(String name, Object dflt) throws IOException {
+            return value(name, dflt);
+        }
+
+        /**
+         * @param name Field name.
+         * @param dflt Default value.
+         * @return Value.
+         */
+        private <T> T value(String name, T dflt) {
+            return objs[fieldInfoMap.get(name).get1()] != null ? (T)objs[fieldInfoMap.get(name).get1()] : dflt;
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectOutputStream.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectOutputStream.java
new file mode 100644
index 0000000..1156bdd
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectOutputStream.java
@@ -0,0 +1,831 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.io.*;
+import org.gridgain.grid.util.typedef.*;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.util.*;
+
+import static org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshallerUtils.*;
+
+/**
+ * Optimized object output stream.
+ */
+class IgniteOptimizedObjectOutputStream extends ObjectOutputStream {
+    /** */
+    private static final Collection<String> CONVERTED_ERR = F.asList(
+        "weblogic/management/ManagementException",
+        "Externalizable class doesn't have default constructor: class " +
+            "org.gridgain.grid.kernal.processors.email.GridEmailProcessor$2"
+    );
+
+    /** */
+    private final GridHandleTable handles = new GridHandleTable(10, 3.00f);
+
+    /** */
+    private boolean requireSer;
+
+    /** */
+    private GridDataOutput out;
+
+    /** */
+    private Object curObj;
+
+    /** */
+    private List<T2<IgniteOptimizedFieldType, Long>> curFields;
+
+    /** */
+    private Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> curFieldInfoMap;
+
+    /** */
+    private PutFieldImpl curPut;
+
+
+    /**
+     * @throws IOException In case of error.
+     */
+    IgniteOptimizedObjectOutputStream() throws IOException {
+        // No-op.
+    }
+
+    /**
+     * @param out Output.
+     * @throws IOException In case of error.
+     */
+    IgniteOptimizedObjectOutputStream(GridDataOutput out) throws IOException {
+        this.out = out;
+    }
+
+    /**
+     * @param requireSer Require {@link Serializable} flag.
+     */
+    void requireSerializable(boolean requireSer) {
+        this.requireSer = requireSer;
+    }
+
+    /**
+     * @return Require {@link Serializable} flag.
+     */
+    boolean requireSerializable() {
+        return requireSer;
+    }
+
+    /**
+     * @param out Output.
+     */
+    public void out(GridDataOutput out) {
+        this.out = out;
+    }
+
+    /**
+     * @return Output.
+     */
+    public GridDataOutput out() {
+        return out;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void close() throws IOException {
+        reset();
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(byte[] b) throws IOException {
+        out.write(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(byte[] b, int off, int len) throws IOException {
+        out.write(b, off, len);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void writeObjectOverride(Object obj) throws IOException {
+        try {
+            writeObject0(obj);
+        }
+        catch (IOException e) {
+            Throwable t = e;
+
+            do {
+                if (CONVERTED_ERR.contains(t.getMessage()))
+                    throw new IOException("You are trying to serialize internal classes that are not supposed " +
+                        "to be serialized. Check that all non-serializable fields are transient. Consider using " +
+                        "static inner classes instead of non-static inner classes and anonymous classes.", e);
+            }
+            while ((t = t.getCause()) != null);
+
+            throw e;
+        }
+    }
+
+    /**
+     * Writes object to stream.
+     *
+     * @param obj Object.
+     * @throws IOException In case of error.
+     */
+    private void writeObject0(Object obj) throws IOException {
+        curObj = null;
+        curFields = null;
+        curPut = null;
+        curFieldInfoMap = null;
+
+        if (obj == null)
+            writeByte(NULL);
+        else {
+            Class<?> cls = obj.getClass();
+
+            IgniteOptimizedClassDescriptor desc = classDescriptor(cls, obj);
+
+            if (desc.excluded()) {
+                writeByte(NULL);
+
+                return;
+            }
+
+            Object obj0 = desc.replace(obj);
+
+            if (obj0 == null) {
+                writeByte(NULL);
+
+                return;
+            }
+
+            int handle = -1;
+
+            if (!desc.isPrimitive() && !desc.isEnum() && !desc.isClass())
+                handle = handles.lookup(obj);
+
+            if (obj0 != obj) {
+                obj = obj0;
+
+                desc = classDescriptor(obj.getClass(), obj);
+            }
+
+            if (handle >= 0) {
+                writeByte(HANDLE);
+                writeInt(handle);
+            }
+            else {
+                writeByte(OBJECT);
+
+                IgniteOptimizedClassResolver.writeClass(this, desc);
+
+                desc.write(this, obj);
+            }
+        }
+    }
+
+    /**
+     * Writes array to this stream.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    void writeArray(Object[] arr) throws IOException {
+        int len = arr.length;
+
+        writeInt(len);
+
+        for (int i = 0; i < len; i++) {
+            Object obj = arr[i];
+
+            writeObject0(obj);
+        }
+    }
+
+    /**
+     * Writes {@link UUID} to this stream.
+     *
+     * @param uuid UUID.
+     * @throws IOException In case of error.
+     */
+    void writeUuid(UUID uuid) throws IOException {
+        writeLong(uuid.getMostSignificantBits());
+        writeLong(uuid.getLeastSignificantBits());
+    }
+
+    /**
+     * Writes {@link Properties} to this stream.
+     *
+     * @param props Properties.
+     * @param dfltsFieldOff Defaults field offset.
+     * @throws IOException In case of error.
+     */
+    void writeProperties(Properties props, long dfltsFieldOff) throws IOException {
+        Properties dflts = (Properties)getObject(props, dfltsFieldOff);
+
+        if (dflts == null)
+            writeBoolean(true);
+        else {
+            writeBoolean(false);
+
+            writeObject0(dflts);
+        }
+
+        Set<String> names = props.stringPropertyNames();
+
+        writeInt(names.size());
+
+        for (String name : names) {
+            writeUTF(name);
+            writeUTF(props.getProperty(name));
+        }
+    }
+
+    /**
+     * Writes externalizable object.
+     *
+     * @param obj Object.
+     * @throws IOException In case of error.
+     */
+    void writeExternalizable(Object obj) throws IOException {
+        Externalizable extObj = (Externalizable)obj;
+
+        extObj.writeExternal(this);
+    }
+
+    /**
+     * Writes serializable object.
+     *
+     * @param obj Object.
+     * @param mtds {@code writeObject} methods.
+     * @param fields class fields details.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    void writeSerializable(Object obj, List<Method> mtds, IgniteOptimizedClassDescriptor.Fields fields)
+        throws IOException {
+        for (int i = 0; i < mtds.size(); i++) {
+            Method mtd = mtds.get(i);
+
+            if (mtd != null) {
+                curObj = obj;
+                curFields = fields.fieldOffs(i);
+                curFieldInfoMap = fields.fieldInfoMap(i);
+
+                try {
+                    mtd.invoke(obj, this);
+                }
+                catch (IllegalAccessException e) {
+                    throw new IOException(e);
+                }
+                catch (InvocationTargetException e) {
+                    throw new IOException(e.getCause());
+                }
+            }
+            else
+                writeFields(obj, fields.fieldOffs(i));
+        }
+    }
+
+    /**
+     * Writes {@link ArrayList}.
+     *
+     * @param list List.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings({"ForLoopReplaceableByForEach", "TypeMayBeWeakened"})
+    void writeArrayList(ArrayList<?> list) throws IOException {
+        int size = list.size();
+
+        writeInt(size);
+
+        for (int i = 0; i < size; i++)
+            writeObject0(list.get(i));
+    }
+
+    /**
+     * Writes {@link HashMap}.
+     *
+     * @param map Map.
+     * @param loadFactorFieldOff Load factor field offset.
+     * @param set Whether writing underlying map from {@link HashSet}.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    void writeHashMap(HashMap<?, ?> map, long loadFactorFieldOff, boolean set) throws IOException {
+        int size = map.size();
+
+        writeInt(size);
+        writeFloat(getFloat(map, loadFactorFieldOff));
+
+        for (Map.Entry<?, ?> e : map.entrySet()) {
+            writeObject0(e.getKey());
+
+            if (!set)
+                writeObject0(e.getValue());
+        }
+    }
+
+    /**
+     * Writes {@link HashSet}.
+     *
+     * @param set Set.
+     * @param mapFieldOff Map field offset.
+     * @param loadFactorFieldOff Load factor field offset.
+     * @throws IOException In case of error.
+     */
+    void writeHashSet(HashSet<?> set, long mapFieldOff, long loadFactorFieldOff) throws IOException {
+        writeHashMap((HashMap<?, ?>)getObject(set, mapFieldOff), loadFactorFieldOff, true);
+    }
+
+    /**
+     * Writes {@link LinkedList}.
+     *
+     * @param list List.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    void writeLinkedList(LinkedList<?> list) throws IOException {
+        int size = list.size();
+
+        writeInt(size);
+
+        for (Object obj : list)
+            writeObject0(obj);
+    }
+
+    /**
+     * Writes {@link LinkedHashMap}.
+     *
+     * @param map Map.
+     * @param loadFactorFieldOff Load factor field offset.
+     * @param accessOrderFieldOff access order field offset.
+     * @param set Whether writing underlying map from {@link LinkedHashSet}.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    void writeLinkedHashMap(LinkedHashMap<?, ?> map, long loadFactorFieldOff, long accessOrderFieldOff, boolean set)
+        throws IOException {
+        int size = map.size();
+
+        writeInt(size);
+        writeFloat(getFloat(map, loadFactorFieldOff));
+
+        if (accessOrderFieldOff >= 0)
+            writeBoolean(getBoolean(map, accessOrderFieldOff));
+        else
+            writeBoolean(false);
+
+        for (Map.Entry<?, ?> e : map.entrySet()) {
+            writeObject0(e.getKey());
+
+            if (!set)
+                writeObject0(e.getValue());
+        }
+    }
+
+    /**
+     * Writes {@link LinkedHashSet}.
+     *
+     * @param set Set.
+     * @param mapFieldOff Map field offset.
+     * @param loadFactorFieldOff Load factor field offset.
+     * @throws IOException In case of error.
+     */
+    void writeLinkedHashSet(LinkedHashSet<?> set, long mapFieldOff, long loadFactorFieldOff) throws IOException {
+        LinkedHashMap<?, ?> map = (LinkedHashMap<?, ?>)getObject(set, mapFieldOff);
+
+        writeLinkedHashMap(map, loadFactorFieldOff, -1, true);
+    }
+
+    /**
+     * Writes {@link Date}.
+     *
+     * @param date Date.
+     * @throws IOException In case of error.
+     */
+    void writeDate(Date date) throws IOException {
+        writeLong(date.getTime());
+    }
+
+    /**
+     * Writes all non-static and non-transient field values to this stream.
+     *
+     * @param obj Object.
+     * @param fieldOffs Field offsets.
+     * @throws IOException In case of error.
+     */
+    @SuppressWarnings("ForLoopReplaceableByForEach")
+    private void writeFields(Object obj, List<T2<IgniteOptimizedFieldType, Long>> fieldOffs) throws IOException {
+        for (int i = 0; i < fieldOffs.size(); i++) {
+            T2<IgniteOptimizedFieldType, Long> t = fieldOffs.get(i);
+
+            switch (t.get1()) {
+                case BYTE:
+                    writeByte(getByte(obj, t.get2()));
+
+                    break;
+
+                case SHORT:
+                    writeShort(getShort(obj, t.get2()));
+
+                    break;
+
+                case INT:
+                    writeInt(getInt(obj, t.get2()));
+
+                    break;
+
+                case LONG:
+                    writeLong(getLong(obj, t.get2()));
+
+                    break;
+
+                case FLOAT:
+                    writeFloat(getFloat(obj, t.get2()));
+
+                    break;
+
+                case DOUBLE:
+                    writeDouble(getDouble(obj, t.get2()));
+
+                    break;
+
+                case CHAR:
+                    writeChar(getChar(obj, t.get2()));
+
+                    break;
+
+                case BOOLEAN:
+                    writeBoolean(getBoolean(obj, t.get2()));
+
+                    break;
+
+                case OTHER:
+                    writeObject0(getObject(obj, t.get2()));
+            }
+        }
+    }
+
+    /**
+     * Writes array of {@code byte}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeByteArray(byte[] arr) throws IOException {
+        out.writeByteArray(arr);
+    }
+
+    /**
+     * Writes array of {@code short}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeShortArray(short[] arr) throws IOException {
+        out.writeShortArray(arr);
+    }
+
+    /**
+     * Writes array of {@code int}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeIntArray(int[] arr) throws IOException {
+        out.writeIntArray(arr);
+    }
+
+    /**
+     * Writes array of {@code long}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeLongArray(long[] arr) throws IOException {
+        out.writeLongArray(arr);
+    }
+
+    /**
+     * Writes array of {@code float}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeFloatArray(float[] arr) throws IOException {
+        out.writeFloatArray(arr);
+    }
+
+    /**
+     * Writes array of {@code double}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeDoubleArray(double[] arr) throws IOException {
+        out.writeDoubleArray(arr);
+    }
+
+    /**
+     * Writes array of {@code char}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeCharArray(char[] arr) throws IOException {
+        out.writeCharArray(arr);
+    }
+
+    /**
+     * Writes array of {@code boolean}s.
+     *
+     * @param arr Array.
+     * @throws IOException In case of error.
+     */
+    void writeBooleanArray(boolean[] arr) throws IOException {
+        out.writeBooleanArray(arr);
+    }
+
+    /**
+     * Writes {@link String}.
+     *
+     * @param str String.
+     * @throws IOException In case of error.
+     */
+    void writeString(String str) throws IOException {
+        out.writeUTF(str);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeBoolean(boolean v) throws IOException {
+        out.writeBoolean(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeByte(int v) throws IOException {
+        out.writeByte(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeShort(int v) throws IOException {
+        out.writeShort(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeChar(int v) throws IOException {
+        out.writeChar(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeInt(int v) throws IOException {
+        out.writeInt(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeLong(long v) throws IOException {
+        out.writeLong(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeFloat(float v) throws IOException {
+        out.writeFloat(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeDouble(double v) throws IOException {
+        out.writeDouble(v);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void write(int b) throws IOException {
+        writeByte(b);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeBytes(String s) throws IOException {
+        out.writeBytes(s);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeChars(String s) throws IOException {
+        out.writeChars(s);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeUTF(String s) throws IOException {
+        out.writeUTF(s);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void useProtocolVersion(int ver) throws IOException {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeUnshared(Object obj) throws IOException {
+        writeObject0(obj);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void defaultWriteObject() throws IOException {
+        if (curObj == null)
+            throw new NotActiveException("Not in writeObject() call.");
+
+        writeFields(curObj, curFields);
+    }
+
+    /** {@inheritDoc} */
+    @Override public ObjectOutputStream.PutField putFields() throws IOException {
+        if (curObj == null)
+            throw new NotActiveException("Not in writeObject() call or fields already written.");
+
+        if (curPut == null)
+            curPut = new PutFieldImpl(this);
+
+        return curPut;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void writeFields() throws IOException {
+        if (curObj == null)
+            throw new NotActiveException("Not in writeObject() call.");
+
+        if (curPut == null)
+            throw new NotActiveException("putFields() was not called.");
+
+        for (IgniteBiTuple<IgniteOptimizedFieldType, Object> t : curPut.objs) {
+            switch (t.get1()) {
+                case BYTE:
+                    writeByte((Byte)t.get2());
+
+                    break;
+
+                case SHORT:
+                    writeShort((Short)t.get2());
+
+                    break;
+
+                case INT:
+                    writeInt((Integer)t.get2());
+
+                    break;
+
+                case LONG:
+                    writeLong((Long)t.get2());
+
+                    break;
+
+                case FLOAT:
+                    writeFloat((Float)t.get2());
+
+                    break;
+
+                case DOUBLE:
+                    writeDouble((Double)t.get2());
+
+                    break;
+
+                case CHAR:
+                    writeChar((Character)t.get2());
+
+                    break;
+
+                case BOOLEAN:
+                    writeBoolean((Boolean)t.get2());
+
+                    break;
+
+                case OTHER:
+                    writeObject0(t.get2());
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void reset() throws IOException {
+        out.reset();
+        handles.clear();
+
+        curObj = null;
+        curFields = null;
+        curPut = null;
+        curFieldInfoMap = null;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void flush() throws IOException {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void drain() throws IOException {
+        // No-op.
+    }
+
+    /**
+     * Returns objects that were added to handles table.
+     * Used ONLY for test purposes.
+     *
+     * @return Handled objects.
+     */
+    Object[] handledObjects() {
+        return handles.objects();
+    }
+
+    /**
+     * {@link PutField} implementation.
+     */
+    private static class PutFieldImpl extends PutField {
+        /** Stream. */
+        private final IgniteOptimizedObjectOutputStream out;
+
+        /** Field info map. */
+        private final Map<String, IgniteBiTuple<Integer, IgniteOptimizedFieldType>> fieldInfoMap;
+
+        /** Values. */
+        private final IgniteBiTuple<IgniteOptimizedFieldType, Object>[] objs;
+
+        /**
+         * @param out Output stream.
+         * @throws IOException In case of error.
+         */
+        @SuppressWarnings("unchecked")
+        private PutFieldImpl(IgniteOptimizedObjectOutputStream out) {
+            this.out = out;
+
+            fieldInfoMap = out.curFieldInfoMap;
+
+            objs = new IgniteBiTuple[fieldInfoMap.size()];
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, boolean val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, byte val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, char val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, short val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, int val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, long val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, float val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, double val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void put(String name, Object val) {
+            value(name, val);
+        }
+
+        /** {@inheritDoc} */
+        @Override public void write(ObjectOutput out) throws IOException {
+            if (out != this.out)
+                throw new IllegalArgumentException("Wrong stream.");
+
+            this.out.writeFields();
+        }
+
+        /**
+         * @param name Field name.
+         * @param val Value.
+         */
+        private void value(String name, Object val) {
+            IgniteBiTuple<Integer, IgniteOptimizedFieldType> info = fieldInfoMap.get(name);
+
+            objs[info.get1()] = F.t(info.get2(), val);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java
new file mode 100644
index 0000000..f4e8c8c
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/IgniteOptimizedObjectStreamRegistry.java
@@ -0,0 +1,215 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.marshaller.optimized;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.gridgain.grid.util.io.*;
+
+import java.io.*;
+import java.util.concurrent.*;
+
+/**
+ * Storage for object streams.
+ */
+class IgniteOptimizedObjectStreamRegistry {
+    /** Holders. */
+    private static final ThreadLocal<StreamHolder> holders = new ThreadLocal<>();
+
+    /** Holders pool. */
+    private static BlockingQueue<StreamHolder> pool;
+
+    /**
+     * Ensures singleton.
+     */
+    private IgniteOptimizedObjectStreamRegistry() {
+        // No-op.
+    }
+
+    /**
+     * Sets streams pool size.
+     *
+     * @param size Streams pool size.
+     */
+    static void poolSize(int size) {
+        if (size > 0) {
+            pool = new LinkedBlockingQueue<>(size);
+
+            for (int i = 0; i < size; i++) {
+                boolean b = pool.offer(new StreamHolder());
+
+                assert b;
+            }
+        }
+        else
+            pool = null;
+    }
+
+    /**
+     * Gets output stream.
+     *
+     * @return Object output stream.
+     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     */
+    static IgniteOptimizedObjectOutputStream out() throws GridInterruptedException {
+        return holder().acquireOut();
+    }
+
+    /**
+     * Gets input stream.
+     *
+     * @return Object input stream.
+     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     */
+    static IgniteOptimizedObjectInputStream in() throws GridInterruptedException {
+        return holder().acquireIn();
+    }
+
+    /**
+     * Closes and releases output stream.
+     *
+     * @param out Object output stream.
+     */
+    static void closeOut(IgniteOptimizedObjectOutputStream out) {
+        U.close(out, null);
+
+        StreamHolder holder = holders.get();
+
+        holder.releaseOut();
+
+        if (pool != null) {
+            holders.remove();
+
+            boolean b = pool.offer(holder);
+
+            assert b;
+        }
+    }
+
+    /**
+     * Closes and releases input stream.
+     *
+     * @param in Object input stream.
+     */
+    @SuppressWarnings("TypeMayBeWeakened")
+    static void closeIn(IgniteOptimizedObjectInputStream in) {
+        U.close(in, null);
+
+        StreamHolder holder = holders.get();
+
+        holder.releaseIn();
+
+        if (pool != null) {
+            holders.remove();
+
+            boolean b = pool.offer(holder);
+
+            assert b;
+        }
+    }
+
+    /**
+     * Gets holder from pool or thread local.
+     *
+     * @return Stream holder.
+     * @throws GridInterruptedException If thread is interrupted while trying to take holder from pool.
+     */
+    private static StreamHolder holder() throws GridInterruptedException {
+        StreamHolder holder = holders.get();
+
+        if (holder == null) {
+            try {
+                holders.set(holder = pool != null ? pool.take() : new StreamHolder());
+            }
+            catch (InterruptedException e) {
+                throw new GridInterruptedException("Failed to take object stream from pool (thread interrupted).", e);
+            }
+        }
+
+        return holder;
+    }
+
+    /**
+     * Streams holder.
+     */
+    private static class StreamHolder {
+        /** Output stream. */
+        private final IgniteOptimizedObjectOutputStream out = createOut();
+
+        /** Input stream. */
+        private final IgniteOptimizedObjectInputStream in = createIn();
+
+        /** Output streams counter. */
+        private int outAcquireCnt;
+
+        /** Input streams counter. */
+        private int inAcquireCnt;
+
+        /**
+         * Gets output stream.
+         *
+         * @return Object output stream.
+         */
+        IgniteOptimizedObjectOutputStream acquireOut() {
+            return outAcquireCnt++ > 0 ? createOut() : out;
+        }
+
+        /**
+         * Gets input stream.
+         *
+         * @return Object input stream.
+         */
+        IgniteOptimizedObjectInputStream acquireIn() {
+            return inAcquireCnt++ > 0 ? createIn() : in;
+        }
+
+        /**
+         * Releases output stream.
+         */
+        void releaseOut() {
+            outAcquireCnt--;
+        }
+
+        /**
+         * Releases input stream.
+         */
+        void releaseIn() {
+            inAcquireCnt--;
+        }
+
+        /**
+         * Creates output stream.
+         *
+         * @return Object output stream.
+         */
+        private IgniteOptimizedObjectOutputStream createOut() {
+            try {
+                return new IgniteOptimizedObjectOutputStream(new GridUnsafeDataOutput(4 * 1024));
+            }
+            catch (IOException e) {
+                throw new GridRuntimeException("Failed to create object output stream.", e);
+            }
+        }
+
+        /**
+         * Creates input stream.
+         *
+         * @return Object input stream.
+         */
+        private IgniteOptimizedObjectInputStream createIn() {
+            try {
+                return new IgniteOptimizedObjectInputStream(new GridUnsafeDataInput());
+            }
+            catch (IOException e) {
+                throw new GridRuntimeException("Failed to create object input stream.", e);
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
index e907146..f2dac0d 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -216,7 +216,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
         Object obj = new SomeSerializable(null);
 
         // Clear caches.
-        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
+        ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
         IgniteOptimizedClassResolver.userClasses(null, null);
 
         GridMarshaller marsh = new IgniteOptimizedMarshaller();
@@ -224,7 +224,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
         int size1 = marsh.marshal(obj).length;
 
         // Clear caches.
-        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
+        ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
         IgniteOptimizedClassResolver.userClasses(null, null);
 
         IgniteOptimizedMarshaller marshPreregistered = new IgniteOptimizedMarshaller();
@@ -246,7 +246,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
         Object obj = new SomeSerializable(null);
 
         // Clear caches.
-        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
+        ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
         IgniteOptimizedClassResolver.userClasses(null, null);
 
         GridMarshaller marsh = new IgniteOptimizedMarshaller();
@@ -254,7 +254,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
         int size1 = marsh.marshal(obj).length;
 
         // Clear caches.
-        ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
+        ((Map)U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
         IgniteOptimizedClassResolver.userClasses(null, null);
 
         IgniteOptimizedMarshaller marshPreregistered = new IgniteOptimizedMarshaller();
@@ -318,7 +318,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
             ignite.compute().execute(taskClsName, 2);
 
             ConcurrentMap<Class<?>, IgniteOptimizedClassDescriptor> cache =
-                U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE");
+                U.staticField(IgniteOptimizedMarshallerUtils.class, "CLS_DESC_CACHE");
 
             assertTrue(cache.containsKey(jobCls));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a7c947cc/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
index 3aae159..60c6110 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
@@ -689,7 +689,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testReadLine() throws Exception {
-        GridOptimizedObjectInputStream in = new GridOptimizedObjectInputStream(new GridUnsafeDataInput());
+        IgniteOptimizedObjectInputStream in = new IgniteOptimizedObjectInputStream(new GridUnsafeDataInput());
 
         byte[] bytes = "line1\nline2\r\nli\rne3\nline4".getBytes();
 
@@ -859,7 +859,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testReadToArray() throws Exception {
-        GridOptimizedObjectInputStream in = GridOptimizedObjectStreamRegistry.in();
+        IgniteOptimizedObjectInputStream in = IgniteOptimizedObjectStreamRegistry.in();
 
         try {
             byte[] arr = new byte[50];
@@ -898,7 +898,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
                 assertEquals(i < 10 ? 40 + i : 0, buf[i]);
         }
         finally {
-            GridOptimizedObjectStreamRegistry.closeIn(in);
+            IgniteOptimizedObjectStreamRegistry.closeIn(in);
         }
     }
 
@@ -978,11 +978,11 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
      * @throws Exception In case of error.
      */
     private <T> T marshalUnmarshal(@Nullable Object obj) throws Exception {
-        GridOptimizedObjectOutputStream out = null;
-        GridOptimizedObjectInputStream in = null;
+        IgniteOptimizedObjectOutputStream out = null;
+        IgniteOptimizedObjectInputStream in = null;
 
         try {
-            out = GridOptimizedObjectStreamRegistry.out();
+            out = IgniteOptimizedObjectStreamRegistry.out();
 
             out.requireSerializable(true);
 
@@ -990,7 +990,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
 
             byte[] arr = out.out().array();
 
-            in = GridOptimizedObjectStreamRegistry.in();
+            in = IgniteOptimizedObjectStreamRegistry.in();
 
             in.classLoader(getClass().getClassLoader());
 
@@ -1003,8 +1003,8 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
             return (T)obj0;
         }
         finally {
-            GridOptimizedObjectStreamRegistry.closeOut(out);
-            GridOptimizedObjectStreamRegistry.closeIn(in);
+            IgniteOptimizedObjectStreamRegistry.closeOut(out);
+            IgniteOptimizedObjectStreamRegistry.closeIn(in);
         }
     }
 
@@ -1015,7 +1015,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
      * @param in Input stream.
      * @throws Exception If failed.
      */
-    private void checkHandles(GridOptimizedObjectOutputStream out, GridOptimizedObjectInputStream in)
+    private void checkHandles(IgniteOptimizedObjectOutputStream out, IgniteOptimizedObjectInputStream in)
         throws Exception {
         Object[] outHandles = out.handledObjects();
         Object[] inHandles = in.handledObjects();


[07/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: 167133f8c67bb813226122eb406bde4ff3777ad0
Parents: 8e1e281
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:41:25 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:41:25 2014 +0300

----------------------------------------------------------------------
 config/java.util.logging.properties             |   4 +-
 config/router/default-router.xml                |   2 +-
 .../processors/rest/GridTestBinaryClient.java   |   2 +-
 .../processors/rest/GridTestMemcacheClient.java |   2 +-
 .../ignite/logger/java/GridJavaLogger.java      | 382 +++++++++++++++++++
 .../logger/java/GridJavaLoggerFileHandler.java  | 182 +++++++++
 .../logger/java/GridJavaLoggerFormatter.java    |  71 ++++
 .../org/apache/ignite/logger/java/package.html  |  15 +
 .../GridClientConnectionManagerAdapter.java     |   2 +-
 .../client/router/impl/GridTcpRouterImpl.java   |   2 +-
 .../org/gridgain/grid/kernal/GridGainEx.java    |   2 +-
 .../grid/logger/java/GridJavaLogger.java        | 382 -------------------
 .../logger/java/GridJavaLoggerFileHandler.java  | 182 ---------
 .../logger/java/GridJavaLoggerFormatter.java    |  71 ----
 .../org/gridgain/grid/logger/java/package.html  |  15 -
 .../grid/kernal/GridLifecycleAwareSelfTest.java |   2 +-
 .../grid/logger/java/GridJavaLoggerTest.java    |   1 +
 .../marshaller/GridMarshallerResourceBean.java  |   2 +-
 ...artupWithSpecifiedWorkDirectorySelfTest.java |   2 +-
 ...tartupWithUndefinedGridGainHomeSelfTest.java |   2 +-
 .../shmem/GridGgfsSharedMemoryTestClient.java   |   2 +-
 .../shmem/GridIpcSharedMemoryFakeClient.java    |   2 +-
 .../GridIpcSharedMemoryBenchmarkWriter.java     |   2 +-
 23 files changed, 666 insertions(+), 665 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/config/java.util.logging.properties
----------------------------------------------------------------------
diff --git a/config/java.util.logging.properties b/config/java.util.logging.properties
index 33ceafa..d3cf472 100644
--- a/config/java.util.logging.properties
+++ b/config/java.util.logging.properties
@@ -54,14 +54,14 @@ handlers=java.util.logging.ConsoleHandler, org.gridgain.grid.logger.java.GridJav
 # Console handler logs all messages with importance level `INFO` and above
 # into standard error stream (`System.err`).
 #
-java.util.logging.ConsoleHandler.formatter=org.gridgain.grid.logger.java.GridJavaLoggerFormatter
+java.util.logging.ConsoleHandler.formatter=org.apache.ignite.logger.java.GridJavaLoggerFormatter
 java.util.logging.ConsoleHandler.level=INFO
 
 #
 # File handler logs all messages into files with pattern `gridgain-%{id8}.%g.log`
 # under `$GRIDGAIN_HOME/work/log/` directory. The placeholder `%{id8}` is a truncated node ID.
 #
-org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.formatter=org.gridgain.grid.logger.java.GridJavaLoggerFormatter
+org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.formatter=org.apache.ignite.logger.java.GridJavaLoggerFormatter
 org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.pattern=gridgain-%{id8}.%g.log
 org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.level=INFO
 org.gridgain.grid.logger.java.GridJavaLoggerFileHandler.limit=10485760

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/config/router/default-router.xml
----------------------------------------------------------------------
diff --git a/config/router/default-router.xml b/config/router/default-router.xml
index 6fc7291..d4fd036 100644
--- a/config/router/default-router.xml
+++ b/config/router/default-router.xml
@@ -41,5 +41,5 @@
     <!--
         Logger with the same configuration as in default grid instances.
     -->
-    <bean id="router.log" class="org.gridgain.grid.logger.java.GridJavaLogger"/>
+    <bean id="router.log" class="org.apache.ignite.logger.java.GridJavaLogger"/>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
index 9c2e61f..5397115 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestBinaryClient.java
@@ -10,11 +10,11 @@
 package org.gridgain.grid.kernal.processors.rest;
 
 import org.apache.ignite.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.client.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
index 6ed95d7..23656b9 100644
--- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
+++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridTestMemcacheClient.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal.processors.rest;
 
 import org.apache.ignite.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLogger.java
new file mode 100644
index 0000000..d2c8ff4
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLogger.java
@@ -0,0 +1,382 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.java;
+
+import org.apache.ignite.*;
+import org.apache.ignite.logger.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.lang.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.util.logging.*;
+
+import static java.util.logging.Level.*;
+import static org.gridgain.grid.GridSystemProperties.*;
+
+/**
+ * Logger to use with Java logging. Implementation simply delegates to Java Logging.
+ * <p>
+ * Here is an example of configuring Java logger in GridGain configuration Spring
+ * file to work over log4j implementation. Note that we use the same configuration file
+ * as we provide by default:
+ * <pre name="code" class="xml">
+ *      ...
+ *      &lt;property name="gridLogger"&gt;
+ *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"&gt;
+ *              &lt;constructor-arg type="java.util.logging.Logger"&gt;
+ *                  &lt;bean class="java.util.logging.Logger"&gt;
+ *                      &lt;constructor-arg type="java.lang.String" value="global"/&gt;
+ *                  &lt;/bean&gt;
+ *              &lt;/constructor-arg&gt;
+ *          &lt;/bean&gt;
+ *      &lt;/property&gt;
+ *      ...
+ * </pre>
+ * or
+ * <pre name="code" class="xml">
+ *      ...
+ *      &lt;property name="gridLogger"&gt;
+ *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"/&gt;
+ *      &lt;/property&gt;
+ *      ...
+ * </pre>
+ * And the same configuration if you'd like to configure GridGain in your code:
+ * <pre name="code" class="java">
+ *      GridConfiguration cfg = new GridConfiguration();
+ *      ...
+ *      GridLogger log = new GridJavaLogger(Logger.global);
+ *      ...
+ *      cfg.setGridLogger(log);
+ * </pre>
+ * or which is actually the same:
+ * <pre name="code" class="java">
+ *      GridConfiguration cfg = new GridConfiguration();
+ *      ...
+ *      GridLogger log = new GridJavaLogger();
+ *      ...
+ *      cfg.setGridLogger(log);
+ * </pre>
+ * Please take a look at <a target=_new href="http://java.sun.com/j2se/1.4.2/docs/api20/java/util/logging/Logger.html">Logger javadoc</a>
+ * for additional information.
+ * <p>
+ * It's recommended to use GridGain logger injection instead of using/instantiating
+ * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
+ * injection.
+ */
+public class GridJavaLogger extends GridMetadataAwareAdapter implements IgniteLogger, GridLoggerNodeIdAware {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** */
+    public static final String DFLT_CONFIG_PATH = "config/java.util.logging.properties";
+
+    /** */
+    private static final Object mux = new Object();
+
+    /** */
+    private static volatile boolean inited;
+
+    /** */
+    private static volatile boolean quiet0;
+
+    /** Java Logging implementation proxy. */
+    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+    private Logger impl;
+
+    /** Quiet flag. */
+    private final boolean quiet;
+
+    /** Node ID. */
+    private volatile UUID nodeId;
+
+    /**
+     * Creates new logger.
+     */
+    public GridJavaLogger() {
+        this(!isConfigured());
+    }
+
+    /**
+     * Checks if logger is already configured within this VM or not.
+     *
+     * @return {@code True} if logger was already configured, {@code false} otherwise.
+     */
+    public static boolean isConfigured() {
+        return System.getProperty("java.util.logging.config.file") != null;
+    }
+
+    /**
+     * Reads default JUL configuration.
+     */
+    private void defaultConfiguration() {
+        final URL cfgUrl = U.resolveGridGainUrl(DFLT_CONFIG_PATH);
+
+        if (cfgUrl == null) {
+            error("Failed to resolve default logging config file: " + DFLT_CONFIG_PATH);
+
+            return;
+        }
+
+        try (InputStream in = cfgUrl.openStream()) {
+            LogManager.getLogManager().readConfiguration(in);
+        }
+        catch (IOException e) {
+            error("Failed to read logging configuration: " + cfgUrl, e);
+        }
+    }
+
+    /**
+     * Creates new logger.
+     *
+     * @param init If {@code true}, then a default console appender will be created.
+     *      If {@code false}, then no implicit initialization will take place,
+     *      and java logger should be configured prior to calling this constructor.
+     */
+    public GridJavaLogger(boolean init) {
+        impl = Logger.getLogger("");
+
+        if (init) {
+            // Implementation has already been inited, passing NULL.
+            configure(null);
+
+            quiet = quiet0;
+        }
+        else
+            quiet = true;
+    }
+
+    /**
+     * Creates new logger with given implementation.
+     *
+     * @param impl Java Logging implementation to use.
+     */
+    public GridJavaLogger(final Logger impl) {
+        assert impl != null;
+
+        configure(impl);
+
+        quiet = quiet0;
+    }
+
+    /** {@inheritDoc} */
+    @Override public IgniteLogger getLogger(Object ctgr) {
+        return new GridJavaLogger(ctgr == null ? Logger.getLogger("") : Logger.getLogger(
+            ctgr instanceof Class ? ((Class)ctgr).getName() : String.valueOf(ctgr)));
+    }
+
+    /**
+     * Configures handlers when needed.
+     *
+     * @param initImpl Optional log implementation.
+     */
+    private void configure(@Nullable Logger initImpl) {
+        if (initImpl != null)
+            impl = initImpl;
+
+        if (inited)
+            return;
+
+        synchronized (mux) {
+            if (inited)
+                return;
+
+            if (isConfigured()) {
+                boolean consoleHndFound = findHandler(impl, ConsoleHandler.class) != null;
+
+                // User configured console appender, thus log is not quiet.
+                quiet0 = !consoleHndFound;
+                inited = true;
+
+                return;
+            }
+
+            defaultConfiguration();
+
+            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
+            boolean useConsoleAppender = Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"));
+
+            if (useConsoleAppender) {
+                ConsoleHandler consoleHnd = findHandler(impl, ConsoleHandler.class);
+
+                if (consoleHnd != null)
+                    consoleHnd.setLevel(quiet ? SEVERE : INFO);
+                else
+                    System.err.println("Console logging handler is not configured.");
+            }
+            else {
+                Handler[] handlers = Logger.getLogger("").getHandlers();
+
+                if  (!F.isEmpty(handlers)) {
+                    for (Handler h : handlers) {
+                        if (h instanceof ConsoleHandler)
+                            impl.removeHandler(h);
+                    }
+                }
+            }
+
+            quiet0 = quiet;
+            inited = true;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void trace(String msg) {
+        if (!impl.isLoggable(FINEST))
+            warning("Logging at TRACE level without checking if TRACE level is enabled: " + msg);
+
+        impl.finest(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void debug(String msg) {
+        if (!impl.isLoggable(FINE))
+            warning("Logging at DEBUG level without checking if DEBUG level is enabled: " + msg);
+
+        impl.fine(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void info(String msg) {
+        if (!impl.isLoggable(INFO))
+            warning("Logging at INFO level without checking if INFO level is enabled: " + msg);
+
+        impl.info(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg) {
+        impl.warning(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg, @Nullable Throwable e) {
+        impl.log(WARNING, msg, e);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg) {
+        impl.severe(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isQuiet() {
+        return quiet;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg, @Nullable Throwable e) {
+        impl.log(SEVERE, msg, e);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isTraceEnabled() {
+        return impl.isLoggable(FINEST);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isDebugEnabled() {
+        return impl.isLoggable(FINE);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isInfoEnabled() {
+        return impl.isLoggable(INFO);
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public String fileName() {
+        GridJavaLoggerFileHandler gridFileHnd = findHandler(impl, GridJavaLoggerFileHandler.class);
+
+        if (gridFileHnd != null)
+            return gridFileHnd.fileName();
+
+        FileHandler fileHnd = findHandler(impl, FileHandler.class);
+
+        return fileName(fileHnd);
+    }
+
+    /**
+     * @param fileHnd File handler.
+     * @return Current log file or {@code null} if it can not be retrieved from file handler.
+     */
+    @Nullable static String fileName(FileHandler fileHnd) {
+        if (fileHnd == null)
+            return null;
+
+        try {
+            File[] logFiles = U.field(fileHnd, "files");
+
+            return logFiles[0].getAbsolutePath();
+        }
+        catch (Exception ignored) {
+            return null;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void setNodeId(UUID nodeId) {
+        A.notNull(nodeId, "nodeId");
+
+        if (this.nodeId != null)
+            return;
+
+        synchronized (mux) {
+            // Double check.
+            if (this.nodeId != null)
+                return;
+
+            this.nodeId = nodeId;
+        }
+
+        GridJavaLoggerFileHandler fileHnd = findHandler(impl, GridJavaLoggerFileHandler.class);
+
+        if (fileHnd == null)
+            return;
+
+        try {
+            fileHnd.nodeId(nodeId);
+        }
+        catch (GridException | IOException e) {
+            throw new RuntimeException("Failed to enable file handler.", e);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public UUID getNodeId() {
+        return nodeId;
+    }
+
+    /**
+     * Returns first found handler of specified class type or {@code null} if that handler isn't configured.
+     *
+     * @param log Logger.
+     * @param cls Class.
+     * @param <T> Class type.
+     * @return First found handler of specified class type or {@code null} if that handler isn't configured.
+     */
+    @SuppressWarnings("unchecked")
+    private static <T> T findHandler(Logger log, Class<T> cls) {
+        while (log != null) {
+            for (Handler hnd : log.getHandlers()) {
+                if (cls.isInstance(hnd))
+                    return (T)hnd;
+            }
+
+            log = log.getParent();
+        }
+
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFileHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFileHandler.java b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFileHandler.java
new file mode 100644
index 0000000..61340dd
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFileHandler.java
@@ -0,0 +1,182 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.java;
+
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+
+/**
+ * File logging handler which skips all the messages until node ID is set.
+ */
+public final class GridJavaLoggerFileHandler extends StreamHandler {
+    /** Log manager. */
+    private static final LogManager manager = LogManager.getLogManager();
+
+    /** Handler delegate. */
+    private volatile FileHandler delegate;
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public void publish(LogRecord record) {
+        FileHandler delegate0 = delegate;
+
+        if (delegate0 != null)
+            delegate0.publish(record);
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public void flush() {
+        FileHandler delegate0 = delegate;
+
+        if (delegate0 != null)
+            delegate0.flush();
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public void close() throws SecurityException {
+        FileHandler delegate0 = delegate;
+
+        if (delegate0 != null)
+            delegate0.close();
+    }
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
+    @Override public boolean isLoggable(LogRecord record) {
+        FileHandler delegate0 = delegate;
+
+        return delegate0 != null && delegate0.isLoggable(record);
+    }
+
+    /**
+     * Sets Node id and instantiates {@link FileHandler} delegate.
+     *
+     * @param nodeId Node id.
+     */
+    public void nodeId(UUID nodeId) throws GridException, IOException {
+        if (delegate != null)
+            return;
+
+        String clsName = getClass().getName();
+
+        String ptrn = manager.getProperty(clsName + ".pattern");
+
+        if (ptrn == null)
+            ptrn = "gridgain-%{id8}.%g.log";
+
+        ptrn = new File(logDirectory(), ptrn.replace("%{id8}", U.id8(nodeId))).getAbsolutePath();
+
+        int limit = getIntProperty(clsName + ".limit", 0);
+
+        if (limit < 0)
+            limit = 0;
+
+        int cnt = getIntProperty(clsName + ".count", 1);
+
+        if (cnt <= 0)
+            cnt = 1;
+
+        boolean append = getBooleanProperty(clsName + ".append", false);
+
+        FileHandler delegate0;
+
+        synchronized (this) {
+            if (delegate != null)
+                return;
+
+            delegate = delegate0 = new FileHandler(ptrn, limit, cnt, append);
+        }
+
+        delegate0.setLevel(getLevel());
+        delegate0.setFormatter(getFormatter());
+        delegate0.setEncoding(getEncoding());
+        delegate0.setFilter(getFilter());
+        delegate0.setErrorManager(getErrorManager());
+    }
+
+    /**
+     * Returns current log file.
+     *
+     * @return Pattern or {@code null} if node id has not been set yet.
+     */
+    @Nullable public String fileName() {
+        return GridJavaLogger.fileName(delegate);
+    }
+
+    /**
+     * Resolves logging directory.
+     *
+     * @return Logging directory.
+     */
+    private static File logDirectory() throws GridException {
+        return !F.isEmpty(U.GRIDGAIN_LOG_DIR) ? new File(U.GRIDGAIN_LOG_DIR) : U.resolveWorkDirectory("log", false);
+    }
+
+    /**
+     * Returns integer property from logging configuration.
+     *
+     * @param name Property name.
+     * @param dfltVal Default value.
+     * @return Parsed property value if it is set and valid or default value otherwise.
+     */
+    private int getIntProperty(String name, int dfltVal) {
+        String val = manager.getProperty(name);
+
+        if (val == null)
+            return dfltVal;
+
+        try {
+            return Integer.parseInt(val.trim());
+        }
+        catch (Exception ex) {
+            ex.printStackTrace();
+
+            return dfltVal;
+        }
+    }
+
+    /**
+     * Returns boolean property from logging configuration.
+     *
+     * @param name Property name.
+     * @param dfltVal Default value.
+     * @return Parsed property value if it is set and valid or default value otherwise.
+     */
+    @SuppressWarnings("SimplifiableIfStatement")
+    private boolean getBooleanProperty(String name, boolean dfltVal) {
+        String val = manager.getProperty(name);
+
+        if (val == null)
+            return dfltVal;
+
+        val = val.toLowerCase();
+
+        if ("true".equals(val) || "1".equals(val))
+            return true;
+
+        if ("false".equals(val) || "0".equals(val))
+            return false;
+
+        return dfltVal;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(GridJavaLoggerFileHandler.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFormatter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFormatter.java b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFormatter.java
new file mode 100644
index 0000000..71d3838
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/GridJavaLoggerFormatter.java
@@ -0,0 +1,71 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.java;
+
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+import java.text.*;
+import java.util.*;
+import java.util.logging.Formatter;
+import java.util.logging.*;
+
+/**
+ * Formatter for JUL logger.
+ */
+public class GridJavaLoggerFormatter extends Formatter {
+    /** Name for anonymous loggers. */
+    public static final String ANONYMOUS_LOGGER_NAME = "UNKNOWN";
+
+    /** */
+    private static final ThreadLocal<SimpleDateFormat> DATE_FORMATTER = new ThreadLocal<SimpleDateFormat>() {
+        /** {@inheritDoc} */
+        @Override protected SimpleDateFormat initialValue() {
+            return new SimpleDateFormat("HH:mm:ss,SSS");
+        }
+    };
+
+    /** {@inheritDoc} */
+    @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
+    @Override public String format(LogRecord record) {
+        String threadName = Thread.currentThread().getName();
+
+        String logName = record.getLoggerName();
+
+        if (logName == null)
+            logName = ANONYMOUS_LOGGER_NAME;
+        else if (logName.contains("."))
+            logName = logName.substring(logName.lastIndexOf('.') + 1);
+
+        String ex = null;
+
+        if (record.getThrown() != null) {
+            StringWriter sw = new StringWriter();
+
+            record.getThrown().printStackTrace(new PrintWriter(sw));
+
+            String stackTrace = sw.toString();
+
+            ex = "\n" + stackTrace;
+        }
+
+        return "[" + DATE_FORMATTER.get().format(new Date(record.getMillis())) + "][" +
+            record.getLevel() + "][" +
+            threadName + "][" +
+            logName + "] " +
+            record.getMessage() +
+            (ex == null ? "\n" : ex);
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(GridJavaLoggerFormatter.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/apache/ignite/logger/java/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/package.html b/modules/core/src/main/java/org/apache/ignite/logger/java/package.html
new file mode 100644
index 0000000..a0df9dc
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/package.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+    @html.file.header
+    _________        _____ __________________        _____
+    __  ____/___________(_)______  /__  ____/______ ____(_)_______
+    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+-->
+<html>
+<body>
+    <!-- Package description. -->
+    Contains Java logging implementation for logging.
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java b/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
index 8a4850f..8592f93 100644
--- a/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -10,12 +10,12 @@
 package org.gridgain.client.impl.connection;
 
 import org.apache.ignite.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.client.*;
 import org.gridgain.client.impl.*;
 import org.gridgain.client.util.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.util.direct.*;
 import org.gridgain.grid.util.nio.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
index fc08d5d..6c4d6c5 100644
--- a/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
+++ b/modules/core/src/main/java/org/gridgain/client/router/impl/GridTcpRouterImpl.java
@@ -11,12 +11,12 @@ package org.gridgain.client.router.impl;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.client.*;
 import org.gridgain.client.router.*;
 import org.gridgain.client.ssl.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
-import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.util.nio.*;
 import org.gridgain.grid.util.nio.ssl.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
index d16e340..f9ac8e1 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java
@@ -13,6 +13,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.logger.*;
+import org.apache.ignite.logger.java.*;
 import org.apache.ignite.mbean.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -21,7 +22,6 @@ import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.kernal.processors.interop.*;
 import org.gridgain.grid.kernal.processors.resource.*;
 import org.gridgain.grid.kernal.processors.spring.*;
-import org.gridgain.grid.logger.java.*;
 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/167133f8/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
deleted file mode 100644
index c22027e..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLogger.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.java;
-
-import org.apache.ignite.*;
-import org.apache.ignite.logger.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.lang.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
-
-import static java.util.logging.Level.*;
-import static org.gridgain.grid.GridSystemProperties.*;
-
-/**
- * Logger to use with Java logging. Implementation simply delegates to Java Logging.
- * <p>
- * Here is an example of configuring Java logger in GridGain configuration Spring
- * file to work over log4j implementation. Note that we use the same configuration file
- * as we provide by default:
- * <pre name="code" class="xml">
- *      ...
- *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"&gt;
- *              &lt;constructor-arg type="java.util.logging.Logger"&gt;
- *                  &lt;bean class="java.util.logging.Logger"&gt;
- *                      &lt;constructor-arg type="java.lang.String" value="global"/&gt;
- *                  &lt;/bean&gt;
- *              &lt;/constructor-arg&gt;
- *          &lt;/bean&gt;
- *      &lt;/property&gt;
- *      ...
- * </pre>
- * or
- * <pre name="code" class="xml">
- *      ...
- *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.java.GridJavaLogger"/&gt;
- *      &lt;/property&gt;
- *      ...
- * </pre>
- * And the same configuration if you'd like to configure GridGain in your code:
- * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
- *      ...
- *      GridLogger log = new GridJavaLogger(Logger.global);
- *      ...
- *      cfg.setGridLogger(log);
- * </pre>
- * or which is actually the same:
- * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
- *      ...
- *      GridLogger log = new GridJavaLogger();
- *      ...
- *      cfg.setGridLogger(log);
- * </pre>
- * Please take a look at <a target=_new href="http://java.sun.com/j2se/1.4.2/docs/api20/java/util/logging/Logger.html">Logger javadoc</a>
- * for additional information.
- * <p>
- * It's recommended to use GridGain logger injection instead of using/instantiating
- * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
- * injection.
- */
-public class GridJavaLogger extends GridMetadataAwareAdapter implements IgniteLogger, GridLoggerNodeIdAware {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
-    public static final String DFLT_CONFIG_PATH = "config/java.util.logging.properties";
-
-    /** */
-    private static final Object mux = new Object();
-
-    /** */
-    private static volatile boolean inited;
-
-    /** */
-    private static volatile boolean quiet0;
-
-    /** Java Logging implementation proxy. */
-    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-    private Logger impl;
-
-    /** Quiet flag. */
-    private final boolean quiet;
-
-    /** Node ID. */
-    private volatile UUID nodeId;
-
-    /**
-     * Creates new logger.
-     */
-    public GridJavaLogger() {
-        this(!isConfigured());
-    }
-
-    /**
-     * Checks if logger is already configured within this VM or not.
-     *
-     * @return {@code True} if logger was already configured, {@code false} otherwise.
-     */
-    public static boolean isConfigured() {
-        return System.getProperty("java.util.logging.config.file") != null;
-    }
-
-    /**
-     * Reads default JUL configuration.
-     */
-    private void defaultConfiguration() {
-        final URL cfgUrl = U.resolveGridGainUrl(DFLT_CONFIG_PATH);
-
-        if (cfgUrl == null) {
-            error("Failed to resolve default logging config file: " + DFLT_CONFIG_PATH);
-
-            return;
-        }
-
-        try (InputStream in = cfgUrl.openStream()) {
-            LogManager.getLogManager().readConfiguration(in);
-        }
-        catch (IOException e) {
-            error("Failed to read logging configuration: " + cfgUrl, e);
-        }
-    }
-
-    /**
-     * Creates new logger.
-     *
-     * @param init If {@code true}, then a default console appender will be created.
-     *      If {@code false}, then no implicit initialization will take place,
-     *      and java logger should be configured prior to calling this constructor.
-     */
-    public GridJavaLogger(boolean init) {
-        impl = Logger.getLogger("");
-
-        if (init) {
-            // Implementation has already been inited, passing NULL.
-            configure(null);
-
-            quiet = quiet0;
-        }
-        else
-            quiet = true;
-    }
-
-    /**
-     * Creates new logger with given implementation.
-     *
-     * @param impl Java Logging implementation to use.
-     */
-    public GridJavaLogger(final Logger impl) {
-        assert impl != null;
-
-        configure(impl);
-
-        quiet = quiet0;
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteLogger getLogger(Object ctgr) {
-        return new GridJavaLogger(ctgr == null ? Logger.getLogger("") : Logger.getLogger(
-            ctgr instanceof Class ? ((Class)ctgr).getName() : String.valueOf(ctgr)));
-    }
-
-    /**
-     * Configures handlers when needed.
-     *
-     * @param initImpl Optional log implementation.
-     */
-    private void configure(@Nullable Logger initImpl) {
-        if (initImpl != null)
-            impl = initImpl;
-
-        if (inited)
-            return;
-
-        synchronized (mux) {
-            if (inited)
-                return;
-
-            if (isConfigured()) {
-                boolean consoleHndFound = findHandler(impl, ConsoleHandler.class) != null;
-
-                // User configured console appender, thus log is not quiet.
-                quiet0 = !consoleHndFound;
-                inited = true;
-
-                return;
-            }
-
-            defaultConfiguration();
-
-            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
-            boolean useConsoleAppender = Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"));
-
-            if (useConsoleAppender) {
-                ConsoleHandler consoleHnd = findHandler(impl, ConsoleHandler.class);
-
-                if (consoleHnd != null)
-                    consoleHnd.setLevel(quiet ? SEVERE : INFO);
-                else
-                    System.err.println("Console logging handler is not configured.");
-            }
-            else {
-                Handler[] handlers = Logger.getLogger("").getHandlers();
-
-                if  (!F.isEmpty(handlers)) {
-                    for (Handler h : handlers) {
-                        if (h instanceof ConsoleHandler)
-                            impl.removeHandler(h);
-                    }
-                }
-            }
-
-            quiet0 = quiet;
-            inited = true;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void trace(String msg) {
-        if (!impl.isLoggable(FINEST))
-            warning("Logging at TRACE level without checking if TRACE level is enabled: " + msg);
-
-        impl.finest(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void debug(String msg) {
-        if (!impl.isLoggable(FINE))
-            warning("Logging at DEBUG level without checking if DEBUG level is enabled: " + msg);
-
-        impl.fine(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void info(String msg) {
-        if (!impl.isLoggable(INFO))
-            warning("Logging at INFO level without checking if INFO level is enabled: " + msg);
-
-        impl.info(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg) {
-        impl.warning(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg, @Nullable Throwable e) {
-        impl.log(WARNING, msg, e);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg) {
-        impl.severe(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isQuiet() {
-        return quiet;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg, @Nullable Throwable e) {
-        impl.log(SEVERE, msg, e);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isTraceEnabled() {
-        return impl.isLoggable(FINEST);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isDebugEnabled() {
-        return impl.isLoggable(FINE);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isInfoEnabled() {
-        return impl.isLoggable(INFO);
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public String fileName() {
-        GridJavaLoggerFileHandler gridFileHnd = findHandler(impl, GridJavaLoggerFileHandler.class);
-
-        if (gridFileHnd != null)
-            return gridFileHnd.fileName();
-
-        FileHandler fileHnd = findHandler(impl, FileHandler.class);
-
-        return fileName(fileHnd);
-    }
-
-    /**
-     * @param fileHnd File handler.
-     * @return Current log file or {@code null} if it can not be retrieved from file handler.
-     */
-    @Nullable static String fileName(FileHandler fileHnd) {
-        if (fileHnd == null)
-            return null;
-
-        try {
-            File[] logFiles = U.field(fileHnd, "files");
-
-            return logFiles[0].getAbsolutePath();
-        }
-        catch (Exception ignored) {
-            return null;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void setNodeId(UUID nodeId) {
-        A.notNull(nodeId, "nodeId");
-
-        if (this.nodeId != null)
-            return;
-
-        synchronized (mux) {
-            // Double check.
-            if (this.nodeId != null)
-                return;
-
-            this.nodeId = nodeId;
-        }
-
-        GridJavaLoggerFileHandler fileHnd = findHandler(impl, GridJavaLoggerFileHandler.class);
-
-        if (fileHnd == null)
-            return;
-
-        try {
-            fileHnd.nodeId(nodeId);
-        }
-        catch (GridException | IOException e) {
-            throw new RuntimeException("Failed to enable file handler.", e);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public UUID getNodeId() {
-        return nodeId;
-    }
-
-    /**
-     * Returns first found handler of specified class type or {@code null} if that handler isn't configured.
-     *
-     * @param log Logger.
-     * @param cls Class.
-     * @param <T> Class type.
-     * @return First found handler of specified class type or {@code null} if that handler isn't configured.
-     */
-    @SuppressWarnings("unchecked")
-    private static <T> T findHandler(Logger log, Class<T> cls) {
-        while (log != null) {
-            for (Handler hnd : log.getHandlers()) {
-                if (cls.isInstance(hnd))
-                    return (T)hnd;
-            }
-
-            log = log.getParent();
-        }
-
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLoggerFileHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLoggerFileHandler.java b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLoggerFileHandler.java
deleted file mode 100644
index 6efa03b..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLoggerFileHandler.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.java;
-
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-
-/**
- * File logging handler which skips all the messages until node ID is set.
- */
-public final class GridJavaLoggerFileHandler extends StreamHandler {
-    /** Log manager. */
-    private static final LogManager manager = LogManager.getLogManager();
-
-    /** Handler delegate. */
-    private volatile FileHandler delegate;
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public void publish(LogRecord record) {
-        FileHandler delegate0 = delegate;
-
-        if (delegate0 != null)
-            delegate0.publish(record);
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public void flush() {
-        FileHandler delegate0 = delegate;
-
-        if (delegate0 != null)
-            delegate0.flush();
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public void close() throws SecurityException {
-        FileHandler delegate0 = delegate;
-
-        if (delegate0 != null)
-            delegate0.close();
-    }
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
-    @Override public boolean isLoggable(LogRecord record) {
-        FileHandler delegate0 = delegate;
-
-        return delegate0 != null && delegate0.isLoggable(record);
-    }
-
-    /**
-     * Sets Node id and instantiates {@link FileHandler} delegate.
-     *
-     * @param nodeId Node id.
-     */
-    public void nodeId(UUID nodeId) throws GridException, IOException {
-        if (delegate != null)
-            return;
-
-        String clsName = getClass().getName();
-
-        String ptrn = manager.getProperty(clsName + ".pattern");
-
-        if (ptrn == null)
-            ptrn = "gridgain-%{id8}.%g.log";
-
-        ptrn = new File(logDirectory(), ptrn.replace("%{id8}", U.id8(nodeId))).getAbsolutePath();
-
-        int limit = getIntProperty(clsName + ".limit", 0);
-
-        if (limit < 0)
-            limit = 0;
-
-        int cnt = getIntProperty(clsName + ".count", 1);
-
-        if (cnt <= 0)
-            cnt = 1;
-
-        boolean append = getBooleanProperty(clsName + ".append", false);
-
-        FileHandler delegate0;
-
-        synchronized (this) {
-            if (delegate != null)
-                return;
-
-            delegate = delegate0 = new FileHandler(ptrn, limit, cnt, append);
-        }
-
-        delegate0.setLevel(getLevel());
-        delegate0.setFormatter(getFormatter());
-        delegate0.setEncoding(getEncoding());
-        delegate0.setFilter(getFilter());
-        delegate0.setErrorManager(getErrorManager());
-    }
-
-    /**
-     * Returns current log file.
-     *
-     * @return Pattern or {@code null} if node id has not been set yet.
-     */
-    @Nullable public String fileName() {
-        return GridJavaLogger.fileName(delegate);
-    }
-
-    /**
-     * Resolves logging directory.
-     *
-     * @return Logging directory.
-     */
-    private static File logDirectory() throws GridException {
-        return !F.isEmpty(U.GRIDGAIN_LOG_DIR) ? new File(U.GRIDGAIN_LOG_DIR) : U.resolveWorkDirectory("log", false);
-    }
-
-    /**
-     * Returns integer property from logging configuration.
-     *
-     * @param name Property name.
-     * @param dfltVal Default value.
-     * @return Parsed property value if it is set and valid or default value otherwise.
-     */
-    private int getIntProperty(String name, int dfltVal) {
-        String val = manager.getProperty(name);
-
-        if (val == null)
-            return dfltVal;
-
-        try {
-            return Integer.parseInt(val.trim());
-        }
-        catch (Exception ex) {
-            ex.printStackTrace();
-
-            return dfltVal;
-        }
-    }
-
-    /**
-     * Returns boolean property from logging configuration.
-     *
-     * @param name Property name.
-     * @param dfltVal Default value.
-     * @return Parsed property value if it is set and valid or default value otherwise.
-     */
-    @SuppressWarnings("SimplifiableIfStatement")
-    private boolean getBooleanProperty(String name, boolean dfltVal) {
-        String val = manager.getProperty(name);
-
-        if (val == null)
-            return dfltVal;
-
-        val = val.toLowerCase();
-
-        if ("true".equals(val) || "1".equals(val))
-            return true;
-
-        if ("false".equals(val) || "0".equals(val))
-            return false;
-
-        return dfltVal;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridJavaLoggerFileHandler.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLoggerFormatter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLoggerFormatter.java b/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLoggerFormatter.java
deleted file mode 100644
index 786127d..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/logger/java/GridJavaLoggerFormatter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid.logger.java;
-
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.Formatter;
-import java.util.logging.*;
-
-/**
- * Formatter for JUL logger.
- */
-public class GridJavaLoggerFormatter extends Formatter {
-    /** Name for anonymous loggers. */
-    public static final String ANONYMOUS_LOGGER_NAME = "UNKNOWN";
-
-    /** */
-    private static final ThreadLocal<SimpleDateFormat> DATE_FORMATTER = new ThreadLocal<SimpleDateFormat>() {
-        /** {@inheritDoc} */
-        @Override protected SimpleDateFormat initialValue() {
-            return new SimpleDateFormat("HH:mm:ss,SSS");
-        }
-    };
-
-    /** {@inheritDoc} */
-    @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
-    @Override public String format(LogRecord record) {
-        String threadName = Thread.currentThread().getName();
-
-        String logName = record.getLoggerName();
-
-        if (logName == null)
-            logName = ANONYMOUS_LOGGER_NAME;
-        else if (logName.contains("."))
-            logName = logName.substring(logName.lastIndexOf('.') + 1);
-
-        String ex = null;
-
-        if (record.getThrown() != null) {
-            StringWriter sw = new StringWriter();
-
-            record.getThrown().printStackTrace(new PrintWriter(sw));
-
-            String stackTrace = sw.toString();
-
-            ex = "\n" + stackTrace;
-        }
-
-        return "[" + DATE_FORMATTER.get().format(new Date(record.getMillis())) + "][" +
-            record.getLevel() + "][" +
-            threadName + "][" +
-            logName + "] " +
-            record.getMessage() +
-            (ex == null ? "\n" : ex);
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridJavaLoggerFormatter.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/main/java/org/gridgain/grid/logger/java/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/java/package.html b/modules/core/src/main/java/org/gridgain/grid/logger/java/package.html
deleted file mode 100644
index a0df9dc..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/logger/java/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains Java logging implementation for logging.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index 0d1c9f7..4257740 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.kernal;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.client.ssl.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.segmentation.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/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 274f3f8..174b0e7 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
@@ -12,6 +12,7 @@ package org.gridgain.grid.logger.java;
 import junit.framework.*;
 import org.apache.ignite.*;
 import org.apache.ignite.logger.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/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 b328ba5..bc4b95a 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
@@ -12,9 +12,9 @@ package org.gridgain.grid.marshaller;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.loadbalancer.*;
-import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.thread.*;
 import org.springframework.context.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/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 bbb33ea..71b8827 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
@@ -12,8 +12,8 @@ package org.gridgain.grid.util;
 import junit.framework.*;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.java.*;
 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/167133f8/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 929ec71..523057f 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
@@ -11,8 +11,8 @@ package org.gridgain.grid.util;
 import junit.framework.*;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.java.*;
 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/167133f8/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java
index 928ddd4..6df6491 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridGgfsSharedMemoryTestClient.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.util.ipc.shmem;
 
-import org.gridgain.grid.logger.java.*;
+import org.apache.ignite.logger.java.*;
 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/167133f8/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java
index 18fbf1d..b4f852b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryFakeClient.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid.util.ipc.shmem;
 
-import org.gridgain.grid.logger.java.*;
+import org.apache.ignite.logger.java.*;
 import org.gridgain.grid.util.ipc.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167133f8/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java
index 682fa6d..8f98b23 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/benchmark/GridIpcSharedMemoryBenchmarkWriter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.util.ipc.shmem.benchmark;
 
+import org.apache.ignite.logger.java.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.java.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.ipc.*;
 import org.gridgain.grid.util.ipc.shmem.*;


[23/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3edf39ef/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
new file mode 100644
index 0000000..9038b45
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
@@ -0,0 +1,30621 @@
+EDU.oswego.cs.dl.util.concurrent.BrokenBarrierException
+EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap
+EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap$Segment
+EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap
+EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap$BarrierLock
+EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList
+EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet
+EDU.oswego.cs.dl.util.concurrent.PropertyChangeMulticaster
+EDU.oswego.cs.dl.util.concurrent.TimeoutException
+EDU.oswego.cs.dl.util.concurrent.VetoableChangeMulticaster
+EDU.oswego.cs.dl.util.concurrent.misc.AClongRNG
+EDU.oswego.cs.dl.util.concurrent.misc.AllSynchRNG
+EDU.oswego.cs.dl.util.concurrent.misc.ChanRNG
+EDU.oswego.cs.dl.util.concurrent.misc.DirectExecutorRNG
+EDU.oswego.cs.dl.util.concurrent.misc.FIFORWlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.FifoRNG
+EDU.oswego.cs.dl.util.concurrent.misc.Fraction
+EDU.oswego.cs.dl.util.concurrent.misc.LockedSemRNG
+EDU.oswego.cs.dl.util.concurrent.misc.MutexRNG
+EDU.oswego.cs.dl.util.concurrent.misc.NoSynchRNG
+EDU.oswego.cs.dl.util.concurrent.misc.PooledExecutorRNG
+EDU.oswego.cs.dl.util.concurrent.misc.PrioritySemRNG
+EDU.oswego.cs.dl.util.concurrent.misc.PublicSynchRNG
+EDU.oswego.cs.dl.util.concurrent.misc.QueuedExecutorRNG
+EDU.oswego.cs.dl.util.concurrent.misc.RWLockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.ReaderPrefRWlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.ReentrantRWlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.RlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.SDelegatedRNG
+EDU.oswego.cs.dl.util.concurrent.misc.SemRNG
+EDU.oswego.cs.dl.util.concurrent.misc.SyncDelegatedRNG
+EDU.oswego.cs.dl.util.concurrent.misc.SynchLongRNG
+EDU.oswego.cs.dl.util.concurrent.misc.ThreadedExecutorRNG
+EDU.oswego.cs.dl.util.concurrent.misc.UpdateCommand
+EDU.oswego.cs.dl.util.concurrent.misc.WpRWlockRNG
+EDU.oswego.cs.dl.util.concurrent.misc.WpSemRNG
+antlr.ANTLRError
+antlr.ANTLRException
+antlr.CharStreamException
+antlr.CharStreamIOException
+antlr.CommonAST
+antlr.CommonASTWithHiddenTokens
+antlr.FileCopyException
+antlr.MismatchedCharException
+antlr.MismatchedTokenException
+antlr.NoViableAltException
+antlr.NoViableAltForCharException
+antlr.ParseTreeRule
+antlr.ParseTreeToken
+antlr.RecognitionException
+antlr.SemanticException
+antlr.TokenStreamException
+antlr.TokenStreamIOException
+antlr.TokenStreamRecognitionException
+antlr.TokenStreamRetryException
+antlr.debug.InputBufferEvent
+antlr.debug.MessageEvent
+antlr.debug.NewLineEvent
+antlr.debug.ParserMatchEvent
+antlr.debug.ParserTokenEvent
+antlr.debug.SemanticPredicateEvent
+antlr.debug.SyntacticPredicateEvent
+antlr.debug.TraceEvent
+antlr.debug.misc.ASTFrame
+antlr.debug.misc.JTreeASTPanel
+ch.epfl.lamp.compiler.msil.emit.ILGenerator$$anonfun$Emit$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anon$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$addPrimitive$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseILGenerator$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseOpCode$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseTypeBuilder$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$hasControlChars$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$pad$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printAssemblyBoilerplate$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printAttributes$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printHeader$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printSignature$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printSignature$2
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printTypeParams$1
+ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printTypeParams$1$$anonfun$apply$mcVI$sp$1
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseAssemblyBuilder$1
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseAssemblyBuilder$2
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$1
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$1$$anonfun$apply$mcVI$sp$1
+ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$2
+ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseAssemblyBuilder$1
+ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseAssemblyBuilder$2
+ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseModuleBuilder$1
+ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseModuleBuilder$2
+ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$constructorsEqual$1
+ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$methodsEqual$1
+ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$types2String$1
+ch.epfl.lamp.fjbg.JCode$OffsetTooBigException
+com.amazonaws.AmazonClientException
+com.amazonaws.AmazonServiceException
+com.amazonaws.AmazonServiceException$ErrorType
+com.amazonaws.HttpMethod
+com.amazonaws.Protocol
+com.amazonaws.auth.SignatureVersion
+com.amazonaws.auth.SigningAlgorithm
+com.amazonaws.auth.policy.Statement$Effect
+com.amazonaws.auth.policy.actions.CloudFormationActions
+com.amazonaws.auth.policy.actions.S3Actions
+com.amazonaws.auth.policy.actions.SNSActions
+com.amazonaws.auth.policy.actions.SQSActions
+com.amazonaws.auth.policy.conditions.ArnCondition$ArnComparisonType
+com.amazonaws.auth.policy.conditions.DateCondition$DateComparisonType
+com.amazonaws.auth.policy.conditions.IpAddressCondition$IpAddressComparisonType
+com.amazonaws.auth.policy.conditions.NumericCondition$NumericComparisonType
+com.amazonaws.auth.policy.conditions.StringCondition$StringComparisonType
+com.amazonaws.http.HttpMethodName
+com.amazonaws.services.autoscaling.model.AlreadyExistsException
+com.amazonaws.services.autoscaling.model.InvalidNextTokenException
+com.amazonaws.services.autoscaling.model.LifecycleState
+com.amazonaws.services.autoscaling.model.LimitExceededException
+com.amazonaws.services.autoscaling.model.ResourceInUseException
+com.amazonaws.services.autoscaling.model.ScalingActivityInProgressException
+com.amazonaws.services.autoscaling.model.ScalingActivityStatusCode
+com.amazonaws.services.cloudformation.model.AlreadyExistsException
+com.amazonaws.services.cloudformation.model.Capability
+com.amazonaws.services.cloudformation.model.InsufficientCapabilitiesException
+com.amazonaws.services.cloudformation.model.LimitExceededException
+com.amazonaws.services.cloudformation.model.OnFailure
+com.amazonaws.services.cloudformation.model.ResourceStatus
+com.amazonaws.services.cloudformation.model.StackStatus
+com.amazonaws.services.cloudfront.model.AccessDeniedException
+com.amazonaws.services.cloudfront.model.BatchTooLargeException
+com.amazonaws.services.cloudfront.model.CNAMEAlreadyExistsException
+com.amazonaws.services.cloudfront.model.CloudFrontOriginAccessIdentityAlreadyExistsException
+com.amazonaws.services.cloudfront.model.CloudFrontOriginAccessIdentityInUseException
+com.amazonaws.services.cloudfront.model.DistributionAlreadyExistsException
+com.amazonaws.services.cloudfront.model.DistributionNotDisabledException
+com.amazonaws.services.cloudfront.model.IllegalUpdateException
+com.amazonaws.services.cloudfront.model.InconsistentQuantitiesException
+com.amazonaws.services.cloudfront.model.InvalidArgumentException
+com.amazonaws.services.cloudfront.model.InvalidDefaultRootObjectException
+com.amazonaws.services.cloudfront.model.InvalidIfMatchVersionException
+com.amazonaws.services.cloudfront.model.InvalidOriginAccessIdentityException
+com.amazonaws.services.cloudfront.model.InvalidOriginException
+com.amazonaws.services.cloudfront.model.InvalidRequiredProtocolException
+com.amazonaws.services.cloudfront.model.MissingBodyException
+com.amazonaws.services.cloudfront.model.NoSuchCloudFrontOriginAccessIdentityException
+com.amazonaws.services.cloudfront.model.NoSuchDistributionException
+com.amazonaws.services.cloudfront.model.NoSuchInvalidationException
+com.amazonaws.services.cloudfront.model.NoSuchOriginException
+com.amazonaws.services.cloudfront.model.NoSuchStreamingDistributionException
+com.amazonaws.services.cloudfront.model.OriginProtocolPolicy
+com.amazonaws.services.cloudfront.model.PreconditionFailedException
+com.amazonaws.services.cloudfront.model.StreamingDistributionAlreadyExistsException
+com.amazonaws.services.cloudfront.model.StreamingDistributionNotDisabledException
+com.amazonaws.services.cloudfront.model.TooManyCacheBehaviorsException
+com.amazonaws.services.cloudfront.model.TooManyCloudFrontOriginAccessIdentitiesException
+com.amazonaws.services.cloudfront.model.TooManyDistributionCNAMEsException
+com.amazonaws.services.cloudfront.model.TooManyDistributionsException
+com.amazonaws.services.cloudfront.model.TooManyInvalidationsInProgressException
+com.amazonaws.services.cloudfront.model.TooManyOriginsException
+com.amazonaws.services.cloudfront.model.TooManyStreamingDistributionCNAMEsException
+com.amazonaws.services.cloudfront.model.TooManyStreamingDistributionsException
+com.amazonaws.services.cloudfront.model.TooManyTrustedSignersException
+com.amazonaws.services.cloudfront.model.TrustedSignerDoesNotExistException
+com.amazonaws.services.cloudfront.model.ViewerProtocolPolicy
+com.amazonaws.services.cloudfront_2012_03_15.model.AccessDeniedException
+com.amazonaws.services.cloudfront_2012_03_15.model.BatchTooLargeException
+com.amazonaws.services.cloudfront_2012_03_15.model.CNAMEAlreadyExistsException
+com.amazonaws.services.cloudfront_2012_03_15.model.CloudFrontOriginAccessIdentityAlreadyExistsException
+com.amazonaws.services.cloudfront_2012_03_15.model.CloudFrontOriginAccessIdentityInUseException
+com.amazonaws.services.cloudfront_2012_03_15.model.DistributionAlreadyExistsException
+com.amazonaws.services.cloudfront_2012_03_15.model.DistributionNotDisabledException
+com.amazonaws.services.cloudfront_2012_03_15.model.IllegalUpdateException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidArgumentException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidDefaultRootObjectException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidIfMatchVersionException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidOriginAccessIdentityException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidOriginException
+com.amazonaws.services.cloudfront_2012_03_15.model.InvalidRequiredProtocolException
+com.amazonaws.services.cloudfront_2012_03_15.model.MissingBodyException
+com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchCloudFrontOriginAccessIdentityException
+com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchDistributionException
+com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchInvalidationException
+com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchStreamingDistributionException
+com.amazonaws.services.cloudfront_2012_03_15.model.OriginProtocolPolicy
+com.amazonaws.services.cloudfront_2012_03_15.model.PreconditionFailedException
+com.amazonaws.services.cloudfront_2012_03_15.model.StreamingDistributionAlreadyExistsException
+com.amazonaws.services.cloudfront_2012_03_15.model.StreamingDistributionNotDisabledException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyCloudFrontOriginAccessIdentitiesException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyDistributionCNAMEsException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyDistributionsException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyInvalidationsInProgressException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyStreamingDistributionCNAMEsException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyStreamingDistributionsException
+com.amazonaws.services.cloudfront_2012_03_15.model.TooManyTrustedSignersException
+com.amazonaws.services.cloudfront_2012_03_15.model.TrustedSignerDoesNotExistException
+com.amazonaws.services.cloudsearch.model.BaseException
+com.amazonaws.services.cloudsearch.model.IndexFieldType
+com.amazonaws.services.cloudsearch.model.InternalException
+com.amazonaws.services.cloudsearch.model.InvalidTypeException
+com.amazonaws.services.cloudsearch.model.LimitExceededException
+com.amazonaws.services.cloudsearch.model.OptionState
+com.amazonaws.services.cloudsearch.model.ResourceNotFoundException
+com.amazonaws.services.cloudsearch.model.SearchInstanceType
+com.amazonaws.services.cloudsearch.model.SourceDataFunction
+com.amazonaws.services.cloudwatch.model.ComparisonOperator
+com.amazonaws.services.cloudwatch.model.HistoryItemType
+com.amazonaws.services.cloudwatch.model.InternalServiceException
+com.amazonaws.services.cloudwatch.model.InvalidFormatException
+com.amazonaws.services.cloudwatch.model.InvalidNextTokenException
+com.amazonaws.services.cloudwatch.model.InvalidParameterCombinationException
+com.amazonaws.services.cloudwatch.model.InvalidParameterValueException
+com.amazonaws.services.cloudwatch.model.LimitExceededException
+com.amazonaws.services.cloudwatch.model.MissingRequiredParameterException
+com.amazonaws.services.cloudwatch.model.ResourceNotFoundException
+com.amazonaws.services.cloudwatch.model.StandardUnit
+com.amazonaws.services.cloudwatch.model.StateValue
+com.amazonaws.services.cloudwatch.model.Statistic
+com.amazonaws.services.dynamodb.datamodeling.DynamoDBMapperConfig$ConsistentReads
+com.amazonaws.services.dynamodb.datamodeling.DynamoDBMapperConfig$SaveBehavior
+com.amazonaws.services.dynamodb.datamodeling.DynamoDBMappingException
+com.amazonaws.services.dynamodb.model.AttributeAction
+com.amazonaws.services.dynamodb.model.ComparisonOperator
+com.amazonaws.services.dynamodb.model.ConditionalCheckFailedException
+com.amazonaws.services.dynamodb.model.InternalServerErrorException
+com.amazonaws.services.dynamodb.model.LimitExceededException
+com.amazonaws.services.dynamodb.model.ProvisionedThroughputExceededException
+com.amazonaws.services.dynamodb.model.ResourceInUseException
+com.amazonaws.services.dynamodb.model.ResourceNotFoundException
+com.amazonaws.services.dynamodb.model.ReturnValue
+com.amazonaws.services.dynamodb.model.ScalarAttributeType
+com.amazonaws.services.dynamodb.model.TableStatus
+com.amazonaws.services.ec2.model.ContainerFormat
+com.amazonaws.services.ec2.model.DiskImageFormat
+com.amazonaws.services.ec2.model.DomainType
+com.amazonaws.services.ec2.model.ExportEnvironment
+com.amazonaws.services.ec2.model.HypervisorType
+com.amazonaws.services.ec2.model.ImageState
+com.amazonaws.services.ec2.model.InstanceAttributeName
+com.amazonaws.services.ec2.model.InstanceStateName
+com.amazonaws.services.ec2.model.InstanceType
+com.amazonaws.services.ec2.model.PlacementGroupState
+com.amazonaws.services.ec2.model.PlacementStrategy
+com.amazonaws.services.ec2.model.ResourceType
+com.amazonaws.services.ec2.model.RuleAction
+com.amazonaws.services.ec2.model.SnapshotAttributeName
+com.amazonaws.services.ec2.model.SnapshotState
+com.amazonaws.services.ec2.model.SpotInstanceType
+com.amazonaws.services.ec2.model.VirtualizationType
+com.amazonaws.services.ec2.model.VolumeAttachmentState
+com.amazonaws.services.ec2.model.VolumeAttributeName
+com.amazonaws.services.ec2.model.VolumeState
+com.amazonaws.services.ec2.model.VolumeType
+com.amazonaws.services.elasticache.model.AuthorizationAlreadyExistsException
+com.amazonaws.services.elasticache.model.AuthorizationNotFoundException
+com.amazonaws.services.elasticache.model.CacheClusterAlreadyExistsException
+com.amazonaws.services.elasticache.model.CacheClusterNotFoundException
+com.amazonaws.services.elasticache.model.CacheParameterGroupAlreadyExistsException
+com.amazonaws.services.elasticache.model.CacheParameterGroupNotFoundException
+com.amazonaws.services.elasticache.model.CacheParameterGroupQuotaExceededException
+com.amazonaws.services.elasticache.model.CacheSecurityGroupAlreadyExistsException
+com.amazonaws.services.elasticache.model.CacheSecurityGroupNotFoundException
+com.amazonaws.services.elasticache.model.CacheSecurityGroupQuotaExceededException
+com.amazonaws.services.elasticache.model.ClusterQuotaForCustomerExceededException
+com.amazonaws.services.elasticache.model.InsufficientCacheClusterCapacityException
+com.amazonaws.services.elasticache.model.InvalidCacheClusterStateException
+com.amazonaws.services.elasticache.model.InvalidCacheParameterGroupStateException
+com.amazonaws.services.elasticache.model.InvalidCacheSecurityGroupStateException
+com.amazonaws.services.elasticache.model.InvalidParameterCombinationException
+com.amazonaws.services.elasticache.model.InvalidParameterValueException
+com.amazonaws.services.elasticache.model.NodeQuotaForClusterExceededException
+com.amazonaws.services.elasticache.model.NodeQuotaForCustomerExceededException
+com.amazonaws.services.elasticache.model.ReservedCacheNodeAlreadyExistsException
+com.amazonaws.services.elasticache.model.ReservedCacheNodeNotFoundException
+com.amazonaws.services.elasticache.model.ReservedCacheNodeQuotaExceededException
+com.amazonaws.services.elasticache.model.ReservedCacheNodesOfferingNotFoundException
+com.amazonaws.services.elasticache.model.SourceType
+com.amazonaws.services.elasticbeanstalk.model.ConfigurationDeploymentStatus
+com.amazonaws.services.elasticbeanstalk.model.ConfigurationOptionValueType
+com.amazonaws.services.elasticbeanstalk.model.EnvironmentHealth
+com.amazonaws.services.elasticbeanstalk.model.EnvironmentInfoType
+com.amazonaws.services.elasticbeanstalk.model.EnvironmentStatus
+com.amazonaws.services.elasticbeanstalk.model.EventSeverity
+com.amazonaws.services.elasticbeanstalk.model.S3SubscriptionRequiredException
+com.amazonaws.services.elasticbeanstalk.model.SourceBundleDeletionException
+com.amazonaws.services.elasticbeanstalk.model.TooManyApplicationVersionsException
+com.amazonaws.services.elasticbeanstalk.model.TooManyApplicationsException
+com.amazonaws.services.elasticbeanstalk.model.TooManyBucketsException
+com.amazonaws.services.elasticbeanstalk.model.TooManyConfigurationTemplatesException
+com.amazonaws.services.elasticbeanstalk.model.TooManyEnvironmentsException
+com.amazonaws.services.elasticbeanstalk.model.ValidationSeverity
+com.amazonaws.services.elasticloadbalancing.model.CertificateNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.DuplicateListenerException
+com.amazonaws.services.elasticloadbalancing.model.DuplicateLoadBalancerNameException
+com.amazonaws.services.elasticloadbalancing.model.DuplicatePolicyNameException
+com.amazonaws.services.elasticloadbalancing.model.InvalidConfigurationRequestException
+com.amazonaws.services.elasticloadbalancing.model.InvalidInstanceException
+com.amazonaws.services.elasticloadbalancing.model.InvalidSchemeException
+com.amazonaws.services.elasticloadbalancing.model.InvalidSecurityGroupException
+com.amazonaws.services.elasticloadbalancing.model.InvalidSubnetException
+com.amazonaws.services.elasticloadbalancing.model.ListenerNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.LoadBalancerNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.PolicyNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.PolicyTypeNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.SubnetNotFoundException
+com.amazonaws.services.elasticloadbalancing.model.TooManyLoadBalancersException
+com.amazonaws.services.elasticloadbalancing.model.TooManyPoliciesException
+com.amazonaws.services.elasticmapreduce.model.ActionOnFailure
+com.amazonaws.services.elasticmapreduce.model.InstanceGroupState
+com.amazonaws.services.elasticmapreduce.model.InstanceRoleType
+com.amazonaws.services.elasticmapreduce.model.InternalServerErrorException
+com.amazonaws.services.elasticmapreduce.model.JobFlowExecutionState
+com.amazonaws.services.elasticmapreduce.model.MarketType
+com.amazonaws.services.elasticmapreduce.model.StepExecutionState
+com.amazonaws.services.elasticmapreduce.util.BootstrapActions$ConfigFile
+com.amazonaws.services.elasticmapreduce.util.BootstrapActions$Daemon
+com.amazonaws.services.elasticmapreduce.util.ResizeJobFlowStep$OnArrested
+com.amazonaws.services.elasticmapreduce.util.ResizeJobFlowStep$OnFailure
+com.amazonaws.services.elasticmapreduce.util.StepFactory$HiveVersion
+com.amazonaws.services.glacier.model.ActionCode
+com.amazonaws.services.glacier.model.InvalidParameterValueException
+com.amazonaws.services.glacier.model.LimitExceededException
+com.amazonaws.services.glacier.model.MissingParameterValueException
+com.amazonaws.services.glacier.model.RequestTimeoutException
+com.amazonaws.services.glacier.model.ResourceNotFoundException
+com.amazonaws.services.glacier.model.ServiceUnavailableException
+com.amazonaws.services.glacier.model.StatusCode
+com.amazonaws.services.identitymanagement.model.AssignmentStatusType
+com.amazonaws.services.identitymanagement.model.DeleteConflictException
+com.amazonaws.services.identitymanagement.model.DuplicateCertificateException
+com.amazonaws.services.identitymanagement.model.EntityAlreadyExistsException
+com.amazonaws.services.identitymanagement.model.EntityTemporarilyUnmodifiableException
+com.amazonaws.services.identitymanagement.model.InvalidAuthenticationCodeException
+com.amazonaws.services.identitymanagement.model.InvalidCertificateException
+com.amazonaws.services.identitymanagement.model.InvalidUserTypeException
+com.amazonaws.services.identitymanagement.model.KeyPairMismatchException
+com.amazonaws.services.identitymanagement.model.LimitExceededException
+com.amazonaws.services.identitymanagement.model.MalformedCertificateException
+com.amazonaws.services.identitymanagement.model.MalformedPolicyDocumentException
+com.amazonaws.services.identitymanagement.model.NoSuchEntityException
+com.amazonaws.services.identitymanagement.model.PasswordPolicyViolationException
+com.amazonaws.services.identitymanagement.model.StatusType
+com.amazonaws.services.identitymanagement.model.SummaryKeyType
+com.amazonaws.services.importexport.model.BucketPermissionException
+com.amazonaws.services.importexport.model.CanceledJobIdException
+com.amazonaws.services.importexport.model.ExpiredJobIdException
+com.amazonaws.services.importexport.model.InvalidAccessKeyIdException
+com.amazonaws.services.importexport.model.InvalidAddressException
+com.amazonaws.services.importexport.model.InvalidCustomsException
+com.amazonaws.services.importexport.model.InvalidFileSystemException
+com.amazonaws.services.importexport.model.InvalidJobIdException
+com.amazonaws.services.importexport.model.InvalidManifestFieldException
+com.amazonaws.services.importexport.model.InvalidParameterException
+com.amazonaws.services.importexport.model.JobType
+com.amazonaws.services.importexport.model.MalformedManifestException
+com.amazonaws.services.importexport.model.MissingCustomsException
+com.amazonaws.services.importexport.model.MissingManifestFieldException
+com.amazonaws.services.importexport.model.MissingParameterException
+com.amazonaws.services.importexport.model.MultipleRegionsException
+com.amazonaws.services.importexport.model.NoSuchBucketException
+com.amazonaws.services.importexport.model.UnableToCancelJobIdException
+com.amazonaws.services.rds.model.ApplyMethod
+com.amazonaws.services.rds.model.AuthorizationAlreadyExistsException
+com.amazonaws.services.rds.model.AuthorizationNotFoundException
+com.amazonaws.services.rds.model.AuthorizationQuotaExceededException
+com.amazonaws.services.rds.model.DBInstanceAlreadyExistsException
+com.amazonaws.services.rds.model.DBInstanceNotFoundException
+com.amazonaws.services.rds.model.DBParameterGroupAlreadyExistsException
+com.amazonaws.services.rds.model.DBParameterGroupNotFoundException
+com.amazonaws.services.rds.model.DBParameterGroupQuotaExceededException
+com.amazonaws.services.rds.model.DBSecurityGroupAlreadyExistsException
+com.amazonaws.services.rds.model.DBSecurityGroupNotFoundException
+com.amazonaws.services.rds.model.DBSecurityGroupQuotaExceededException
+com.amazonaws.services.rds.model.DBSnapshotAlreadyExistsException
+com.amazonaws.services.rds.model.DBSnapshotNotFoundException
+com.amazonaws.services.rds.model.DBSubnetGroupAlreadyExistsException
+com.amazonaws.services.rds.model.DBSubnetGroupListDoesNotCoverAllAzException
+com.amazonaws.services.rds.model.DBSubnetGroupNotFoundException
+com.amazonaws.services.rds.model.DBSubnetGroupQuotaExceededException
+com.amazonaws.services.rds.model.DBSubnetQuotaExceededException
+com.amazonaws.services.rds.model.InstanceQuotaExceededException
+com.amazonaws.services.rds.model.InsufficientDBInstanceCapacityException
+com.amazonaws.services.rds.model.InvalidDBInstanceStateException
+com.amazonaws.services.rds.model.InvalidDBParameterGroupStateException
+com.amazonaws.services.rds.model.InvalidDBSecurityGroupStateException
+com.amazonaws.services.rds.model.InvalidDBSnapshotStateException
+com.amazonaws.services.rds.model.InvalidDBSubnetGroupStateException
+com.amazonaws.services.rds.model.InvalidDBSubnetStateException
+com.amazonaws.services.rds.model.InvalidOptionGroupStateException
+com.amazonaws.services.rds.model.InvalidRestoreException
+com.amazonaws.services.rds.model.InvalidSubnetException
+com.amazonaws.services.rds.model.InvalidVPCNetworkStateException
+com.amazonaws.services.rds.model.OptionGroupAlreadyExistsException
+com.amazonaws.services.rds.model.OptionGroupNotFoundException
+com.amazonaws.services.rds.model.OptionGroupQuotaExceededException
+com.amazonaws.services.rds.model.PointInTimeRestoreNotEnabledException
+com.amazonaws.services.rds.model.ReservedDBInstanceAlreadyExistsException
+com.amazonaws.services.rds.model.ReservedDBInstanceNotFoundException
+com.amazonaws.services.rds.model.ReservedDBInstanceQuotaExceededException
+com.amazonaws.services.rds.model.ReservedDBInstancesOfferingNotFoundException
+com.amazonaws.services.rds.model.SnapshotQuotaExceededException
+com.amazonaws.services.rds.model.SourceType
+com.amazonaws.services.rds.model.StorageQuotaExceededException
+com.amazonaws.services.rds.model.SubnetAlreadyInUseException
+com.amazonaws.services.route53.model.ChangeAction
+com.amazonaws.services.route53.model.ChangeStatus
+com.amazonaws.services.route53.model.DelegationSetNotAvailableException
+com.amazonaws.services.route53.model.HostedZoneAlreadyExistsException
+com.amazonaws.services.route53.model.HostedZoneNotEmptyException
+com.amazonaws.services.route53.model.InvalidChangeBatchException
+com.amazonaws.services.route53.model.InvalidDomainNameException
+com.amazonaws.services.route53.model.InvalidInputException
+com.amazonaws.services.route53.model.NoSuchChangeException
+com.amazonaws.services.route53.model.NoSuchHostedZoneException
+com.amazonaws.services.route53.model.RRType
+com.amazonaws.services.route53.model.ResourceRecordSetRegion
+com.amazonaws.services.route53.model.TooManyHostedZonesException
+com.amazonaws.services.s3.model.AccessControlList
+com.amazonaws.services.s3.model.AmazonS3Exception
+com.amazonaws.services.s3.model.CORSRule$AllowedMethods
+com.amazonaws.services.s3.model.CannedAccessControlList
+com.amazonaws.services.s3.model.CryptoStorageMode
+com.amazonaws.services.s3.model.GroupGrantee
+com.amazonaws.services.s3.model.MultiObjectDeleteException
+com.amazonaws.services.s3.model.Owner
+com.amazonaws.services.s3.model.Permission
+com.amazonaws.services.s3.model.Region
+com.amazonaws.services.s3.model.StorageClass
+com.amazonaws.services.s3.transfer.Transfer$TransferState
+com.amazonaws.services.securitytoken.model.MalformedPolicyDocumentException
+com.amazonaws.services.securitytoken.model.PackedPolicyTooLargeException
+com.amazonaws.services.simpledb.model.AttributeDoesNotExistException
+com.amazonaws.services.simpledb.model.DuplicateItemNameException
+com.amazonaws.services.simpledb.model.InvalidNextTokenException
+com.amazonaws.services.simpledb.model.InvalidNumberPredicatesException
+com.amazonaws.services.simpledb.model.InvalidNumberValueTestsException
+com.amazonaws.services.simpledb.model.InvalidParameterValueException
+com.amazonaws.services.simpledb.model.InvalidQueryExpressionException
+com.amazonaws.services.simpledb.model.MissingParameterException
+com.amazonaws.services.simpledb.model.NoSuchDomainException
+com.amazonaws.services.simpledb.model.NumberDomainAttributesExceededException
+com.amazonaws.services.simpledb.model.NumberDomainBytesExceededException
+com.amazonaws.services.simpledb.model.NumberDomainsExceededException
+com.amazonaws.services.simpledb.model.NumberItemAttributesExceededException
+com.amazonaws.services.simpledb.model.NumberSubmittedAttributesExceededException
+com.amazonaws.services.simpledb.model.NumberSubmittedItemsExceededException
+com.amazonaws.services.simpledb.model.RequestTimeoutException
+com.amazonaws.services.simpledb.model.TooManyRequestedAttributesException
+com.amazonaws.services.simpleemail.model.IdentityType
+com.amazonaws.services.simpleemail.model.MessageRejectedException
+com.amazonaws.services.simpleemail.model.NotificationType
+com.amazonaws.services.simpleemail.model.VerificationStatus
+com.amazonaws.services.simpleworkflow.flow.ActivityFailureException
+com.amazonaws.services.simpleworkflow.flow.ActivityTaskFailedException
+com.amazonaws.services.simpleworkflow.flow.ActivityTaskTimedOutException
+com.amazonaws.services.simpleworkflow.flow.ChildWorkflowFailedException
+com.amazonaws.services.simpleworkflow.flow.ChildWorkflowTerminatedException
+com.amazonaws.services.simpleworkflow.flow.ChildWorkflowTimedOutException
+com.amazonaws.services.simpleworkflow.flow.DataConverterException
+com.amazonaws.services.simpleworkflow.flow.ScheduleActivityTaskFailedException
+com.amazonaws.services.simpleworkflow.flow.SignalExternalWorkflowException
+com.amazonaws.services.simpleworkflow.flow.StartChildWorkflowFailedException
+com.amazonaws.services.simpleworkflow.flow.StartTimerFailedException
+com.amazonaws.services.simpleworkflow.flow.WorkflowException
+com.amazonaws.services.simpleworkflow.flow.common.FlowValueConstraint
+com.amazonaws.services.simpleworkflow.flow.core.TryCatchFinally$State
+com.amazonaws.services.simpleworkflow.flow.worker.DecisionState
+com.amazonaws.services.simpleworkflow.flow.worker.DecisionTarget
+com.amazonaws.services.simpleworkflow.model.ActivityTaskTimeoutType
+com.amazonaws.services.simpleworkflow.model.CancelTimerFailedCause
+com.amazonaws.services.simpleworkflow.model.CancelWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.ChildPolicy
+com.amazonaws.services.simpleworkflow.model.CloseStatus
+com.amazonaws.services.simpleworkflow.model.CompleteWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.ContinueAsNewWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.DecisionTaskTimeoutType
+com.amazonaws.services.simpleworkflow.model.DecisionType
+com.amazonaws.services.simpleworkflow.model.DefaultUndefinedException
+com.amazonaws.services.simpleworkflow.model.DomainAlreadyExistsException
+com.amazonaws.services.simpleworkflow.model.DomainDeprecatedException
+com.amazonaws.services.simpleworkflow.model.EventType
+com.amazonaws.services.simpleworkflow.model.ExecutionStatus
+com.amazonaws.services.simpleworkflow.model.FailWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.LimitExceededException
+com.amazonaws.services.simpleworkflow.model.OperationNotPermittedException
+com.amazonaws.services.simpleworkflow.model.PredefinedDuration
+com.amazonaws.services.simpleworkflow.model.RegistrationStatus
+com.amazonaws.services.simpleworkflow.model.RequestCancelActivityTaskFailedCause
+com.amazonaws.services.simpleworkflow.model.RequestCancelExternalWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.ScheduleActivityTaskFailedCause
+com.amazonaws.services.simpleworkflow.model.SignalExternalWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.StartChildWorkflowExecutionFailedCause
+com.amazonaws.services.simpleworkflow.model.StartTimerFailedCause
+com.amazonaws.services.simpleworkflow.model.TypeAlreadyExistsException
+com.amazonaws.services.simpleworkflow.model.TypeDeprecatedException
+com.amazonaws.services.simpleworkflow.model.UnknownResourceException
+com.amazonaws.services.simpleworkflow.model.WorkflowExecutionAlreadyStartedException
+com.amazonaws.services.simpleworkflow.model.WorkflowExecutionCancelRequestedCause
+com.amazonaws.services.simpleworkflow.model.WorkflowExecutionTerminatedCause
+com.amazonaws.services.simpleworkflow.model.WorkflowExecutionTimeoutType
+com.amazonaws.services.sns.model.AuthorizationErrorException
+com.amazonaws.services.sns.model.InternalErrorException
+com.amazonaws.services.sns.model.InvalidParameterException
+com.amazonaws.services.sns.model.NotFoundException
+com.amazonaws.services.sns.model.SubscriptionLimitExceededException
+com.amazonaws.services.sns.model.TopicLimitExceededException
+com.amazonaws.services.sqs.model.BatchEntryIdsNotDistinctException
+com.amazonaws.services.sqs.model.BatchRequestTooLongException
+com.amazonaws.services.sqs.model.EmptyBatchRequestException
+com.amazonaws.services.sqs.model.InvalidAttributeNameException
+com.amazonaws.services.sqs.model.InvalidBatchEntryIdException
+com.amazonaws.services.sqs.model.InvalidIdFormatException
+com.amazonaws.services.sqs.model.InvalidMessageContentsException
+com.amazonaws.services.sqs.model.MessageNotInflightException
+com.amazonaws.services.sqs.model.OverLimitException
+com.amazonaws.services.sqs.model.QueueAttributeName
+com.amazonaws.services.sqs.model.QueueDeletedRecentlyException
+com.amazonaws.services.sqs.model.QueueDoesNotExistException
+com.amazonaws.services.sqs.model.QueueNameExistsException
+com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException
+com.amazonaws.services.sqs.model.TooManyEntriesInBatchRequestException
+com.amazonaws.services.storagegateway.model.BandwidthType
+com.amazonaws.services.storagegateway.model.DiskAllocationType
+com.amazonaws.services.storagegateway.model.ErrorCode
+com.amazonaws.services.storagegateway.model.GatewayState
+com.amazonaws.services.storagegateway.model.GatewayTimezone
+com.amazonaws.services.storagegateway.model.InternalServerErrorException
+com.amazonaws.services.storagegateway.model.InvalidGatewayRequestException
+com.amazonaws.services.storagegateway.model.VolumeStatus
+com.amazonaws.services.storagegateway.model.VolumeType
+com.amazonaws.util.AWSRequestMetrics$Field
+com.amazonaws.util.json.JSONException
+com.beust.jcommander.MissingCommandException
+com.beust.jcommander.ParameterException
+com.enterprisedt.BaseIOException
+com.enterprisedt.net.ftp.FTPException
+com.enterprisedt.net.ftp.FTPTransferCancelledException
+com.google.common.base.Absent
+com.google.common.base.AbstractIterator$State
+com.google.common.base.CaseFormat$1
+com.google.common.base.CaseFormat$2
+com.google.common.base.CaseFormat$3
+com.google.common.base.CaseFormat$4
+com.google.common.base.CaseFormat$5
+com.google.common.base.Enums$ValueOfFunction
+com.google.common.base.Equivalence$Equals
+com.google.common.base.Equivalence$EquivalentToPredicate
+com.google.common.base.Equivalence$Identity
+com.google.common.base.Equivalence$Wrapper
+com.google.common.base.FunctionalEquivalence
+com.google.common.base.Functions$ConstantFunction
+com.google.common.base.Functions$ForMapWithDefault
+com.google.common.base.Functions$FunctionComposition
+com.google.common.base.Functions$FunctionForMapNoDefault
+com.google.common.base.Functions$IdentityFunction
+com.google.common.base.Functions$PredicateFunction
+com.google.common.base.Functions$SupplierFunction
+com.google.common.base.Functions$ToStringFunction
+com.google.common.base.PairwiseEquivalence
+com.google.common.base.Predicates$AndPredicate
+com.google.common.base.Predicates$AssignableFromPredicate
+com.google.common.base.Predicates$CompositionPredicate
+com.google.common.base.Predicates$ContainsPatternPredicate
+com.google.common.base.Predicates$InPredicate
+com.google.common.base.Predicates$InstanceOfPredicate
+com.google.common.base.Predicates$IsEqualToPredicate
+com.google.common.base.Predicates$NotPredicate
+com.google.common.base.Predicates$ObjectPredicate$1
+com.google.common.base.Predicates$ObjectPredicate$2
+com.google.common.base.Predicates$ObjectPredicate$3
+com.google.common.base.Predicates$ObjectPredicate$4
+com.google.common.base.Predicates$OrPredicate
+com.google.common.base.Present
+com.google.common.base.Suppliers$ExpiringMemoizingSupplier
+com.google.common.base.Suppliers$MemoizingSupplier
+com.google.common.base.Suppliers$SupplierComposition
+com.google.common.base.Suppliers$SupplierFunction
+com.google.common.base.Suppliers$SupplierOfInstance
+com.google.common.base.Suppliers$ThreadSafeSupplier
+com.google.common.base.internal.Finalizer$ShutDown
+com.google.common.cache.CacheBuilder$NullListener
+com.google.common.cache.CacheBuilder$OneWeigher
+com.google.common.cache.CacheLoader$FunctionToCacheLoader
+com.google.common.cache.CacheLoader$InvalidCacheLoadException
+com.google.common.cache.CacheLoader$SupplierToCacheLoader
+com.google.common.cache.CacheLoader$UnsupportedLoadingOperationException
+com.google.common.cache.LocalCache$EntryFactory$1
+com.google.common.cache.LocalCache$EntryFactory$2
+com.google.common.cache.LocalCache$EntryFactory$3
+com.google.common.cache.LocalCache$EntryFactory$4
+com.google.common.cache.LocalCache$EntryFactory$5
+com.google.common.cache.LocalCache$EntryFactory$6
+com.google.common.cache.LocalCache$EntryFactory$7
+com.google.common.cache.LocalCache$EntryFactory$8
+com.google.common.cache.LocalCache$LoadingSerializationProxy
+com.google.common.cache.LocalCache$LocalLoadingCache
+com.google.common.cache.LocalCache$LocalManualCache
+com.google.common.cache.LocalCache$ManualSerializationProxy
+com.google.common.cache.LocalCache$NullEntry
+com.google.common.cache.LocalCache$Segment
+com.google.common.cache.LocalCache$Strength$1
+com.google.common.cache.LocalCache$Strength$2
+com.google.common.cache.LocalCache$Strength$3
+com.google.common.cache.LongAddables$PureJavaLongAddable
+com.google.common.cache.LongAdder
+com.google.common.cache.RemovalCause$1
+com.google.common.cache.RemovalCause$2
+com.google.common.cache.RemovalCause$3
+com.google.common.cache.RemovalCause$4
+com.google.common.cache.RemovalCause$5
+com.google.common.collect.AbstractBiMap$Inverse
+com.google.common.collect.AbstractIterator$State
+com.google.common.collect.AllEqualOrdering
+com.google.common.collect.ArrayListMultimap
+com.google.common.collect.ArrayTable
+com.google.common.collect.BoundType$1
+com.google.common.collect.BoundType$2
+com.google.common.collect.ByFunctionOrdering
+com.google.common.collect.CartesianList$1
+com.google.common.collect.ComparatorOrdering
+com.google.common.collect.CompoundOrdering
+com.google.common.collect.ComputationException
+com.google.common.collect.ComputingConcurrentHashMap
+com.google.common.collect.ComputingConcurrentHashMap$ComputingSegment
+com.google.common.collect.ComputingConcurrentHashMap$ComputingSerializationProxy
+com.google.common.collect.ConcurrentHashMultiset
+com.google.common.collect.Constraints$NotNullConstraint
+com.google.common.collect.Count
+com.google.common.collect.Cut$AboveAll
+com.google.common.collect.Cut$AboveValue
+com.google.common.collect.Cut$BelowAll
+com.google.common.collect.Cut$BelowValue
+com.google.common.collect.DescendingImmutableSortedMultiset
+com.google.common.collect.DescendingImmutableSortedMultiset$1
+com.google.common.collect.DescendingImmutableSortedSet
+com.google.common.collect.DiscreteDomain$BigIntegerDomain
+com.google.common.collect.DiscreteDomain$IntegerDomain
+com.google.common.collect.DiscreteDomain$LongDomain
+com.google.common.collect.EmptyContiguousSet
+com.google.common.collect.EmptyContiguousSet$SerializedForm
+com.google.common.collect.EmptyImmutableBiMap
+com.google.common.collect.EmptyImmutableList
+com.google.common.collect.EmptyImmutableListMultimap
+com.google.common.collect.EmptyImmutableMultiset
+com.google.common.collect.EmptyImmutableSet
+com.google.common.collect.EmptyImmutableSetMultimap
+com.google.common.collect.EmptyImmutableSortedMap
+com.google.common.collect.EmptyImmutableSortedMultiset
+com.google.common.collect.EmptyImmutableSortedSet
+com.google.common.collect.EnumBiMap
+com.google.common.collect.EnumHashBiMap
+com.google.common.collect.EnumMultiset
+com.google.common.collect.ExplicitOrdering
+com.google.common.collect.GeneralRange
+com.google.common.collect.GenericMapMaker$NullListener
+com.google.common.collect.HashBasedTable
+com.google.common.collect.HashBasedTable$Factory
+com.google.common.collect.HashBiMap
+com.google.common.collect.HashBiMap$Inverse
+com.google.common.collect.HashBiMap$InverseSerializedForm
+com.google.common.collect.HashMultimap
+com.google.common.collect.HashMultiset
+com.google.common.collect.ImmutableAsList$SerializedForm
+com.google.common.collect.ImmutableBiMap$SerializedForm
+com.google.common.collect.ImmutableCollection$ArrayImmutableCollection
+com.google.common.collect.ImmutableCollection$EmptyImmutableCollection
+com.google.common.collect.ImmutableCollection$SerializedForm
+com.google.common.collect.ImmutableEntry
+com.google.common.collect.ImmutableEnumMap
+com.google.common.collect.ImmutableEnumMap$1
+com.google.common.collect.ImmutableEnumMap$2
+com.google.common.collect.ImmutableEnumMap$EnumSerializedForm
+com.google.common.collect.ImmutableEnumSet
+com.google.common.collect.ImmutableEnumSet$EnumSerializedForm
+com.google.common.collect.ImmutableList$ReverseImmutableList
+com.google.common.collect.ImmutableList$SerializedForm
+com.google.common.collect.ImmutableList$SubList
+com.google.common.collect.ImmutableListMultimap
+com.google.common.collect.ImmutableMap$1MapViewOfValuesAsSingletonSets
+com.google.common.collect.ImmutableMap$1MapViewOfValuesAsSingletonSets$1
+com.google.common.collect.ImmutableMap$SerializedForm
+com.google.common.collect.ImmutableMapEntrySet$EntrySetSerializedForm
+com.google.common.collect.ImmutableMapKeySet
+com.google.common.collect.ImmutableMapKeySet$1
+com.google.common.collect.ImmutableMapKeySet$KeySetSerializedForm
+com.google.common.collect.ImmutableMapValues
+com.google.common.collect.ImmutableMapValues$1
+com.google.common.collect.ImmutableMapValues$SerializedForm
+com.google.common.collect.ImmutableMultimap$BuilderMultimap
+com.google.common.collect.ImmutableMultimap$EntryCollection
+com.google.common.collect.ImmutableMultimap$Keys
+com.google.common.collect.ImmutableMultimap$Keys$KeysEntrySet
+com.google.common.collect.ImmutableMultimap$Keys$KeysEntrySet$1
+com.google.common.collect.ImmutableMultimap$Values
+com.google.common.collect.ImmutableMultiset$EntrySetSerializedForm
+com.google.common.collect.ImmutableMultiset$SerializedForm
+com.google.common.collect.ImmutableRangeMap$1
+com.google.common.collect.ImmutableRangeSet
+com.google.common.collect.ImmutableRangeSet$1
+com.google.common.collect.ImmutableRangeSet$AsSet
+com.google.common.collect.ImmutableRangeSet$AsSetSerializedForm
+com.google.common.collect.ImmutableRangeSet$ComplementRanges
+com.google.common.collect.ImmutableRangeSet$SerializedForm
+com.google.common.collect.ImmutableSet$SerializedForm
+com.google.common.collect.ImmutableSetMultimap
+com.google.common.collect.ImmutableSetMultimap$BuilderMultimap
+com.google.common.collect.ImmutableSortedAsList
+com.google.common.collect.ImmutableSortedMap$SerializedForm
+com.google.common.collect.ImmutableSortedMultiset$SerializedForm
+com.google.common.collect.ImmutableSortedSet$SerializedForm
+com.google.common.collect.Interners$WeakInterner$Dummy
+com.google.common.collect.LexicographicalOrdering
+com.google.common.collect.LinkedHashMultimap
+com.google.common.collect.LinkedHashMultiset
+com.google.common.collect.LinkedListMultimap
+com.google.common.collect.Lists$OnePlusArrayList
+com.google.common.collect.Lists$StringAsImmutableList
+com.google.common.collect.Lists$TransformingRandomAccessList
+com.google.common.collect.Lists$TransformingSequentialList
+com.google.common.collect.Lists$TwoPlusArrayList
+com.google.common.collect.MapConstraints$ConstrainedListMultimap
+com.google.common.collect.MapConstraints$ConstrainedMultimap
+com.google.common.collect.MapConstraints$ConstrainedSetMultimap
+com.google.common.collect.MapConstraints$ConstrainedSortedSetMultimap
+com.google.common.collect.MapConstraints$NotNullMapConstraint
+com.google.common.collect.MapMaker$ComputingMapAdapter
+com.google.common.collect.MapMaker$NullComputingConcurrentMap
+com.google.common.collect.MapMaker$NullConcurrentMap
+com.google.common.collect.MapMaker$RemovalCause$1
+com.google.common.collect.MapMaker$RemovalCause$2
+com.google.common.collect.MapMaker$RemovalCause$3
+com.google.common.collect.MapMaker$RemovalCause$4
+com.google.common.collect.MapMaker$RemovalCause$5
+com.google.common.collect.MapMaker$RemovalNotification
+com.google.common.collect.MapMakerInternalMap
+com.google.common.collect.MapMakerInternalMap$EntryFactory$1
+com.google.common.collect.MapMakerInternalMap$EntryFactory$2
+com.google.common.collect.MapMakerInternalMap$EntryFactory$3
+com.google.common.collect.MapMakerInternalMap$EntryFactory$4
+com.google.common.collect.MapMakerInternalMap$EntryFactory$5
+com.google.common.collect.MapMakerInternalMap$EntryFactory$6
+com.google.common.collect.MapMakerInternalMap$EntryFactory$7
+com.google.common.collect.MapMakerInternalMap$EntryFactory$8
+com.google.common.collect.MapMakerInternalMap$NullEntry
+com.google.common.collect.MapMakerInternalMap$Segment
+com.google.common.collect.MapMakerInternalMap$SerializationProxy
+com.google.common.collect.MapMakerInternalMap$Strength$1
+com.google.common.collect.MapMakerInternalMap$Strength$2
+com.google.common.collect.MapMakerInternalMap$Strength$3
+com.google.common.collect.Maps$EntryFunction$1
+com.google.common.collect.Maps$EntryFunction$2
+com.google.common.collect.Maps$UnmodifiableBiMap
+com.google.common.collect.Maps$UnmodifiableNavigableMap
+com.google.common.collect.Multimaps$CustomListMultimap
+com.google.common.collect.Multimaps$CustomMultimap
+com.google.common.collect.Multimaps$CustomSetMultimap
+com.google.common.collect.Multimaps$CustomSortedSetMultimap
+com.google.common.collect.Multimaps$MapMultimap
+com.google.common.collect.Multimaps$UnmodifiableListMultimap
+com.google.common.collect.Multimaps$UnmodifiableMultimap
+com.google.common.collect.Multimaps$UnmodifiableSetMultimap
+com.google.common.collect.Multimaps$UnmodifiableSortedSetMultimap
+com.google.common.collect.Multisets$ImmutableEntry
+com.google.common.collect.Multisets$UnmodifiableMultiset
+com.google.common.collect.NaturalOrdering
+com.google.common.collect.NullsFirstOrdering
+com.google.common.collect.NullsLastOrdering
+com.google.common.collect.Ordering$IncomparableValueException
+com.google.common.collect.Range
+com.google.common.collect.RegularContiguousSet
+com.google.common.collect.RegularContiguousSet$SerializedForm
+com.google.common.collect.RegularImmutableAsList
+com.google.common.collect.RegularImmutableBiMap
+com.google.common.collect.RegularImmutableBiMap$1
+com.google.common.collect.RegularImmutableBiMap$BiMapEntry
+com.google.common.collect.RegularImmutableBiMap$Inverse
+com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet
+com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1
+com.google.common.collect.RegularImmutableBiMap$InverseSerializedForm
+com.google.common.collect.RegularImmutableBiMap$NonTerminalBiMapEntry
+com.google.common.collect.RegularImmutableList
+com.google.common.collect.RegularImmutableMap
+com.google.common.collect.RegularImmutableMap$EntrySet
+com.google.common.collect.RegularImmutableMap$NonTerminalEntry
+com.google.common.collect.RegularImmutableMap$TerminalEntry
+com.google.common.collect.RegularImmutableMultiset
+com.google.common.collect.RegularImmutableMultiset$EntrySet
+com.google.common.collect.RegularImmutableMultiset$EntrySet$1
+com.google.common.collect.RegularImmutableSet
+com.google.common.collect.RegularImmutableSortedMap
+com.google.common.collect.RegularImmutableSortedMap$EntrySet
+com.google.common.collect.RegularImmutableSortedMap$EntrySet$1
+com.google.common.collect.RegularImmutableSortedMultiset
+com.google.common.collect.RegularImmutableSortedMultiset$EntrySet
+com.google.common.collect.RegularImmutableSortedMultiset$EntrySet$1
+com.google.common.collect.RegularImmutableSortedSet
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$1
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$Column
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$ColumnMap
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$DenseCellSet
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$DenseCellSet$1
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$Row
+com.google.common.collect.RegularImmutableTable$DenseImmutableTable$RowMap
+com.google.common.collect.RegularImmutableTable$ImmutableArrayMap$1
+com.google.common.collect.RegularImmutableTable$ImmutableArrayMap$2
+com.google.common.collect.RegularImmutableTable$SparseImmutableTable$1
+com.google.common.collect.RegularImmutableTable$SparseImmutableTable$SparseCellSet
+com.google.common.collect.RegularImmutableTable$SparseImmutableTable$SparseCellSet$1
+com.google.common.collect.ReverseNaturalOrdering
+com.google.common.collect.ReverseOrdering
+com.google.common.collect.Sets$CartesianSet$1
+com.google.common.collect.Sets$SetFromMap
+com.google.common.collect.Sets$UnmodifiableNavigableSet
+com.google.common.collect.SingletonImmutableBiMap
+com.google.common.collect.SingletonImmutableList
+com.google.common.collect.SingletonImmutableSet
+com.google.common.collect.SortedLists$KeyAbsentBehavior$1
+com.google.common.collect.SortedLists$KeyAbsentBehavior$2
+com.google.common.collect.SortedLists$KeyAbsentBehavior$3
+com.google.common.collect.SortedLists$KeyPresentBehavior$1
+com.google.common.collect.SortedLists$KeyPresentBehavior$2
+com.google.common.collect.SortedLists$KeyPresentBehavior$3
+com.google.common.collect.SortedLists$KeyPresentBehavior$4
+com.google.common.collect.SortedLists$KeyPresentBehavior$5
+com.google.common.collect.StandardRowSortedTable
+com.google.common.collect.StandardTable
+com.google.common.collect.Synchronized$SynchronizedAsMap
+com.google.common.collect.Synchronized$SynchronizedAsMapEntries
+com.google.common.collect.Synchronized$SynchronizedAsMapValues
+com.google.common.collect.Synchronized$SynchronizedBiMap
+com.google.common.collect.Synchronized$SynchronizedCollection
+com.google.common.collect.Synchronized$SynchronizedEntry
+com.google.common.collect.Synchronized$SynchronizedList
+com.google.common.collect.Synchronized$SynchronizedListMultimap
+com.google.common.collect.Synchronized$SynchronizedMap
+com.google.common.collect.Synchronized$SynchronizedMultimap
+com.google.common.collect.Synchronized$SynchronizedMultiset
+com.google.common.collect.Synchronized$SynchronizedNavigableMap
+com.google.common.collect.Synchronized$SynchronizedNavigableSet
+com.google.common.collect.Synchronized$SynchronizedObject
+com.google.common.collect.Synchronized$SynchronizedQueue
+com.google.common.collect.Synchronized$SynchronizedRandomAccessList
+com.google.common.collect.Synchronized$SynchronizedSet
+com.google.common.collect.Synchronized$SynchronizedSetMultimap
+com.google.common.collect.Synchronized$SynchronizedSortedMap
+com.google.common.collect.Synchronized$SynchronizedSortedSet
+com.google.common.collect.Synchronized$SynchronizedSortedSetMultimap
+com.google.common.collect.Tables$ImmutableCell
+com.google.common.collect.Tables$UnmodifiableRowSortedMap
+com.google.common.collect.Tables$UnmodifiableTable
+com.google.common.collect.TreeBasedTable
+com.google.common.collect.TreeBasedTable$Factory
+com.google.common.collect.TreeMultimap
+com.google.common.collect.TreeMultiset
+com.google.common.collect.TreeMultiset$Aggregate$1
+com.google.common.collect.TreeMultiset$Aggregate$2
+com.google.common.collect.UnmodifiableSortedMultiset
+com.google.common.collect.UsingToStringOrdering
+com.google.common.hash.BloomFilter
+com.google.common.hash.BloomFilter$SerialForm
+com.google.common.hash.BloomFilterStrategies$1
+com.google.common.hash.ChecksumHashFunction
+com.google.common.hash.Funnels$ByteArrayFunnel
+com.google.common.hash.Funnels$IntegerFunnel
+com.google.common.hash.Funnels$LongFunnel
+com.google.common.hash.Funnels$StringFunnel
+com.google.common.hash.HashCodes$BytesHashCode
+com.google.common.hash.HashCodes$IntHashCode
+com.google.common.hash.HashCodes$LongHashCode
+com.google.common.hash.Hashing$ChecksumType$1
+com.google.common.hash.Hashing$ChecksumType$2
+com.google.common.hash.MessageDigestHashFunction
+com.google.common.hash.MessageDigestHashFunction$SerializedForm
+com.google.common.hash.Murmur3_128HashFunction
+com.google.common.hash.Murmur3_32HashFunction
+com.google.common.io.FileWriteMode
+com.google.common.net.HostAndPort
+com.google.common.primitives.Booleans$BooleanArrayAsList
+com.google.common.primitives.Booleans$LexicographicalComparator
+com.google.common.primitives.Bytes$ByteArrayAsList
+com.google.common.primitives.Chars$CharArrayAsList
+com.google.common.primitives.Chars$LexicographicalComparator
+com.google.common.primitives.Doubles$DoubleArrayAsList
+com.google.common.primitives.Doubles$LexicographicalComparator
+com.google.common.primitives.Floats$FloatArrayAsList
+com.google.common.primitives.Floats$LexicographicalComparator
+com.google.common.primitives.Ints$IntArrayAsList
+com.google.common.primitives.Ints$LexicographicalComparator
+com.google.common.primitives.Longs$LexicographicalComparator
+com.google.common.primitives.Longs$LongArrayAsList
+com.google.common.primitives.Shorts$LexicographicalComparator
+com.google.common.primitives.Shorts$ShortArrayAsList
+com.google.common.primitives.SignedBytes$LexicographicalComparator
+com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$PureJavaComparator
+com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator
+com.google.common.primitives.UnsignedInteger
+com.google.common.primitives.UnsignedInts$LexicographicalComparator
+com.google.common.primitives.UnsignedLong
+com.google.common.primitives.UnsignedLongs$LexicographicalComparator
+com.google.common.reflect.TypeToken$ClassSet
+com.google.common.reflect.TypeToken$InterfaceSet
+com.google.common.reflect.TypeToken$SimpleTypeToken
+com.google.common.reflect.TypeToken$TypeFilter$1
+com.google.common.reflect.TypeToken$TypeFilter$2
+com.google.common.reflect.TypeToken$TypeSet
+com.google.common.reflect.Types$ClassOwnership$1
+com.google.common.reflect.Types$ClassOwnership$2
+com.google.common.reflect.Types$GenericArrayTypeImpl
+com.google.common.reflect.Types$JavaVersion$2
+com.google.common.reflect.Types$JavaVersion$3
+com.google.common.reflect.Types$ParameterizedTypeImpl
+com.google.common.reflect.Types$WildcardTypeImpl
+com.google.common.util.concurrent.AbstractFuture$Sync
+com.google.common.util.concurrent.AtomicDouble
+com.google.common.util.concurrent.AtomicDoubleArray
+com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantLock
+com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantReadLock
+com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantReadWriteLock
+com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantWriteLock
+com.google.common.util.concurrent.CycleDetectingLockFactory$ExampleStackTrace
+com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$1
+com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$2
+com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$3
+com.google.common.util.concurrent.CycleDetectingLockFactory$PotentialDeadlockException
+com.google.common.util.concurrent.ExecutionError
+com.google.common.util.concurrent.Service$State
+com.google.common.util.concurrent.Striped$PaddedLock
+com.google.common.util.concurrent.Striped$PaddedSemaphore
+com.google.common.util.concurrent.UncheckedExecutionException
+com.google.common.util.concurrent.UncheckedTimeoutException
+com.google.protobuf.CodedOutputStream$OutOfSpaceException
+com.google.protobuf.DescriptorProtos$DescriptorProto
+com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange
+com.google.protobuf.DescriptorProtos$EnumDescriptorProto
+com.google.protobuf.DescriptorProtos$EnumOptions
+com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto
+com.google.protobuf.DescriptorProtos$EnumValueOptions
+com.google.protobuf.DescriptorProtos$FieldDescriptorProto
+com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label
+com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type
+com.google.protobuf.DescriptorProtos$FieldOptions
+com.google.protobuf.DescriptorProtos$FieldOptions$CType
+com.google.protobuf.DescriptorProtos$FileDescriptorProto
+com.google.protobuf.DescriptorProtos$FileDescriptorSet
+com.google.protobuf.DescriptorProtos$FileOptions
+com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode
+com.google.protobuf.DescriptorProtos$MessageOptions
+com.google.protobuf.DescriptorProtos$MethodDescriptorProto
+com.google.protobuf.DescriptorProtos$MethodOptions
+com.google.protobuf.DescriptorProtos$ServiceDescriptorProto
+com.google.protobuf.DescriptorProtos$ServiceOptions
+com.google.protobuf.DescriptorProtos$SourceCodeInfo
+com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location
+com.google.protobuf.DescriptorProtos$UninterpretedOption
+com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart
+com.google.protobuf.Descriptors$DescriptorValidationException
+com.google.protobuf.Descriptors$FieldDescriptor$JavaType
+com.google.protobuf.Descriptors$FieldDescriptor$Type
+com.google.protobuf.GeneratedMessageLite$SerializedForm
+com.google.protobuf.InvalidProtocolBufferException
+com.google.protobuf.RpcUtil$AlreadyCalledException
+com.google.protobuf.ServiceException
+com.google.protobuf.TextFormat$InvalidEscapeSequenceException
+com.google.protobuf.TextFormat$ParseException
+com.google.protobuf.UninitializedMessageException
+com.google.protobuf.WireFormat$FieldType
+com.google.protobuf.WireFormat$FieldType$1
+com.google.protobuf.WireFormat$FieldType$2
+com.google.protobuf.WireFormat$FieldType$3
+com.google.protobuf.WireFormat$FieldType$4
+com.google.protobuf.WireFormat$JavaType
+com.jcraft.jsch.ChannelSftp$RequestQueue$OutOfOrderException
+com.jcraft.jsch.JSchAuthCancelException
+com.jcraft.jsch.JSchException
+com.jcraft.jsch.JSchPartialAuthException
+com.jcraft.jsch.SftpException
+com.jidesoft.alert.Alert
+com.jidesoft.alert.InputPopup
+com.jidesoft.animation.CustomAnimation
+com.jidesoft.animation.CustomAnimation$n_
+com.jidesoft.awt.geom.Insets2D$Double
+com.jidesoft.awt.geom.Insets2D$Float
+com.jidesoft.chart.AboveBoundsException
+com.jidesoft.chart.BarLabelPlacement
+com.jidesoft.chart.BarResizePolicy
+com.jidesoft.chart.BelowBoundsException
+com.jidesoft.chart.Chart
+com.jidesoft.chart.ChartBoundsException
+com.jidesoft.chart.ChartException
+com.jidesoft.chart.ChartType
+com.jidesoft.chart.LabelPlacement
+com.jidesoft.chart.Legend
+com.jidesoft.chart.Legend$d_
+com.jidesoft.chart.Legend$e_
+com.jidesoft.chart.Meter
+com.jidesoft.chart.Orientation
+com.jidesoft.chart.PointShape
+com.jidesoft.chart.ShadowVisibility
+com.jidesoft.chart.a
+com.jidesoft.chart.annotation.Rotation
+com.jidesoft.chart.axis.AxisComponent
+com.jidesoft.chart.axis.AxisPlacement
+com.jidesoft.chart.axis.AxisQuantity
+com.jidesoft.chart.axis.AxisType
+com.jidesoft.chart.event.AxisZoomController
+com.jidesoft.chart.event.AxisZoomController$b_
+com.jidesoft.chart.event.ChartValueReporter
+com.jidesoft.chart.event.DirectionZoomEvent
+com.jidesoft.chart.event.ImageChangeEvent
+com.jidesoft.chart.event.PanEvent
+com.jidesoft.chart.event.PanIndicator$Placement
+com.jidesoft.chart.event.PointSelectionEvent
+com.jidesoft.chart.event.RectangleSelectionEvent
+com.jidesoft.chart.event.ZoomDirection
+com.jidesoft.chart.event.ZoomLocation
+com.jidesoft.chart.event.ZoomOrientation
+com.jidesoft.chart.l
+com.jidesoft.chart.model.ChartModelChangeEvent
+com.jidesoft.chart.model.ChartModelChangeType
+com.jidesoft.chart.model.ChartableTableModel
+com.jidesoft.chart.preference.ChartPreferencePanel
+com.jidesoft.chart.preference.LineWidthChooser
+com.jidesoft.chart.preference.PointShapeChooser
+com.jidesoft.chart.preference.PointShapeLabel
+com.jidesoft.chart.preference.PointSizeChooser
+com.jidesoft.chart.render.CandlestickChartType
+com.jidesoft.chart.render.ZAlignment
+com.jidesoft.chart.render.a
+com.jidesoft.chart.servlet.ChartServlet
+com.jidesoft.chart.servlet.ComponentServlet
+com.jidesoft.chart.servlet.JButtonServlet
+com.jidesoft.chart.util.Rotation
+com.jidesoft.combobox.AbstractComboBox$6
+com.jidesoft.combobox.AbstractComboBox$7
+com.jidesoft.combobox.AbstractComboBox$8
+com.jidesoft.combobox.AbstractComboBox$9
+com.jidesoft.combobox.AbstractComboBox$AccessibleJComboBox
+com.jidesoft.combobox.AbstractComboBox$ComboBoxSpinner
+com.jidesoft.combobox.AbstractComboBox$ComboBoxTextField
+com.jidesoft.combobox.AbstractComboBox$DefaultRendererComponent
+com.jidesoft.combobox.AbstractComboBox$DefaultTextFieldEditorComponent
+com.jidesoft.combobox.AbstractComboBox$EditorComponent$0
+com.jidesoft.combobox.AbstractComboBox$EditorComponent$1
+com.jidesoft.combobox.AbstractComboBox$EnterLazyDelegateAction
+com.jidesoft.combobox.AbstractComboBox$LazyDelegateAction
+com.jidesoft.combobox.AbstractComboBox$SpinnerEditorComponent
+com.jidesoft.combobox.AbstractComboBox$a_
+com.jidesoft.combobox.AbstractComboBox$a_$2
+com.jidesoft.combobox.AbstractComboBox$a_$3
+com.jidesoft.combobox.AbstractComboBox$a_$4
+com.jidesoft.combobox.CalculatorComboBox
+com.jidesoft.combobox.CalculatorComboBox$4
+com.jidesoft.combobox.CalculatorComboBox$4$0
+com.jidesoft.combobox.CalculatorComboBox$5
+com.jidesoft.combobox.CalculatorComboBox$5$0
+com.jidesoft.combobox.CalculatorComboBox$6
+com.jidesoft.combobox.CalculatorComboBox$a_
+com.jidesoft.combobox.CalculatorPopupPanel
+com.jidesoft.combobox.CalendarViewer
+com.jidesoft.combobox.CheckBoxListChooserPanel
+com.jidesoft.combobox.CheckBoxListChooserPanel$CheckBoxListWithResourceProvider
+com.jidesoft.combobox.CheckBoxListComboBox
+com.jidesoft.combobox.CheckBoxListComboBox$1
+com.jidesoft.combobox.CheckBoxListExComboBox
+com.jidesoft.combobox.CheckBoxListExComboBox$1
+com.jidesoft.combobox.CheckBoxTreeChooserPanel
+com.jidesoft.combobox.CheckBoxTreeChooserPanel$0
+com.jidesoft.combobox.CheckBoxTreeChooserPanel$d_
+com.jidesoft.combobox.CheckBoxTreeExComboBox
+com.jidesoft.combobox.CheckBoxTreeExComboBox$0
+com.jidesoft.combobox.ColorChooserPanel
+com.jidesoft.combobox.ColorChooserPanel$0
+com.jidesoft.combobox.ColorChooserPanel$10
+com.jidesoft.combobox.ColorChooserPanel$4
+com.jidesoft.combobox.ColorChooserPanel$5
+com.jidesoft.combobox.ColorChooserPanel$6
+com.jidesoft.combobox.ColorChooserPanel$7
+com.jidesoft.combobox.ColorChooserPanel$8
+com.jidesoft.combobox.ColorChooserPanel$9
+com.jidesoft.combobox.ColorChooserPanel$ColorButton
+com.jidesoft.combobox.ColorChooserPanel$b_
+com.jidesoft.combobox.ColorComboBox
+com.jidesoft.combobox.ColorComboBox$ColorEditorComponent
+com.jidesoft.combobox.ColorComboBox$ColorLabel
+com.jidesoft.combobox.ColorComboBox$ColorRendererComponent
+com.jidesoft.combobox.ColorExComboBox
+com.jidesoft.combobox.DateChooserPanel
+com.jidesoft.combobox.DateChooserPanel$0
+com.jidesoft.combobox.DateChooserPanel$1
+com.jidesoft.combobox.DateChooserPanel$16
+com.jidesoft.combobox.DateChooserPanel$17
+com.jidesoft.combobox.DateChooserPanel$18
+com.jidesoft.combobox.DateChooserPanel$19
+com.jidesoft.combobox.DateChooserPanel$2
+com.jidesoft.combobox.DateChooserPanel$20
+com.jidesoft.combobox.DateChooserPanel$21
+com.jidesoft.combobox.DateChooserPanel$22
+com.jidesoft.combobox.DateChooserPanel$23
+com.jidesoft.combobox.DateChooserPanel$24
+com.jidesoft.combobox.DateChooserPanel$25
+com.jidesoft.combobox.DateChooserPanel$26
+com.jidesoft.combobox.DateChooserPanel$27
+com.jidesoft.combobox.DateChooserPanel$4
+com.jidesoft.combobox.DateChooserPanel$d_
+com.jidesoft.combobox.DateComboBox
+com.jidesoft.combobox.DateComboBox$DateEditorComponent
+com.jidesoft.combobox.DateComboBox$DateRendererComponent
+com.jidesoft.combobox.DateExComboBox
+com.jidesoft.combobox.DateModelEvent
+com.jidesoft.combobox.DateSelectionEvent
+com.jidesoft.combobox.DateSpinnerComboBox
+com.jidesoft.combobox.DateSpinnerComboBox$0
+com.jidesoft.combobox.DateSpinnerComboBox$DateSpinnerEditorComponent
+com.jidesoft.combobox.DefaultComboBoxModelWrapper
+com.jidesoft.combobox.ExComboBox$0
+com.jidesoft.combobox.ExComboBox$1
+com.jidesoft.combobox.ExComboBox$2
+com.jidesoft.combobox.ExComboBox$3
+com.jidesoft.combobox.ExComboBox$LazyDelegateAction
+com.jidesoft.combobox.FileChooserComboBox
+com.jidesoft.combobox.FileChooserComboBox$0
+com.jidesoft.combobox.FileChooserComboBox$1
+com.jidesoft.combobox.FileChooserExComboBox
+com.jidesoft.combobox.FileChooserExComboBox$0
+com.jidesoft.combobox.FileChooserExComboBox$1
+com.jidesoft.combobox.FileChooserPanel
+com.jidesoft.combobox.FileNameChooserComboBox
+com.jidesoft.combobox.FileNameChooserComboBox$0
+com.jidesoft.combobox.FileNameChooserComboBox$1
+com.jidesoft.combobox.FileNameChooserExComboBox
+com.jidesoft.combobox.FileNameChooserExComboBox$0
+com.jidesoft.combobox.FileNameChooserExComboBox$1
+com.jidesoft.combobox.FileNameChooserPanel
+com.jidesoft.combobox.FilterableComboBoxModel
+com.jidesoft.combobox.FolderChooserComboBox
+com.jidesoft.combobox.FolderChooserExComboBox
+com.jidesoft.combobox.FolderChooserPanel
+com.jidesoft.combobox.FolderChooserPanel$0
+com.jidesoft.combobox.FolderNameChooserComboBox
+com.jidesoft.combobox.FolderNameChooserExComboBox
+com.jidesoft.combobox.FolderNameChooserPanel
+com.jidesoft.combobox.FontChooserPanel
+com.jidesoft.combobox.FontComboBox
+com.jidesoft.combobox.FontExComboBox
+com.jidesoft.combobox.FontListCellRenderer
+com.jidesoft.combobox.InsetsChooserPanel
+com.jidesoft.combobox.InsetsChooserPanel$1
+com.jidesoft.combobox.InsetsChooserPanel$2
+com.jidesoft.combobox.InsetsChooserPanel$d_
+com.jidesoft.combobox.InsetsComboBox
+com.jidesoft.combobox.InsetsExComboBox
+com.jidesoft.combobox.JideColorSplitButton
+com.jidesoft.combobox.JideColorSplitButton$2
+com.jidesoft.combobox.ListChooserPanel
+com.jidesoft.combobox.ListChooserPanel$2
+com.jidesoft.combobox.ListChooserPanel$Handler
+com.jidesoft.combobox.ListChooserPanel$d_
+com.jidesoft.combobox.ListComboBox
+com.jidesoft.combobox.ListComboBox$1
+com.jidesoft.combobox.ListComboBox$2
+com.jidesoft.combobox.ListComboBox$3
+com.jidesoft.combobox.ListComboBox$4
+com.jidesoft.combobox.ListComboBox$5
+com.jidesoft.combobox.ListComboBox$6
+com.jidesoft.combobox.ListComboBox$7
+com.jidesoft.combobox.ListComboBox$ListEditorComponent
+com.jidesoft.combobox.ListComboBox$ListRendererComponent
+com.jidesoft.combobox.ListExComboBox
+com.jidesoft.combobox.ListExComboBox$0
+com.jidesoft.combobox.MonthChooserPanel
+com.jidesoft.combobox.MonthChooserPanel$0
+com.jidesoft.combobox.MonthChooserPanel$1
+com.jidesoft.combobox.MonthChooserPanel$10
+com.jidesoft.combobox.MonthChooserPanel$11
+com.jidesoft.combobox.MonthChooserPanel$12
+com.jidesoft.combobox.MonthChooserPanel$4
+com.jidesoft.combobox.MonthChooserPanel$5
+com.jidesoft.combobox.MonthChooserPanel$6
+com.jidesoft.combobox.MonthChooserPanel$7
+com.jidesoft.combobox.MonthChooserPanel$8
+com.jidesoft.combobox.MonthChooserPanel$9
+com.jidesoft.combobox.MonthComboBox
+com.jidesoft.combobox.MonthExComboBox
+com.jidesoft.combobox.MultiSelectListChooserPanel
+com.jidesoft.combobox.MultiSelectListChooserPanel$2
+com.jidesoft.combobox.MultiSelectListChooserPanel$3
+com.jidesoft.combobox.MultiSelectListChooserPanel$Handler
+com.jidesoft.combobox.MultiSelectListComboBox
+com.jidesoft.combobox.MultiSelectListComboBox$1
+com.jidesoft.combobox.MultiSelectListExComboBox
+com.jidesoft.combobox.MultiSelectListExComboBox$1
+com.jidesoft.combobox.MultilineStringComboBox
+com.jidesoft.combobox.MultilineStringExComboBox
+com.jidesoft.combobox.MultilineStringPopupPanel
+com.jidesoft.combobox.NumberSpinnerComboBox$NumberSpinner
+com.jidesoft.combobox.NumberSpinnerComboBox$NumberSpinnerEditorComponent
+com.jidesoft.combobox.PopupPanel
+com.jidesoft.combobox.QuickComboBoxFilterField
+com.jidesoft.combobox.SortableComboBoxModel
+com.jidesoft.combobox.StringArrayComboBox
+com.jidesoft.combobox.StringArrayExComboBox
+com.jidesoft.combobox.StringArrayPopupPanel
+com.jidesoft.combobox.TableChooserPanel
+com.jidesoft.combobox.TableChooserPanel$3
+com.jidesoft.combobox.TableChooserPanel$c_
+com.jidesoft.combobox.TableComboBox
+com.jidesoft.combobox.TableComboBox$0
+com.jidesoft.combobox.TableComboBox$3
+com.jidesoft.combobox.TableComboBox$b_
+com.jidesoft.combobox.TableComboBox$b_$0
+com.jidesoft.combobox.TableComboBox$b_$1
+com.jidesoft.combobox.TableComboBox$c_
+com.jidesoft.combobox.TableComboBox$c_$1
+com.jidesoft.combobox.TableComboBox$c_$2
+com.jidesoft.combobox.TableExComboBox
+com.jidesoft.combobox.TableExComboBox$2
+com.jidesoft.combobox.TableExComboBox$b_
+com.jidesoft.combobox.TreeChooserPanel
+com.jidesoft.combobox.TreeChooserPanel$2
+com.jidesoft.combobox.TreeChooserPanel$3
+com.jidesoft.combobox.TreeChooserPanel$b_
+com.jidesoft.combobox.TreeComboBox
+com.jidesoft.combobox.TreeComboBox$0
+com.jidesoft.combobox.TreeComboBox$2
+com.jidesoft.combobox.TreeComboBox$b_
+com.jidesoft.combobox.TreeExComboBox
+com.jidesoft.combobox.TreeExComboBox$0
+com.jidesoft.comparator.CharSequenceComparator
+com.jidesoft.comparator.ComparableComparator
+com.jidesoft.comparator.ComparatorContext
+com.jidesoft.comparator.FastComparableComparator
+com.jidesoft.converter.ConverterContext
+com.jidesoft.converter.RegistrationEvent
+com.jidesoft.csv.CsvParseEvent
+com.jidesoft.csv.CsvParseEvent$EventType
+com.jidesoft.csv.a$a_
+com.jidesoft.dialog.BannerPanel
+com.jidesoft.dialog.BannerPanel$1
+com.jidesoft.dialog.BannerPanel$3
+com.jidesoft.dialog.ButtonEvent
+com.jidesoft.dialog.ButtonPanel
+com.jidesoft.dialog.ButtonPanelLayout
+com.jidesoft.dialog.DialogPageListCellRenderer
+com.jidesoft.dialog.DialogPageTreeCellRenderer
+com.jidesoft.dialog.JideOptionPane
+com.jidesoft.dialog.MultiplePageDialog
+com.jidesoft.dialog.MultiplePageDialog$1
+com.jidesoft.dialog.MultiplePageDialog$14
+com.jidesoft.dialog.MultiplePageDialog$16
+com.jidesoft.dialog.MultiplePageDialog$18
+com.jidesoft.dialog.MultiplePageDialog$2
+com.jidesoft.dialog.MultiplePageDialog$3
+com.jidesoft.dialog.MultiplePageDialogPane
+com.jidesoft.dialog.MultiplePageDialogPane$1
+com.jidesoft.dialog.MultiplePageDialogPane$12
+com.jidesoft.dialog.MultiplePageDialogPane$14
+com.jidesoft.dialog.MultiplePageDialogPane$16
+com.jidesoft.dialog.MutableTreeNodeEx
+com.jidesoft.dialog.PageEvent
+com.jidesoft.dialog.PageList
+com.jidesoft.dialog.ScrollableButtonPanel
+com.jidesoft.dialog.StandardDialog$2
+com.jidesoft.dialog.StandardDialog$3
+com.jidesoft.dialog.StandardDialog$DefaultStandardDialogPane
+com.jidesoft.dialog.StandardDialog$StandardDialogPropertyChangeListener$1
+com.jidesoft.dialog.StandardDialogPane$1
+com.jidesoft.dialog.StandardDialogPane$2
+com.jidesoft.document.DialogFloatingDocumentContainer
+com.jidesoft.document.DialogFloatingDocumentContainer$4
+com.jidesoft.document.DocumentComponentEvent
+com.jidesoft.document.DocumentPane
+com.jidesoft.document.DocumentPane$32
+com.jidesoft.document.DocumentPane$33
+com.jidesoft.document.DocumentPane$34
+com.jidesoft.document.FrameFloatingDocumentContainer
+com.jidesoft.document.FrameFloatingDocumentContainer$4
+com.jidesoft.document.TdiGroup
+com.jidesoft.document.a
+com.jidesoft.field.IPTextField
+com.jidesoft.field.IPTextField$a_
+com.jidesoft.field.IPTextField$b_
+com.jidesoft.field.IPTextField$c_
+com.jidesoft.field.IPTextField$d_
+com.jidesoft.field.IPTextField$e_
+com.jidesoft.field.IPTextField$k_
+com.jidesoft.field.creditcard.CreditCardTextField
+com.jidesoft.filter.AllFilter
+com.jidesoft.filter.AndFilter
+com.jidesoft.filter.BetweenFilter
+com.jidesoft.filter.CustomFilterEditor
+com.jidesoft.filter.CustomFilterEditor$3
+com.jidesoft.filter.EmptyFilter
+com.jidesoft.filter.EqualFilter
+com.jidesoft.filter.GreaterOrEqualFilter
+com.jidesoft.filter.GreaterThanFilter
+com.jidesoft.filter.InFilter
+com.jidesoft.filter.LastMonthFilter
+com.jidesoft.filter.LastQuarterFilter
+com.jidesoft.filter.LastWeekFilter
+com.jidesoft.filter.LastYearFilter
+com.jidesoft.filter.LessOrEqualFilter
+com.jidesoft.filter.LessThanFilter
+com.jidesoft.filter.LikeFilter
+com.jidesoft.filter.LikeFilter$0
+com.jidesoft.filter.MonthFilter
+com.jidesoft.filter.NextMonthFilter
+com.jidesoft.filter.NextQuarterFilter
+com.jidesoft.filter.NextWeekFilter
+com.jidesoft.filter.NextYearFilter
+com.jidesoft.filter.NoneFilter
+com.jidesoft.filter.NotBetweenFilter
+com.jidesoft.filter.NotEqualFilter
+com.jidesoft.filter.NotFilter
+com.jidesoft.filter.NotInFilter
+com.jidesoft.filter.NotLikeFilter
+com.jidesoft.filter.OrFilter
+com.jidesoft.filter.QuarterFilter
+com.jidesoft.filter.RegexFilter
+com.jidesoft.filter.ThisMonthFilter
+com.jidesoft.filter.ThisQuarterFilter
+com.jidesoft.filter.ThisWeekFilter
+com.jidesoft.filter.ThisYearFilter
+com.jidesoft.filter.TodayFilter
+com.jidesoft.filter.TomorrowFilter
+com.jidesoft.filter.ValueEditor
+com.jidesoft.filter.ValueEditor$2
+com.jidesoft.filter.WildcardFilter
+com.jidesoft.filter.YearFilter
+com.jidesoft.filter.YesterdayFilter
+com.jidesoft.gauge.Bullet
+com.jidesoft.gauge.BulletAxisPlacement
+com.jidesoft.gauge.BulletIndicatorLegendItem
+com.jidesoft.gauge.BulletIntervalMarkerLegendItem
+com.jidesoft.gauge.BulletLabel
+com.jidesoft.gauge.Clock
+com.jidesoft.gauge.Dial
+com.jidesoft.gauge.DialIntervalMarkerLegendItem
+com.jidesoft.gauge.DialLabelOrientation
+com.jidesoft.gauge.GaugeModelEvent
+com.jidesoft.gauge.LineLabelPlacement
+com.jidesoft.gauge.MarkerShape
+com.jidesoft.gauge.NeedleEndShape
+com.jidesoft.gauge.NeedleLegendItem
+com.jidesoft.gauge.PointerIndicatorPlacement
+com.jidesoft.gauge.PointerLabelPlacement
+com.jidesoft.grid.AutoFilterBox
+com.jidesoft.grid.AutoFilterBox$10
+com.jidesoft.grid.AutoFilterBox$7
+com.jidesoft.grid.AutoFilterBox$9
+com.jidesoft.grid.AutoFilterBox$AutoFilterBoxFilterField
+com.jidesoft.grid.AutoFilterBox$AutoFilterBoxFilterField$a_
+com.jidesoft.grid.AutoFilterTableHeader
+com.jidesoft.grid.AutoFilterTableHeader$0
+com.jidesoft.grid.AutoFilterTableHeader$1
+com.jidesoft.grid.AutoFilterTableHeaderEditor
+com.jidesoft.grid.AutoFilterTableHeaderRenderer
+com.jidesoft.grid.AutoFilterUtils$5
+com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTable
+com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTable$1
+com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTableModel
+com.jidesoft.grid.AutoFilterUtils$TableWildcardFilter
+com.jidesoft.grid.AutoResizePopupMenuCustomizer$0
+com.jidesoft.grid.AutoResizePopupMenuCustomizer$1
+com.jidesoft.grid.BasicTableModel
+com.jidesoft.grid.BeanTableModel
+com.jidesoft.grid.BooleanCellEditor
+com.jidesoft.grid.BooleanCheckBoxCellEditor
+com.jidesoft.grid.BooleanCheckBoxCellRenderer
+com.jidesoft.grid.ButtonTableCellEditorRenderer
+com.jidesoft.grid.ByteCellEditor
+com.jidesoft.grid.CachedTableModel
+com.jidesoft.grid.CalculatorCellEditor
+com.jidesoft.grid.CalculatorCellEditor$0
+com.jidesoft.grid.CalculatorCellEditor$0$1
+com.jidesoft.grid.CategorizedTable
+com.jidesoft.grid.CellChangeEvent
+com.jidesoft.grid.CellRendererPaneEx
+com.jidesoft.grid.CellSpanTable
+com.jidesoft.grid.CellSpanTable$DelegateAction
+com.jidesoft.grid.CellStyleEditor
+com.jidesoft.grid.CellStyleEditor$1
+com.jidesoft.grid.CellStyleTable
+com.jidesoft.grid.CellStyleTableHeader
+com.jidesoft.grid.CheckBoxListComboBoxCellEditor
+com.jidesoft.grid.CheckBoxTreeComboBoxCellEditor
+com.jidesoft.grid.ColorCellEditor
+com.jidesoft.grid.ColorCellRenderer
+com.jidesoft.grid.ComboBoxShrinkSearchableSupport$0
+com.jidesoft.grid.CompoundTableModelEvent
+com.jidesoft.grid.ContextSensitiveCellRenderer
+com.jidesoft.grid.ContextSensitiveTable
+com.jidesoft.grid.ContextSensitiveTable$0
+com.jidesoft.grid.ContextSensitiveTableTransferHandler
+com.jidesoft.grid.CustomFilterEditorDialog
+com.jidesoft.grid.CustomValueFilterListSelectionModel
+com.jidesoft.grid.DateCellEditor
+com.jidesoft.grid.DefaultColumnTableModelWrapper
+com.jidesoft.grid.DefaultContextSensitiveTableModel
+com.jidesoft.grid.DefaultGroupTableModel
+com.jidesoft.grid.DefaultGroupableTableModel
+com.jidesoft.grid.DefaultMultiTableModel
+com.jidesoft.grid.DefaultNavigableTableModel
+com.jidesoft.grid.DefaultProperty
+com.jidesoft.grid.DefaultSpanTableModel
+com.jidesoft.grid.DefaultStyleTableModel
+com.jidesoft.grid.DefaultTableModelWrapper
+com.jidesoft.grid.DefaultTableSelectionModel
+com.jidesoft.grid.DefaultUndoableTableModel
+com.jidesoft.grid.DimensionCellEditor
+com.jidesoft.grid.DoubleCellEditor
+com.jidesoft.grid.DraggingTableHeader
+com.jidesoft.grid.DualTable
+com.jidesoft.grid.DualTable$4
+com.jidesoft.grid.DualTable$5
+com.jidesoft.grid.DualTable$6
+com.jidesoft.grid.DualTable$7
+com.jidesoft.grid.DualTable$8
+com.jidesoft.grid.DualTable$d_
+com.jidesoft.grid.EditableTableHeader
+com.jidesoft.grid.EditableTableHeader$4
+com.jidesoft.grid.EditableTableHeader$4$0
+com.jidesoft.grid.EditingNotStoppedException
+com.jidesoft.grid.EditorContext
+com.jidesoft.grid.EnumCellEditor
+com.jidesoft.grid.EnumCellRenderer
+com.jidesoft.grid.ExpandablePanel
+com.jidesoft.grid.ExpandableTableCellRenderer
+com.jidesoft.grid.Field
+com.jidesoft.grid.FileCellEditor
+com.jidesoft.grid.FileNameCellEditor
+com.jidesoft.grid.FilterEvent
+com.jidesoft.grid.FilterListCellRenderer
+com.jidesoft.grid.FilterableTableModel
+com.jidesoft.grid.FilterableTableModel$0
+com.jidesoft.grid.FilterableTableModel$1
+com.jidesoft.grid.FilterableTableModelEvent
+com.jidesoft.grid.FilterableTreeTableModel
+com.jidesoft.grid.FloatCellEditor
+com.jidesoft.grid.FolderCellEditor
+com.jidesoft.grid.FolderNameCellEditor
+com.jidesoft.grid.FontCellEditor
+com.jidesoft.grid.FontNameCellEditor
+com.jidesoft.grid.FontNameCellEditor$a_
+com.jidesoft.grid.FormattedTextFieldCellEditor
+com.jidesoft.grid.FormattedTextFieldCellEditor$0
+com.jidesoft.grid.FormattedTextFieldCellEditor$1
+com.jidesoft.grid.GroupTable
+com.jidesoft.grid.GroupTableHeader
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$0
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$1
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$2
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$3
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$4
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$5
+com.jidesoft.grid.GroupTablePopupMenuCustomizer$6
+com.jidesoft.grid.HierarchicalPanel
+com.jidesoft.grid.HierarchicalPanel$c_
+com.jidesoft.grid.HierarchicalTable
+com.jidesoft.grid.HierarchicalTable$HierarchicalTableAction
+com.jidesoft.grid.HierarchicalTableCellRenderer
+com.jidesoft.grid.HyperlinkTableCellEditorRenderer
+com.jidesoft.grid.IFilterableTableModel$FilterItem
+com.jidesoft.grid.IPAddressCellEditor
+com.jidesoft.grid.ISortableTableModel$SortItem
+com.jidesoft.grid.IconCellRenderer
+com.jidesoft.grid.IconRenderer
+com.jidesoft.grid.IndexChangeEvent
+com.jidesoft.grid.IndexChangeListenerHelper
+com.jidesoft.grid.InsetsCellEditor
+com.jidesoft.grid.IntegerCellEditor
+com.jidesoft.grid.JideTable
+com.jidesoft.grid.JideTable$10
+com.jidesoft.grid.JideTable$22
+com.jidesoft.grid.JideTable$23
+com.jidesoft.grid.JideTable$24
+com.jidesoft.grid.JideTable$25
+com.jidesoft.grid.JideTable$26
+com.jidesoft.grid.JideTable$27
+com.jidesoft.grid.JideTable$NonContiguousTransferHandler
+com.jidesoft.grid.JideTable$s_
+com.jidesoft.grid.JideTable$t_
+com.jidesoft.grid.JideTable$u_
+com.jidesoft.grid.JideTableTransferHandler
+com.jidesoft.grid.JoinTableModel
+com.jidesoft.grid.LegacyBooleanCellEditor
+com.jidesoft.grid.LegacyCheckBoxListComboBoxCellEditor
+com.jidesoft.grid.LegacyColorCellEditor
+com.jidesoft.grid.LegacyColorCellRenderer
+com.jidesoft.grid.LegacyDateCellEditor
+com.jidesoft.grid.LegacyEnumCellEditor
+com.jidesoft.grid.LegacyEnumCellRenderer
+com.jidesoft.grid.LegacyFileCellEditor
+com.jidesoft.grid.LegacyFileNameCellEditor
+com.jidesoft.grid.LegacyFolderCellEditor
+com.jidesoft.grid.LegacyFolderNameCellEditor
+com.jidesoft.grid.LegacyFontNameCellEditor
+com.jidesoft.grid.LegacyFontNameCellEditor$a_
+com.jidesoft.grid.LegacyInsetsCellEditor
+com.jidesoft.grid.LegacyListComboBoxCellEditor
+com.jidesoft.grid.LegacyMonthCellEditor
+com.jidesoft.grid.LegacyMultilineStringCellEditor
+com.jidesoft.grid.LegacySortableTableHeader
+com.jidesoft.grid.LegacyStringArrayCellEditor
+com.jidesoft.grid.LegacyTableComboBoxCellEditor
+com.jidesoft.grid.LegacyTreeComboBoxCellEditor
+com.jidesoft.grid.ListComboBoxCellEditor
+com.jidesoft.grid.ListComboBoxShrinkSearchableSupport$0
+com.jidesoft.grid.ListSelectionModelGroup
+com.jidesoft.grid.ListShrinkSearchableSupport$0
+com.jidesoft.grid.ListTableModelAdapter
+com.jidesoft.grid.LongCellEditor
+com.jidesoft.grid.MarginExpandablePanel
+com.jidesoft.grid.MixedTableSelectionModelGroup
+com.jidesoft.grid.MixedTableSelectionModelGroup$0
+com.jidesoft.grid.MonthCellEditor
+com.jidesoft.grid.MultiValuedMap
+com.jidesoft.grid.MultilineStringCellEditor
+com.jidesoft.grid.MultilineStringCellRenderer
+com.jidesoft.grid.MultilineTableCellEditor
+com.jidesoft.grid.MultilineTableCellRenderer
+com.jidesoft.grid.MultilineTableCellRenderer$UIResource
+com.jidesoft.grid.MultipleEnumCellEditor
+com.jidesoft.grid.MultipleValuesFilter
+com.jidesoft.grid.NavigableTable
+com.jidesoft.grid.NavigationHierarchicalTable
+com.jidesoft.grid.NavigationSortableTable
+com.jidesoft.grid.NavigationTreeTable
+com.jidesoft.grid.NestedSortableTableHeader
+com.jidesoft.grid.NestedTableHeader
+com.jidesoft.grid.NumberCellEditor
+com.jidesoft.grid.NumberCellRenderer
+com.jidesoft.grid.PasswordCellEditor
+com.jidesoft.grid.PasswordCellRenderer
+com.jidesoft.grid.PointCellEditor
+com.jidesoft.grid.PropertyPane
+com.jidesoft.grid.PropertyPane$0
+com.jidesoft.grid.PropertyPane$3
+com.jidesoft.grid.PropertyPane$4
+com.jidesoft.grid.PropertyPane$5
+com.jidesoft.grid.PropertyPane$6
+com.jidesoft.grid.PropertyPane$7
+com.jidesoft.grid.PropertyTable
+com.jidesoft.grid.PropertyTable$0
+com.jidesoft.grid.PropertyTableCellRenderer
+com.jidesoft.grid.PropertyTableModel
+com.jidesoft.grid.QuickFilterField$1
+com.jidesoft.grid.QuickFilterField$2
+com.jidesoft.grid.QuickFilterField$3
+com.jidesoft.grid.QuickFilterField$4
+com.jidesoft.grid.QuickFilterField$5
+com.jidesoft.grid.QuickFilterField$6
+com.jidesoft.grid.QuickFilterField$7
+com.jidesoft.grid.QuickFilterField$8
+com.jidesoft.grid.QuickFilterField$9
+com.jidesoft.grid.QuickFilterField$FieldFilter
+com.jidesoft.grid.QuickFilterPane
+com.jidesoft.grid.QuickFilterPane$0
+com.jidesoft.grid.QuickFilterPane$1
+com.jidesoft.grid.QuickFilterPane$2
+com.jidesoft.grid.QuickFilterPane$QuickFilterCheckBoxList
+com.jidesoft.grid.QuickFilterPane$QuickFilterList
+com.jidesoft.grid.QuickTableFilterField
+com.jidesoft.grid.QuickTableFilterField$0
+com.jidesoft.grid.QuickTableFilterField$0$1
+com.jidesoft.grid.QuickTableFilterField$1
+com.jidesoft.grid.QuickTableFilterField$1$0
+com.jidesoft.grid.QuickTableFilterField$10
+com.jidesoft.grid.QuickTableFilterField$3
+com.jidesoft.grid.QuickTableFilterField$4
+com.jidesoft.grid.QuickTableFilterField$5
+com.jidesoft.grid.QuickTableFilterField$6
+com.jidesoft.grid.QuickTableFilterField$7
+com.jidesoft.grid.QuickTableFilterField$8
+com.jidesoft.grid.QuickTableFilterField$9
+com.jidesoft.grid.QuickTableFilterField$FieldTableFilter
+com.jidesoft.grid.QuickTableFilterField$c_
+com.jidesoft.grid.RectangleCellEditor
+com.jidesoft.grid.RowHeightChangeEvent
+com.jidesoft.grid.SelectTablePopupMenuCustomizer$0
+com.jidesoft.grid.SelectTablePopupMenuCustomizer$1
+com.jidesoft.grid.ShortCellEditor
+com.jidesoft.grid.SingleValueFilter
+com.jidesoft.grid.SliderCellEditor
+com.jidesoft.grid.SortEvent
+com.jidesoft.grid.SortItemEditor
+com.jidesoft.grid.SortOrderEditor
+com.jidesoft.grid.SortTableHeaderRenderer$a_
+com.jidesoft.grid.SortTableHeaderRenderer$b_
+com.jidesoft.grid.SortableTable
+com.jidesoft.grid.SortableTableHeader
+com.jidesoft.grid.SortableTableModel
+com.jidesoft.grid.SortableTableModel$1
+com.jidesoft.grid.SortableTableModel$2
+com.jidesoft.grid.SortableTableModel$3
+com.jidesoft.grid.SortableTreeTableModel
+com.jidesoft.grid.SpanModelEvent
+com.jidesoft.grid.SpinnerCellEditor
+com.jidesoft.grid.SpinnerCellEditor$0
+com.jidesoft.grid.SpinnerCellEditor$0$1
+com.jidesoft.grid.SpinnerCellEditor$0$2
+com.jidesoft.grid.SpinnerCellEditor$0$3
+com.jidesoft.grid.SpinnerCellEditor$0$4
+com.jidesoft.grid.StringArrayCellEditor
+com.jidesoft.grid.StringCellEditor
+com.jidesoft.grid.StyledTableCellRenderer
+com.jidesoft.grid.StyledTableCellRenderer$UIResource
+com.jidesoft.grid.TableCellStyleEditor
+com.jidesoft.grid.TableColumnChooser$0
+com.jidesoft.grid.TableColumnChooser$1
+com.jidesoft.grid.TableColumnChooser$2
+com.jidesoft.grid.TableColumnChooser$3
+com.jidesoft.grid.TableColumnChooser$4
+com.jidesoft.grid.TableColumnChooser$5
+com.jidesoft.grid.TableColumnChooserDialog
+com.jidesoft.grid.TableColumnChooserDialog$0
+com.jidesoft.grid.TableColumnChooserDialog$1
+com.jidesoft.grid.TableColumnChooserDialog$5
+com.jidesoft.grid.TableColumnChooserDialog$6
+com.jidesoft.grid.TableColumnChooserDialog$7
+com.jidesoft.grid.TableColumnChooserDialog$8
+com.jidesoft.grid.TableColumnChooserDialog$j_
+com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$2
+com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$3
+com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$4
+com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$5
+com.jidesoft.grid.TableColumnGroup
+com.jidesoft.grid.TableComboBoxCellEditor
+com.jidesoft.grid.TableComboBoxShrinkSearchableSupport$0
+com.jidesoft.grid.TableCustomFilterEditor
+com.jidesoft.grid.TableCustomFilterEditor$0
+com.jidesoft.grid.TableCustomFilterEditor$10
+com.jidesoft.grid.TableCustomFilterEditor$11
+com.jidesoft.grid.TableCustomFilterEditor$5
+com.jidesoft.grid.TableCustomFilterEditor$6
+com.jidesoft.grid.TableCustomFilterEditor$7
+com.jidesoft.grid.TableCustomFilterEditor$8
+com.jidesoft.grid.TableCustomFilterEditor$9
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$2
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$3
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$4
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$5
+com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$6
+com.jidesoft.grid.TableModelWrapperImpl
+com.jidesoft.grid.TableScrollPane
+com.jidesoft.grid.TableSelectionEvent
+com.jidesoft.grid.TableSelectionModelGroup
+com.jidesoft.grid.TableSelectionModelGroup$0
+com.jidesoft.grid.TableShrinkSearchableSupport$0
+com.jidesoft.grid.TableSortItemEditor
+com.jidesoft.grid.TableSortItemEditor$2
+com.jidesoft.grid.TableSplitPane
+com.jidesoft.grid.TableSplitPane$0
+com.jidesoft.grid.TableUtils$ab_
+com.jidesoft.grid.TableUtils$bb_
+com.jidesoft.grid.TableUtils$cb_
+com.jidesoft.grid.TableUtils$s_
+com.jidesoft.grid.TableUtils$t_
+com.jidesoft.grid.TableUtils$u_
+com.jidesoft.grid.TableUtils$v_
+com.jidesoft.grid.TableUtils$w_
+com.jidesoft.grid.TableUtils$x_
+com.jidesoft.grid.TableUtils$y_
+com.jidesoft.grid.TableUtils$z_
+com.jidesoft.grid.TextFieldCellEditor
+com.jidesoft.grid.TextFieldCellEditor$0
+com.jidesoft.grid.TransposeTableModel
+com.jidesoft.grid.TreeComboBoxCellEditor
+com.jidesoft.grid.TreeExpandablePanel
+com.jidesoft.grid.TreeLikeHierarchicalPanel
+com.jidesoft.grid.TreeTable
+com.jidesoft.grid.TreeTable$TreeTableAction
+com.jidesoft.grid.TreeTableCellRenderer
+com.jidesoft.grid.TreeTableModel$b_
+com.jidesoft.grid.TristateCheckBoxCellEditor
+com.jidesoft.grid.TristateCheckBoxCellRenderer
+com.jidesoft.grid.UndoableTableModelEvent
+com.jidesoft.grid.ValueFilterListSelectionModel
+com.jidesoft.grid.VerticalContextSensitiveCellRenderer
+com.jidesoft.grid.VerticalTableCellRenderer
+com.jidesoft.grid.VerticalTableCellRenderer$UIResource
+com.jidesoft.grid.a
+com.jidesoft.grid.j
+com.jidesoft.grid.k
+com.jidesoft.grid.l
+com.jidesoft.grid.l$0
+com.jidesoft.grid.m
+com.jidesoft.grid.m$a_
+com.jidesoft.grid.n
+com.jidesoft.grid.o
+com.jidesoft.grouper.GrouperContext
+com.jidesoft.hints.AbstractIntelliHints$3
+com.jidesoft.hints.AbstractIntelliH

<TRUNCATED>

[49/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a74cf2aa/pom-standalone.xml
----------------------------------------------------------------------
diff --git a/pom-standalone.xml b/pom-standalone.xml
deleted file mode 100644
index b39e64b..0000000
--- a/pom-standalone.xml
+++ /dev/null
@@ -1,1253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
-
-    Copyright (C) GridGain Systems. All Rights Reserved.
--->
-<!--
-    POM file.
--->
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <properties>
-        <gridgain.version>10.0.0</gridgain.version>
-        <gridgain.edition>fabric</gridgain.edition>
-        <hadoop.version>2.4.1</hadoop.version>
-        <spring.version>4.1.0.RELEASE</spring.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.build.timestamp.format>MMMM d yyyy</maven.build.timestamp.format>
-        <doxygen.exec>doxygen</doxygen.exec>
-        <git.exec>git</git.exec>
-    </properties>
-
-    <groupId>org.gridgain</groupId>
-    <artifactId>gridgain</artifactId>
-    <version>${gridgain.version}</version>
-    <packaging>pom</packaging>
-
-    <url>http://www.gridgain.com</url>
-
-    <description>Java-based middleware for in-memory processing of big data in a distributed environment.</description>
-
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        </license>
-    </licenses>
-
-    <scm>
-        <url>https://github.com/gridgain/gridgain</url>
-        <connection>scm:git:git://github.com/gridgain/gridgain.git</connection>
-    </scm>
-
-    <developers>
-        <developer>
-            <id>gridgain</id>
-            <name>GridGain</name>
-            <email>mvncentral@gridgain.com</email>
-        </developer>
-    </developers>
-
-    <modules>
-        <module>modules/core</module>
-        <module>modules/hadoop</module>
-        <module>modules/extdata/p2p</module>
-        <module>modules/extdata/uri</module>
-        <module>modules/clients</module>
-        <module>examples</module>
-        <module>modules/scalar</module>
-        <module>modules/visor-console</module>
-        <module>modules/visor-plugins</module>
-        <module>modules/visor-trial</module>
-        <module>modules/jdk8-backport</module>
-        <module>modules/tools</module>
-        <module>modules/spring</module>
-        <module>modules/hibernate</module>
-        <module>modules/web</module>
-        <module>modules/aop</module>
-        <module>modules/urideploy</module>
-        <module>modules/indexing</module>
-        <module>modules/ssh</module>
-        <module>modules/rest-http</module>
-        <module>modules/email</module>
-        <module>modules/jta</module>
-        <module>modules/aws</module>
-        <module>modules/schedule</module>
-        <module>modules/log4j</module>
-        <module>modules/slf4j</module>
-        <module>modules/jcl</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.17</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.sun.jdmk</groupId>
-                        <artifactId>jmxtools</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.sun.jmx</groupId>
-                        <artifactId>jmxri</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-io</artifactId>
-            <version>9.0.5.v20130815</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-http</artifactId>
-            <version>9.0.5.v20130815</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <version>9.0.5.v20130815</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-util</artifactId>
-            <version>9.0.5.v20130815</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-expression</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.beust</groupId>
-            <artifactId>jcommander</artifactId>
-            <version>1.30</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>net.alchim31.maven</groupId>
-                    <artifactId>scala-maven-plugin</artifactId>
-                    <version>3.2.0</version>
-                    <configuration>
-                        <jvmArgs>
-                            <jvmArg>-Xms512m</jvmArg>
-                            <jvmArg>-Xmx1024m</jvmArg>
-                        </jvmArgs>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.17</version>
-                <configuration>
-                    <forkCount>0</forkCount>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-libs</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <excludeGroupIds>org.gridgain</excludeGroupIds>
-                            <outputDirectory>target/libs</outputDirectory>
-                            <includeScope>runtime</includeScope>
-                            <excludeTransitive>true</excludeTransitive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.4</version>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>core-jar</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly/core-jar.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <finalName>gridgain-core-${gridgain.version}</finalName>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>dependencies</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly/dependencies-${gridgain.edition}.xml</descriptor>
-                            </descriptors>
-                            <outputDirectory>${basedir}</outputDirectory>
-                            <finalName>libs</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>dependencies-optional</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly/dependencies-optional-${gridgain.edition}.xml</descriptor>
-                            </descriptors>
-                            <outputDirectory>${basedir}/libs</outputDirectory>
-                            <finalName>optional</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>dependencies-visor-console</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly/dependencies-visor-console.xml</descriptor>
-                            </descriptors>
-                            <outputDirectory>${basedir}/bin</outputDirectory>
-                            <finalName>include</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>dependencies-visor-trial</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly/dependencies-visor-trial.xml</descriptor>
-                            </descriptors>
-                            <outputDirectory>${basedir}</outputDirectory>
-                            <finalName>bin</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>release</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly/release-${gridgain.edition}.xml</descriptor>
-                            </descriptors>
-                            <finalName>release-package</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>source</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <excludeResources>true</excludeResources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.0.0-beta-3</version>
-
-                <configuration>
-                    <flattenMode>minimum</flattenMode>
-                    <flattenedPomFilename>pom-installed.xml</flattenedPomFilename>
-                </configuration>
-
-                <executions>
-                    <!-- enable flattening -->
-                    <execution>
-                        <id>flatten</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>flatten</goal>
-                        </goals>
-                    </execution>
-
-                    <!-- ensure proper cleanup before start -->
-                    <execution>
-                        <id>flatten.clean.before</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- ensure proper cleanup after install -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>flatten.clean.after</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <configuration>
-                            <filesets>
-                                <fileset>
-                                    <directory>${project.basedir}</directory>
-                                    <includes>
-                                        <include>**/pom-installed.xml</include>
-                                    </includes>
-                                </fileset>
-                            </filesets>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>test</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.4</version>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <id>test</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>assembly/test.xml</descriptor>
-                                    </descriptors>
-                                    <outputDirectory>${basedir}</outputDirectory>
-                                    <finalName>libs</finalName>
-                                    <appendAssemblyId>false</appendAssemblyId>
-                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>surefire-fork-count-1</id>
-            <activation>
-                <property>
-                    <!-- To activate this profile set the following property. -->
-                    <name>FORK_COUNT_SET_TO_1</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.17</version>
-                        <configuration>
-                            <forkCount>1</forkCount>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>clean-libs</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>clean</phase>
-                                <goals>
-                                    <goal>clean</goal>
-                                </goals>
-                                <configuration>
-                                    <filesets>
-                                        <fileset>
-                                            <directory>libs</directory>
-                                        </fileset>
-
-                                        <fileset>
-                                            <directory>bin/include/visor-common</directory>
-                                        </fileset>
-
-                                        <fileset>
-                                            <directory>bin/include/visorcmd</directory>
-                                        </fileset>
-
-                                        <fileset>
-                                            <directory>bin/include/visorui</directory>
-                                        </fileset>
-                                    </filesets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
-            <id>release</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
-                        <executions>
-                            <execution>
-                                <id>module-javadoc</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration>
-                                    <taglets>
-                                        <taglet>
-                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
-                                            <tagletArtifact>
-                                                <groupId>org.gridgain</groupId>
-                                                <artifactId>gridgain-tools</artifactId>
-                                                <version>${gridgain.version}</version>
-                                            </tagletArtifact>
-                                        </taglet>
-                                    </taglets>
-                                    <doctitle>GridGain ${gridgain.version}</doctitle>
-                                    <windowtitle>GridGain ${gridgain.version}</windowtitle>
-                                    <breakiterator>true</breakiterator>
-                                    <verbose>true</verbose>
-                                    <show>protected</show>
-                                    <use>true</use>
-                                    <author>false</author>
-                                    <version>false</version>
-                                    <source>1.7</source>
-                                    <links>
-                                        <link>http://docs.oracle.com/javase/7/docs/api/</link>
-                                        <link>http://hadoop.apache.org/docs/current/api/</link>
-                                    </links>
-                                    <stylesheetfile>assembly/docfiles/javadoc.css</stylesheetfile>
-                                    <groups>
-                                        <group>
-                                            <title>Common Grid APIs</title>
-                                            <packages>org.gridgain.grid:org.gridgain.grid.spi:org.gridgain.grid.lang:org.gridgain.grid.resources:org.gridgain.grid.thread:org.gridgain.grid.product:org.gridgain.grid.scheduler</packages>
-                                        </group>
-                                        <group>
-                                            <title>Messaging APIs</title>
-                                            <packages>org.gridgain.grid.messaging</packages>
-                                        </group>
-                                        <group>
-                                            <title>Event Notification APIs</title>
-                                            <packages>org.gridgain.grid.events</packages>
-                                        </group>
-                                        <group>
-                                            <title>Compute Grid APIs</title>
-                                            <packages>org.gridgain.grid.compute:org.gridgain.grid.compute.gridify</packages>
-                                        </group>
-                                        <group>
-                                            <title>Data Grid APIs</title>
-                                            <packages>org.gridgain.grid.cache:org.gridgain.grid.cache.datastructures:org.gridgain.grid.cache.cloner:org.gridgain.grid.cache.store:org.gridgain.grid.cache.store.hibernate:org.gridgain.grid.cache.store.jdbc:org.gridgain.grid.cache.query:org.gridgain.grid.cache.affinity:org.gridgain.grid.cache.affinity.consistenthash:org.gridgain.grid.cache.affinity.rendezvous:org.gridgain.grid.cache.affinity.fair:org.gridgain.grid.cache.eviction:org.gridgain.grid.cache.eviction.fifo:org.gridgain.grid.cache.eviction.ggfs:org.gridgain.grid.cache.eviction.lru:org.gridgain.grid.cache.eviction.random:org.gridgain.grid.cache.jta:org.gridgain.grid.cache.jta.jndi:org.gridgain.grid.cache.jta.reflect:org.gridgain.grid.cache.websession:org.gridgain.grid.cache.hibernate:org.gridgain.grid.dataload</packages>
-                                        </group>
-                                        <group>
-                                            <title>Hadoop Accelerator APIs</title>
-                                            <packages>org.gridgain.grid.ggfs:org.gridgain.grid.ggfs.hadoop:org.gridgain.grid.ggfs.hadoop.v1:org.gridgain.grid.ggfs.hadoop.v2:org.gridgain.grid.ggfs.mapreduce:org.gridgain.grid.ggfs.mapreduce.records:org.gridgain.grid.hadoop</packages>
-                                        </group>
-                                        <group>
-                                            <title>Streaming APIs</title>
-                                            <packages>org.gridgain.grid.streamer:org.gridgain.grid.streamer.router:org.gridgain.grid.streamer.window:org.gridgain.grid.streamer.index:org.gridgain.grid.streamer.index.hash:org.gridgain.grid.streamer.index.tree</packages>
-                                        </group>
-                                        <group>
-                                            <title>Security APIs</title>
-                                            <packages>org.gridgain.grid.security</packages>
-                                        </group>
-                                        <group>
-                                            <title>Distributed Services APIs</title>
-                                            <packages>org.gridgain.grid.service</packages>
-                                        </group>
-                                        <group>
-                                            <title>JDBC Driver</title>
-                                            <packages>org.gridgain.jdbc</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: CheckPoint</title>
-                                            <packages>org.gridgain.grid.spi.checkpoint:org.gridgain.grid.spi.checkpoint.jdbc:org.gridgain.grid.spi.checkpoint.s3:org.gridgain.grid.spi.checkpoint.cache:org.gridgain.grid.spi.checkpoint.noop:org.gridgain.grid.spi.checkpoint.sharedfs</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Collision</title>
-                                            <packages>org.gridgain.grid.spi.collision:org.gridgain.grid.spi.collision.fifoqueue:org.gridgain.grid.spi.collision.jobstealing:org.gridgain.grid.spi.collision.noop:org.gridgain.grid.spi.collision.priorityqueue</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Indexing</title>
-                                            <packages>org.gridgain.grid.spi.indexing:org.gridgain.grid.spi.indexing.h2</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Load Balancing</title>
-                                            <packages>org.gridgain.grid.spi.loadbalancing:org.gridgain.grid.spi.loadbalancing.adaptive:org.gridgain.grid.spi.loadbalancing.weightedrandom:org.gridgain.grid.spi.loadbalancing.roundrobin</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Communication</title>
-                                            <packages>org.gridgain.grid.spi.communication:org.gridgain.grid.spi.communication.tcp</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Deployment</title>
-                                            <packages>org.gridgain.grid.spi.deployment:org.gridgain.grid.spi.deployment.local:org.gridgain.grid.spi.deployment.uri</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Swap Space</title>
-                                            <packages>org.gridgain.grid.spi.swapspace:org.gridgain.grid.spi.swapspace.file:org.gridgain.grid.spi.swapspace.noop</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Discovery</title>
-                                            <packages>org.gridgain.grid.spi.discovery:org.gridgain.grid.spi.discovery.tcp:org.gridgain.grid.spi.discovery.tcp.ipfinder:org.gridgain.grid.spi.discovery.tcp.ipfinder.s3:org.gridgain.grid.spi.discovery.tcp.ipfinder.jdbc:org.gridgain.grid.spi.discovery.tcp.ipfinder.sharedfs:org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast:org.gridgain.grid.spi.discovery.tcp.ipfinder.vm:org.gridgain.grid.spi.discovery.tcp.metricsstore:org.gridgain.grid.spi.discovery.tcp.metricsstore.s3:org.gridgain.grid.spi.discovery.tcp.metricsstore.jdbc:org.gridgain.grid.spi.discovery.tcp.metricsstore.sharedfs:org.gridgain.grid.spi.discovery.tcp.metricsstore.vm</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Failover</title>
-                                            <packages>org.gridgain.grid.spi.failover:org.gridgain.grid.spi.failover.never:org.gridgain.grid.spi.failover.jobstealing:org.gridgain.grid.spi.failover.always</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Event Storage</title>
-                                            <packages>org.gridgain.grid.spi.eventstorage:org.gridgain.grid.spi.eventstorage.memory</packages>
-                                        </group>
-                                        <group>
-                                            <title>Segmentation Detection</title>
-                                            <packages>org.gridgain.grid.segmentation</packages>
-                                        </group>
-                                        <group>
-                                            <title>Logging</title>
-                                            <packages>org.gridgain.grid.logger:org.gridgain.grid.logger.log4j:org.gridgain.grid.logger.java:org.gridgain.grid.logger.tomcat:org.gridgain.grid.logger.jcl:org.gridgain.grid.logger.slf4j:org.gridgain.grid.logger.jboss</packages>
-                                        </group>
-                                        <group>
-                                            <title>Loaders</title>
-                                            <packages>org.gridgain.grid.startup:org.gridgain.grid.startup.cmdline:org.gridgain.grid.startup.servlet:org.gridgain.grid.startup.tomcat</packages>
-                                        </group>
-                                        <group>
-                                            <title>Marshallers</title>
-                                            <packages>org.gridgain.grid.marshaller:org.gridgain.grid.marshaller.optimized:org.gridgain.grid.marshaller.jdk</packages>
-                                        </group>
-                                    </groups>
-                                    <header>
-                                        <![CDATA[
-                                    GridGain - In-Memory Data Fabric
-                                ]]>
-                                    </header>
-                                    <bottom>
-                                        <![CDATA[
-                                    <table width="100%" border="0" cellspacing=0 cellpadding=0 style="padding: 5px">
-                                    <tr>
-                                        <td>
-                                            <table style="padding-left: 0; margin: 0">
-                                                <tbody style="padding: 0; margin: 0">
-                                                    <tr style="padding: 0; margin: 0">
-                                                        <td>
-                                                            <a target=_blank href="http://www.gridgain.com/"><nobr>2014 Copyright &#169; GridGain Systems</nobr></a>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                        <td width="100%" align="right" valign="center">
-                                            <table border=0 cellspacing=0 cellpadding=0>
-                                            <tr>
-                                                <td>
-                                                    <nobr>Follow us:&nbsp;&nbsp;</nobr>
-                                                </td>
-                                                <td style="padding-right: 5px">
-                                                    <a class='img_link' target=twitter href='http://www.twitter.com/gridgain'>
-                                                        <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter_bw.png' alt='Follow GridGain on Twitter'/>
-                                                    </a>
-                                                </td>
-                                                <td style="padding-right: 5px">
-                                                    <a class='img_link' target=vimeo href='http://www.vimeo.com/gridgain'>
-                                                        <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo_bw.png' alt='Follow GridGain on Vimeo'/>
-                                                    </a>
-                                                </td>
-                                            </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="2" valign="top" align="left">
-                                            <table style="padding-left: 0; margin: 0">
-                                                <tbody style="padding: 0; margin: 0">
-                                                    <tr style="padding: 0; margin: 0">
-                                                        <td>
-                                                            <b>GridGain Fabric</b>
-                                                        </td>
-                                                        <td>:&nbsp;&nbsp;
-                                                            ver. <strong>${gridgain.version}</strong>
-                                                        </td>
-                                                    </tr>
-                                                    <tr style="padding: 0; margin: 0">
-                                                        <td>
-                                                            <b>Release Date</b>
-                                                        </td>
-                                                        <td>:&nbsp;&nbsp;
-                                                            ${maven.build.timestamp}
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    </table>
-                                ]]>
-                                    </bottom>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>core-javadoc</id>
-                                <goals>
-                                    <goal>aggregate</goal>
-                                </goals>
-                                <phase>prepare-package</phase>
-                                <configuration>
-                                    <taglets>
-                                        <taglet>
-                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
-                                            <tagletArtifact>
-                                                <groupId>org.gridgain</groupId>
-                                                <artifactId>gridgain-tools</artifactId>
-                                                <version>${gridgain.version}</version>
-                                            </tagletArtifact>
-                                        </taglet>
-                                    </taglets>
-                                    <reportOutputDirectory>target/javadoc</reportOutputDirectory>
-                                    <destDir>core</destDir>
-                                    <doctitle>GridGain ${gridgain.version}</doctitle>
-                                    <windowtitle>GridGain ${gridgain.version}</windowtitle>
-                                    <breakiterator>true</breakiterator>
-                                    <verbose>true</verbose>
-                                    <show>protected</show>
-                                    <use>true</use>
-                                    <author>false</author>
-                                    <version>false</version>
-                                    <source>1.7</source>
-                                    <links>
-                                        <link>http://docs.oracle.com/javase/7/docs/api/</link>
-                                        <link>http://hadoop.apache.org/docs/current/api/</link>
-                                    </links>
-                                    <stylesheetfile>assembly/docfiles/javadoc.css</stylesheetfile>
-                                    <excludePackageNames>com.*:org.jetbrains.*:org.pcollections:*.jdk8:*.tests:*.tools:*.typedef:*.examples:*.client:*.kernal:*.util:*.dr:*.compute.gridify.aop:*.spi.authentication:*.spi.securesession:*.spi.discovery.tcp.messages:*.spi.discovery.tcp.internal:*.spi.deployment.uri.scanners:*.spi.deployment.uri.tasks:*.spi.indexing.h2.opt:org.gridgain.grid.portables</excludePackageNames>
-                                    <groups>
-                                        <group>
-                                            <title>Common Grid APIs</title>
-                                            <packages>org.gridgain.grid:org.gridgain.grid.spi:org.gridgain.grid.lang:org.gridgain.grid.resources:org.gridgain.grid.thread:org.gridgain.grid.product:org.gridgain.grid.scheduler</packages>
-                                        </group>
-                                        <group>
-                                            <title>Messaging APIs</title>
-                                            <packages>org.gridgain.grid.messaging</packages>
-                                        </group>
-                                        <group>
-                                            <title>Event Notification APIs</title>
-                                            <packages>org.gridgain.grid.events</packages>
-                                        </group>
-                                        <group>
-                                            <title>Compute Grid APIs</title>
-                                            <packages>org.gridgain.grid.compute:org.gridgain.grid.compute.gridify</packages>
-                                        </group>
-                                        <group>
-                                            <title>Data Grid APIs</title>
-                                            <packages>org.gridgain.grid.cache:org.gridgain.grid.cache.datastructures:org.gridgain.grid.cache.cloner:org.gridgain.grid.cache.store:org.gridgain.grid.cache.store.hibernate:org.gridgain.grid.cache.store.jdbc:org.gridgain.grid.cache.query:org.gridgain.grid.cache.affinity:org.gridgain.grid.cache.affinity.consistenthash:org.gridgain.grid.cache.affinity.rendezvous:org.gridgain.grid.cache.affinity.fair:org.gridgain.grid.cache.eviction:org.gridgain.grid.cache.eviction.fifo:org.gridgain.grid.cache.eviction.ggfs:org.gridgain.grid.cache.eviction.lru:org.gridgain.grid.cache.eviction.random:org.gridgain.grid.cache.jta:org.gridgain.grid.cache.jta.jndi:org.gridgain.grid.cache.jta.reflect:org.gridgain.grid.cache.websession:org.gridgain.grid.cache.hibernate:org.gridgain.grid.dataload</packages>
-                                        </group>
-                                        <group>
-                                            <title>Hadoop Accelerator APIs</title>
-                                            <packages>org.gridgain.grid.ggfs:org.gridgain.grid.ggfs.hadoop:org.gridgain.grid.ggfs.hadoop.v1:org.gridgain.grid.ggfs.hadoop.v2:org.gridgain.grid.ggfs.mapreduce:org.gridgain.grid.ggfs.mapreduce.records:org.gridgain.grid.hadoop</packages>
-                                        </group>
-                                        <group>
-                                            <title>Streaming APIs</title>
-                                            <packages>org.gridgain.grid.streamer:org.gridgain.grid.streamer.router:org.gridgain.grid.streamer.window:org.gridgain.grid.streamer.index:org.gridgain.grid.streamer.index.hash:org.gridgain.grid.streamer.index.tree</packages>
-                                        </group>
-                                        <group>
-                                            <title>Security APIs</title>
-                                            <packages>org.gridgain.grid.security</packages>
-                                        </group>
-                                        <group>
-                                            <title>Distributed Services APIs</title>
-                                            <packages>org.gridgain.grid.service</packages>
-                                        </group>
-                                        <group>
-                                            <title>JDBC Driver</title>
-                                            <packages>org.gridgain.jdbc</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: CheckPoint</title>
-                                            <packages>org.gridgain.grid.spi.checkpoint:org.gridgain.grid.spi.checkpoint.jdbc:org.gridgain.grid.spi.checkpoint.s3:org.gridgain.grid.spi.checkpoint.cache:org.gridgain.grid.spi.checkpoint.noop:org.gridgain.grid.spi.checkpoint.sharedfs</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Collision</title>
-                                            <packages>org.gridgain.grid.spi.collision:org.gridgain.grid.spi.collision.fifoqueue:org.gridgain.grid.spi.collision.jobstealing:org.gridgain.grid.spi.collision.noop:org.gridgain.grid.spi.collision.priorityqueue</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Indexing</title>
-                                            <packages>org.gridgain.grid.spi.indexing:org.gridgain.grid.spi.indexing.h2</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Load Balancing</title>
-                                            <packages>org.gridgain.grid.spi.loadbalancing:org.gridgain.grid.spi.loadbalancing.adaptive:org.gridgain.grid.spi.loadbalancing.weightedrandom:org.gridgain.grid.spi.loadbalancing.roundrobin</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Communication</title>
-                                            <packages>org.gridgain.grid.spi.communication:org.gridgain.grid.spi.communication.tcp</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Deployment</title>
-                                            <packages>org.gridgain.grid.spi.deployment:org.gridgain.grid.spi.deployment.local:org.gridgain.grid.spi.deployment.uri</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Swap Space</title>
-                                            <packages>org.gridgain.grid.spi.swapspace:org.gridgain.grid.spi.swapspace.file:org.gridgain.grid.spi.swapspace.noop</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Discovery</title>
-                                            <packages>org.gridgain.grid.spi.discovery:org.gridgain.grid.spi.discovery.tcp:org.gridgain.grid.spi.discovery.tcp.ipfinder:org.gridgain.grid.spi.discovery.tcp.ipfinder.s3:org.gridgain.grid.spi.discovery.tcp.ipfinder.jdbc:org.gridgain.grid.spi.discovery.tcp.ipfinder.sharedfs:org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast:org.gridgain.grid.spi.discovery.tcp.ipfinder.vm:org.gridgain.grid.spi.discovery.tcp.metricsstore:org.gridgain.grid.spi.discovery.tcp.metricsstore.s3:org.gridgain.grid.spi.discovery.tcp.metricsstore.jdbc:org.gridgain.grid.spi.discovery.tcp.metricsstore.sharedfs:org.gridgain.grid.spi.discovery.tcp.metricsstore.vm</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Failover</title>
-                                            <packages>org.gridgain.grid.spi.failover:org.gridgain.grid.spi.failover.never:org.gridgain.grid.spi.failover.jobstealing:org.gridgain.grid.spi.failover.always</packages>
-                                        </group>
-                                        <group>
-                                            <title>SPI: Event Storage</title>
-                                            <packages>org.gridgain.grid.spi.eventstorage:org.gridgain.grid.spi.eventstorage.memory</packages>
-                                        </group>
-                                        <group>
-                                            <title>Segmentation Detection</title>
-                                            <packages>org.gridgain.grid.segmentation</packages>
-                                        </group>
-                                        <group>
-                                            <title>Logging</title>
-                                            <packages>org.gridgain.grid.logger:org.gridgain.grid.logger.log4j:org.gridgain.grid.logger.java:org.gridgain.grid.logger.tomcat:org.gridgain.grid.logger.jcl:org.gridgain.grid.logger.slf4j:org.gridgain.grid.logger.jboss</packages>
-                                        </group>
-                                        <group>
-                                            <title>Loaders</title>
-                                            <packages>org.gridgain.grid.startup:org.gridgain.grid.startup.cmdline:org.gridgain.grid.startup.servlet:org.gridgain.grid.startup.tomcat</packages>
-                                        </group>
-                                        <group>
-                                            <title>Marshallers</title>
-                                            <packages>org.gridgain.grid.marshaller:org.gridgain.grid.marshaller.optimized:org.gridgain.grid.marshaller.jdk</packages>
-                                        </group>
-                                        <group>
-                                            <title>Visor Plugins</title>
-                                            <packages>org.gridgain.visor.plugin</packages>
-                                        </group>
-                                        <group>
-                                            <title>Spring Caching</title>
-                                            <packages>org.gridgain.grid.cache.spring</packages>
-                                        </group>
-                                        <group>
-                                            <title>.Net Configuration</title>
-                                            <packages>org.gridgain.grid.dotnet</packages>
-                                        </group>
-                                    </groups>
-                                    <header>
-                                        <![CDATA[
-                                    GridGain - In-Memory Data Fabric
-                                ]]>
-                                    </header>
-                                    <bottom>
-                                        <![CDATA[
-                                    <table width="100%" border="0" cellspacing=0 cellpadding=0 style="padding: 5px">
-                                    <tr>
-                                        <td>
-                                            <table style="padding-left: 0; margin: 0">
-                                                <tbody style="padding: 0; margin: 0">
-                                                    <tr style="padding: 0; margin: 0">
-                                                        <td>
-                                                            <a target=_blank href="http://www.gridgain.com/"><nobr>2014 Copyright &#169; GridGain Systems</nobr></a>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                        <td width="100%" align="right" valign="center">
-                                            <table border=0 cellspacing=0 cellpadding=0>
-                                            <tr>
-                                                <td>
-                                                    <nobr>Follow us:&nbsp;&nbsp;</nobr>
-                                                </td>
-                                                <td style="padding-right: 5px">
-                                                    <a class='img_link' target=twitter href='http://www.twitter.com/gridgain'>
-                                                        <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter_bw.png' alt='Follow GridGain on Twitter'/>
-                                                    </a>
-                                                </td>
-                                                <td style="padding-right: 5px">
-                                                    <a class='img_link' target=vimeo href='http://www.vimeo.com/gridgain'>
-                                                        <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo_bw.png' alt='Follow GridGain on Vimeo'/>
-                                                    </a>
-                                                </td>
-                                            </tr>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td colspan="2" valign="top" align="left">
-                                            <table style="padding-left: 0; margin: 0">
-                                                <tbody style="padding: 0; margin: 0">
-                                                    <tr style="padding: 0; margin: 0">
-                                                        <td>
-                                                            <b>GridGain Fabric</b>
-                                                        </td>
-                                                        <td>:&nbsp;&nbsp;
-                                                            ver. <strong>${gridgain.version}</strong>
-                                                        </td>
-                                                    </tr>
-                                                    <tr style="padding: 0; margin: 0">
-                                                        <td>
-                                                            <b>Release Date</b>
-                                                        </td>
-                                                        <td>:&nbsp;&nbsp;
-                                                            ${maven.build.timestamp}
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    </table>
-                                ]]>
-                                    </bottom>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>client-javadoc</id>
-                                <goals>
-                                    <goal>aggregate</goal>
-                                </goals>
-                                <phase>prepare-package</phase>
-                                <configuration>
-                                    <taglets>
-                                        <taglet>
-                                            <tagletClass>org.gridgain.grid.tools.javadoc.GridLinkTaglet</tagletClass>
-                                            <tagletArtifact>
-                                                <groupId>org.gridgain</groupId>
-                                                <artifactId>gridgain-tools</artifactId>
-                                                <version>${gridgain.version}</version>
-                                            </tagletArtifact>
-                                        </taglet>
-                                    </taglets>
-                                    <reportOutputDirectory>target/javadoc</reportOutputDirectory>
-                                    <destDir>client</destDir>
-                                    <doctitle>GridGain ${gridgain.version} - Java Client</doctitle>
-                                    <windowtitle>GridGain ${gridgain.version} - Java Client</windowtitle>
-                                    <breakiterator>true</breakiterator>
-                                    <verbose>true</verbose>
-                                    <show>protected</show>
-                                    <use>true</use>
-                                    <author>false</author>
-                                    <version>false</version>
-                                    <source>1.7</source>
-                                    <links>
-                                        <link>http://docs.oracle.com/javase/7/docs/api/</link>
-                                    </links>
-                                    <stylesheetfile>assembly/docfiles/javadoc.css</stylesheetfile>
-                                    <subpackages>org.gridgain.client</subpackages>
-                                    <additionalparam>-exclude org.gridgain.client.impl:org.gridgain.client.util:org.gridgain.client.router.impl</additionalparam>
-                                    <groups>
-                                        <group>
-                                            <title>Client APIs</title>
-                                            <packages>org.gridgain.client:org.gridgain.client.balancer:org.gridgain.client.ssl:org.gridgain.client.hadoop:org.gridgain.client.hadoop.counter</packages>
-                                        </group>
-                                        <group>
-                                            <title>Router APIs</title>
-                                            <packages>org.gridgain.client.router</packages>
-                                        </group>
-                                        <group>
-                                            <title>Marshallers</title>
-                                            <packages>org.gridgain.client.marshaller:org.gridgain.client.marshaller.jdk:org.gridgain.client.marshaller.optimized:org.gridgain.client.marshaller.portable</packages>
-                                        </group>
-                                    </groups>
-                                    <header>
-                                        <![CDATA[
-                                    Java Client
-                                    <br>
-                                    GridGain ver. <b>${gridgain.version}</b>
-                                ]]>
-                                    </header>
-                                    <bottom>
-                                        <![CDATA[
-                                    <table width="100%" border="0">
-                                        <tr>
-                                            <td>
-                                                <nobr>GridGain&#153; - Java Client, ver. <strong>${gridgain.version}</strong></nobr>
-                                                <br>
-                                                <a target=_blank href="http://www.gridgain.com/"><nobr>2014 Copyright &#169; GridGain Systems</nobr></a>
-                                            </td>
-                                            <td width="100%" align="right" valign="center">
-                                                <table border=0>
-                                                <tr>
-                                                    <td>
-                                                        <nobr>Follow us:&nbsp;&nbsp;</nobr>
-                                                    </td>
-                                                    <td style="padding-right: 5px">
-                                                        <a class='img_link' target=twitter href='http://www.twitter.com/gridgain'>
-                                                            <img border=0 align=absmiddle src='http://www.gridgain.com/images/twitter_bw.png' alt='Follow GridGain on Twitter'/>
-                                                        </a>
-                                                    </td>
-                                                    <td style="padding-right: 5px">
-                                                        <a class='img_link' target=vimeo href='http://www.vimeo.com/gridgain'>
-                                                            <img border=0 align=absmiddle src='http://www.gridgain.com/images/vimeo_bw.png' alt='Follow GridGain on Vimeo'/>
-                                                        </a>
-                                                    </td>
-                                                </tr>
-                                                </table>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                ]]>
-                                    </bottom>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.7</version>
-                        <inherited>false</inherited>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.gridgain</groupId>
-                                <artifactId>gridgain-tools</artifactId>
-                                <version>${gridgain.version}</version>
-                            </dependency>
-                        </dependencies>
-                        <executions>
-                            <execution>
-                                <id>javadoc-postprocessing</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <phase>prepare-package</phase>
-                                <configuration>
-                                    <target>
-                                        <copy todir="target/javadoc/core">
-                                            <fileset dir="assembly/docfiles">
-                                                <include name="img/**"/>
-                                                <include name="*.js"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <copy todir="target/javadoc/client">
-                                            <fileset dir="assembly/docfiles">
-                                                <include name="img/**"/>
-                                                <include name="*.js"/>
-                                            </fileset>
-                                        </copy>
-
-                                        <taskdef name="doctask"
-                                                 classname="org.gridgain.grid.tools.ant.beautifier.GridJavadocAntTask"/>
-
-                                        <doctask css="dotted" dir="target/javadoc/core">
-                                            <include name="**/*.html"/>
-                                            <exclude name="overview-frame.html"/>
-                                            <exclude name="allclasses-frame.html"/>
-                                            <exclude name="**/class-use/*"/>
-                                        </doctask>
-
-                                        <doctask css="dotted" dir="target/javadoc/client">
-                                            <include name="**/*.html"/>
-                                            <exclude name="overview-frame.html"/>
-                                            <exclude name="allclasses-frame.html"/>
-                                            <exclude name="**/class-use/*"/>
-                                        </doctask>
-                                    </target>
-                                </configuration>
-                            </execution>
-
-                            <execution>
-                                <id>release-postprocessing</id>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration>
-                                    <target>
-                                        <replaceregexp byline="true">
-                                            <regexp pattern='pushd "%~dp0"/\.\./\.\.(\s*&amp;::.+)?'/>
-                                            <substitution expression='pushd "%~dp0"/..'/>
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.bat"/>
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <replaceregexp byline="true">
-                                            <regexp pattern='GRIDGAIN_HOME_TMP="\$\(dirname "\$\{GRIDGAIN_HOME_TMP\}"\)"(\s*#.*)?'/>
-                                            <substitution expression=""/>
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.sh"/>
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <replaceregexp byline="true">
-                                            <regexp pattern='set SCRIPTS_HOME=%GRIDGAIN_HOME%\\os\\bin(\s*&amp;::.*)?'/>
-                                            <substitution expression='set SCRIPTS_HOME=%GRIDGAIN_HOME%\\\\bin'/>
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.bat"/>
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <replaceregexp byline="true">
-                                            <regexp pattern='SCRIPTS_HOME="\$\{GRIDGAIN_HOME_TMP\}/os/bin"(\s*#.*)?'/>
-                                            <substitution expression='SCRIPTS_HOME="$${GRIDGAIN_HOME_TMP}/bin"'/>
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.sh"/>
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <replaceregexp byline="true">
-                                            <regexp pattern='\. "\$\{SCRIPTS_HOME\}"/include/target-classpath.sh(\s*#.*)?'/>
-                                            <substitution expression=""/>
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.sh"/>
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <replaceregexp byline="true">
-                                            <regexp pattern='call "%SCRIPTS_HOME%\\include\\target-classpath.bat"(\s*&amp;::.*)?'/>
-                                            <substitution expression=""/>
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.bat"/>
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <replaceregexp byline="true">
-                                            <regexp pattern='ENABLE_ASSERTIONS=.*'/>
-                                            <substitution expression="ENABLE_ASSERTIONS=&quot;0&quot;"/>
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.sh"/>
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <replaceregexp byline="true">
-                                            <regexp pattern='ENABLE_ASSERTIONS=.*'/>
-                                            <substitution expression="ENABLE_ASSERTIONS=0"/>
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.bat"/>
-                                            </fileset>
-                                        </replaceregexp>
-
-                                        <replace token="@sh.file.version" value="${gridgain.version}">
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.sh"/>
-                                            </fileset>
-                                        </replace>
-
-                                        <replace token="@bat.file.version" value="${gridgain.version}">
-                                            <fileset dir="target/release-package/bin">
-                                                <include name="**/*.bat"/>
-                                            </fileset>
-                                        </replace>
-
-                                        <replace token="@xml.file.version" value="${gridgain.version}">
-                                            <fileset dir="target/release-package">
-                                                <include name="**/*.xml"/>
-                                            </fileset>
-                                        </replace>
-
-                                        <zip destfile="target/gridgain-${gridgain.edition}-os-${gridgain.version}.zip"
-                                             encoding="UTF-8">
-                                            <zipfileset dir="target/release-package"
-                                                        prefix="gridgain-${gridgain.edition}-os-${gridgain.version}"
-                                                        filemode="755">
-                                                <include name="**/*.sh"/>
-                                                <include name="**/configure"/>
-                                                <include name="**/install-sh"/>
-                                                <include name="**/compile"/>
-                                                <include name="**/missing"/>
-                                            </zipfileset>
-                                            <zipfileset dir="target/release-package"
-                                                        prefix="gridgain-${gridgain.edition}-os-${gridgain.version}">
-                                                <exclude name="**/*.sh"/>
-                                                <exclude name="**/configure"/>
-                                                <exclude name="**/install-sh"/>
-                                                <exclude name="**/compile"/>
-                                                <exclude name="**/missing"/>
-                                            </zipfileset>
-                                        </zip>
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>


[33/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java
index 8213d7e..5fedbd9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridTopic.java
@@ -175,7 +175,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T1 implements Externalizable, GridOptimizedMarshallable {
+    private static class T1 implements Externalizable, IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -247,7 +247,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T2 implements Externalizable, GridOptimizedMarshallable {
+    private static class T2 implements Externalizable, IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -326,7 +326,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T3 implements Externalizable, GridOptimizedMarshallable {
+    private static class T3 implements Externalizable, IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -398,7 +398,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T4 implements Externalizable, GridOptimizedMarshallable {
+    private static class T4 implements Externalizable, IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -484,7 +484,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T5 implements Externalizable, GridOptimizedMarshallable {
+    private static class T5 implements Externalizable, IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -570,7 +570,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T6 implements Externalizable, GridOptimizedMarshallable {
+    private static class T6 implements Externalizable, IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -649,7 +649,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T7 implements Externalizable, GridOptimizedMarshallable {
+    private static class T7 implements Externalizable, IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 
@@ -743,7 +743,7 @@ public enum GridTopic {
     /**
      *
      */
-    private static class T8 implements Externalizable, GridOptimizedMarshallable {
+    private static class T8 implements Externalizable, IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java
index e176e45..4286058 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentLocalStore.java
@@ -515,7 +515,7 @@ class GridDeploymentLocalStore extends GridDeploymentStoreAdapter {
                 ctx.resource().onUndeployed(dep);
 
                 // Clear optimized marshaller's cache. If another marshaller is used, this is no-op.
-                GridOptimizedMarshaller.onUndeploy(ldr);
+                IgniteOptimizedMarshaller.onUndeploy(ldr);
 
                 clearSerializationCaches();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
index 86ec14e..2d7cc8a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -494,7 +494,7 @@ public class GridDeploymentPerLoaderStore extends GridDeploymentStoreAdapter {
                 ctx.stream().onUndeployed(leftNodeId, ldr);
 
                 // Clear optimized marshaller's cache. If another marshaller is used, this is no-op.
-                GridOptimizedMarshaller.onUndeploy(ldr);
+                IgniteOptimizedMarshaller.onUndeploy(ldr);
 
                 clearSerializationCaches();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
index 7aa7096..25eb4ab 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -1254,7 +1254,7 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
                 ctx.stream().onUndeployed(leftNodeId, ldr);
 
                 // Clear optimized marshaller's cache. If another marshaller is used, this is no-op.
-                GridOptimizedMarshaller.onUndeploy(ldr);
+                IgniteOptimizedMarshaller.onUndeploy(ldr);
 
                 clearSerializationCaches();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java
index 4b7df4f..778a780 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/affinity/GridAffinityMessage.java
@@ -21,7 +21,7 @@ import java.util.*;
 /**
  * Object wrapper containing serialized byte array of original object and deployment information.
  */
-class GridAffinityMessage implements Externalizable, GridOptimizedMarshallable {
+class GridAffinityMessage implements Externalizable, IgniteOptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java
index b2fa13a..e9c476a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheReturn.java
@@ -19,7 +19,7 @@ import java.io.*;
 /**
  * Return value for cases where both, value and success flag need to be returned.
  */
-public class GridCacheReturn<V> implements Externalizable, GridOptimizedMarshallable {
+public class GridCacheReturn<V> implements Externalizable, IgniteOptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java
index 45941d4..6aa3003 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxEntry.java
@@ -30,7 +30,7 @@ import static org.gridgain.grid.kernal.processors.cache.GridCacheOperation.*;
  * {@link #equals(Object)} method, as transaction entries should use referential
  * equality.
  */
-public class GridCacheTxEntry<K, V> implements GridPeerDeployAware, Externalizable, GridOptimizedMarshallable {
+public class GridCacheTxEntry<K, V> implements GridPeerDeployAware, Externalizable, IgniteOptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java
index 1ed7f93..7f04ace 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheVersion.java
@@ -20,7 +20,7 @@ import java.util.*;
 /**
  * Grid unique version.
  */
-public class GridCacheVersion implements Comparable<GridCacheVersion>, Externalizable, GridOptimizedMarshallable {
+public class GridCacheVersion implements Comparable<GridCacheVersion>, Externalizable, IgniteOptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index 8682c55..e8c0013 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -60,7 +60,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b
     /**
      * Job for JDBC adapter.
      */
-    private static class JdbcDriverMetadataJob extends ComputeJobAdapter implements GridOptimizedMarshallable {
+    private static class JdbcDriverMetadataJob extends ComputeJobAdapter implements IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index c8e59f4..5f65f1d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -121,7 +121,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
     /**
      * Job for JDBC adapter.
      */
-    private static class JdbcDriverJob extends ComputeJobAdapter implements GridOptimizedMarshallable {
+    private static class JdbcDriverJob extends ComputeJobAdapter implements IgniteOptimizedMarshallable {
         /** */
         private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java
index 3004e85..fb626ec 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerExecutionBatch.java
@@ -22,7 +22,7 @@ import java.util.*;
 /**
  * Streamer execution batch which should be processed on one node.
  */
-public class GridStreamerExecutionBatch implements Externalizable, GridOptimizedMarshallable {
+public class GridStreamerExecutionBatch implements Externalizable, IgniteOptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml
index 0ae4a11..43d1ce3 100644
--- a/modules/core/src/test/config/example-cache.xml
+++ b/modules/core/src/test/config/example-cache.xml
@@ -38,7 +38,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/ggfs-loopback.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml
index d7f2480..88e8843 100644
--- a/modules/core/src/test/config/ggfs-loopback.xml
+++ b/modules/core/src/test/config/ggfs-loopback.xml
@@ -58,7 +58,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/ggfs-no-endpoint.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml
index 5b4b861..25c4381 100644
--- a/modules/core/src/test/config/ggfs-no-endpoint.xml
+++ b/modules/core/src/test/config/ggfs-no-endpoint.xml
@@ -59,7 +59,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/ggfs-shmem.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml
index 3602b4f..698759f 100644
--- a/modules/core/src/test/config/ggfs-shmem.xml
+++ b/modules/core/src/test/config/ggfs-shmem.xml
@@ -58,7 +58,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/io-manager-benchmark.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/io-manager-benchmark.xml b/modules/core/src/test/config/io-manager-benchmark.xml
index 87223bf..ec7b019 100644
--- a/modules/core/src/test/config/io-manager-benchmark.xml
+++ b/modules/core/src/test/config/io-manager-benchmark.xml
@@ -28,7 +28,7 @@
         </property>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <property name="requireSerializable" value="true"/>
 
                 <property name="classNames">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/jobs-load-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/jobs-load-base.xml b/modules/core/src/test/config/jobs-load-base.xml
index 870b0e6..a5b83c7 100644
--- a/modules/core/src/test/config/jobs-load-base.xml
+++ b/modules/core/src/test/config/jobs-load-base.xml
@@ -13,7 +13,7 @@
         <property name="localHost" value="127.0.0.1"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <property name="classNames">
                     <list>
                         <value>org.gridgain.loadtests.job.GridJobExecutionLoadTestJob</value>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/load/dsi-load-base.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml
index 5cf4c20..4ac4001 100644
--- a/modules/core/src/test/config/load/dsi-load-base.xml
+++ b/modules/core/src/test/config/load/dsi-load-base.xml
@@ -27,7 +27,7 @@
         <property name="localHost" value="127.0.0.1"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <property name="classNames">
                     <list>
                         <value>org.gridgain.loadtests.dsi.GridDsiSession</value>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/spring-start-nodes-attr.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-start-nodes-attr.xml b/modules/core/src/test/config/spring-start-nodes-attr.xml
index d02d6f8..02170c9 100644
--- a/modules/core/src/test/config/spring-start-nodes-attr.xml
+++ b/modules/core/src/test/config/spring-start-nodes-attr.xml
@@ -31,7 +31,7 @@
         <property name="restEnabled" value="false"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <property name="requireSerializable" value="false"/>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/config/spring-start-nodes.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/config/spring-start-nodes.xml b/modules/core/src/test/config/spring-start-nodes.xml
index ed9377c..34d1b92 100644
--- a/modules/core/src/test/config/spring-start-nodes.xml
+++ b/modules/core/src/test/config/spring-start-nodes.xml
@@ -25,7 +25,7 @@
         <property name="restEnabled" value="false"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <property name="requireSerializable" value="false"/>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
index 4bf911e..46813d4 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerEnumSelfTest.java
@@ -10,7 +10,6 @@
 package org.apache.ignite.marshaller.optimized;
 
 import junit.framework.*;
-import org.apache.ignite.marshaller.optimized.*;
 
 /**
  *
@@ -20,7 +19,7 @@ public class GridOptimizedMarshallerEnumSelfTest extends TestCase {
      * @throws Exception If failed.
      */
     public void testEnumSerialisation() throws Exception {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         byte[] bytes = marsh.marshal(TestEnum.Bond);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
index aa018b4..2733c45 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
@@ -2,7 +2,6 @@ package org.apache.ignite.marshaller.optimized;
 
 import org.apache.ignite.lang.*;
 import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.*;
@@ -19,7 +18,7 @@ import java.util.concurrent.*;
 public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest {
     /** {@inheritDoc} */
     @Override protected GridMarshaller createMarshaller() {
-        GridOptimizedMarshaller m = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller m = new IgniteOptimizedMarshaller();
 
         m.setRequireSerializable(false);
         m.setClassNames(F.asList(GoodMarshallable.class.getName(), NoMarshallable.class.getName()));
@@ -339,8 +338,8 @@ public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest
     /**
      *
      */
-    public static class GoodMarshallable implements GridOptimizedMarshallable, Serializable {
-        /** Class ID required by {@link GridOptimizedMarshallable}. */
+    public static class GoodMarshallable implements IgniteOptimizedMarshallable, Serializable {
+        /** Class ID required by {@link IgniteOptimizedMarshallable}. */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
         private static Object GG_CLASS_ID;
 
@@ -416,8 +415,8 @@ public class GridOptimizedMarshallerSelfTest extends GridMarshallerAbstractTest
     /**
      *
      */
-    private static class BadMarshallable extends TestObject implements GridOptimizedMarshallable {
-        /** Class ID required by {@link GridOptimizedMarshallable}. */
+    private static class BadMarshallable extends TestObject implements IgniteOptimizedMarshallable {
+        /** Class ID required by {@link IgniteOptimizedMarshallable}. */
         @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"})
         private static Object GG_CLASS_ID;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
index d394039..e907146 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -28,7 +28,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testNonSerializable() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setRequireSerializable(false);
 
@@ -43,7 +43,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testNonSerializable1() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setRequireSerializable(false);
 
@@ -64,7 +64,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testNonSerializable2() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setRequireSerializable(false);
 
@@ -97,7 +97,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testNonSerializable3() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setRequireSerializable(false);
 
@@ -114,7 +114,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testNonSerializable4() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setRequireSerializable(false);
 
@@ -133,7 +133,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testNonSerializable5() throws GridException {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
+        GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
         byte[] bytes = marsh.marshal(true);
 
@@ -148,7 +148,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testSerializable() throws GridException {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
+        GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
         SomeSerializable outObj = marsh.unmarshal(marsh.marshal(new SomeSerializable(null)), null);
 
@@ -159,7 +159,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If failed.
      */
     public void testSerializableAfterChangingValue() throws GridException {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
+        GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
         SomeSimpleSerializable newObj = new SomeSimpleSerializable();
 
@@ -180,7 +180,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testExternalizable() throws GridException {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
+        GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
         ExternalizableA outObj = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, true)), null);
         ExternalizableA outObj1 = marsh.unmarshal(marsh.marshal(new ExternalizableA(null, false)), null);
@@ -190,10 +190,10 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Tests {@link GridOptimizedMarshaller#setRequireSerializable(boolean)}.
+     * Tests {@link IgniteOptimizedMarshaller#setRequireSerializable(boolean)}.
      */
     public void testRequireSerializable() {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setRequireSerializable(true);
 
@@ -208,7 +208,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Tests {@link GridOptimizedMarshaller#setClassNames(List)}.
+     * Tests {@link IgniteOptimizedMarshaller#setClassNames(List)}.
      *
      * @throws GridException If marshalling failed.
      */
@@ -217,17 +217,17 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
 
         // Clear caches.
         ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
-        GridOptimizedClassResolver.userClasses(null, null);
+        IgniteOptimizedClassResolver.userClasses(null, null);
 
-        GridMarshaller marsh = new GridOptimizedMarshaller();
+        GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
         int size1 = marsh.marshal(obj).length;
 
         // Clear caches.
         ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
-        GridOptimizedClassResolver.userClasses(null, null);
+        IgniteOptimizedClassResolver.userClasses(null, null);
 
-        GridOptimizedMarshaller marshPreregistered = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marshPreregistered = new IgniteOptimizedMarshaller();
 
         marshPreregistered.setClassNames(Arrays.asList(SomeSerializable.class.getName()));
 
@@ -237,7 +237,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
     }
 
     /**
-     * Tests {@link GridOptimizedMarshaller#setClassNames(List)}.
+     * Tests {@link IgniteOptimizedMarshaller#setClassNames(List)}.
      *
      * @throws GridException If marshalling failed.
      * @throws IOException If an I/O error occurs.
@@ -247,17 +247,17 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
 
         // Clear caches.
         ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
-        GridOptimizedClassResolver.userClasses(null, null);
+        IgniteOptimizedClassResolver.userClasses(null, null);
 
-        GridMarshaller marsh = new GridOptimizedMarshaller();
+        GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
         int size1 = marsh.marshal(obj).length;
 
         // Clear caches.
         ((Map)U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE")).clear();
-        GridOptimizedClassResolver.userClasses(null, null);
+        IgniteOptimizedClassResolver.userClasses(null, null);
 
-        GridOptimizedMarshaller marshPreregistered = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marshPreregistered = new IgniteOptimizedMarshaller();
 
         File namesFile = File.createTempFile("gg-", null);
 
@@ -276,7 +276,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws GridException If marshalling failed.
      */
     public void testProxy() throws GridException {
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setRequireSerializable(false);
 
@@ -317,7 +317,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
 
             ignite.compute().execute(taskClsName, 2);
 
-            ConcurrentMap<Class<?>, GridOptimizedClassDescriptor> cache =
+            ConcurrentMap<Class<?>, IgniteOptimizedClassDescriptor> cache =
                 U.staticField(GridOptimizedMarshallerUtils.class, "CLS_DESC_CACHE");
 
             assertTrue(cache.containsKey(jobCls));
@@ -349,7 +349,7 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     private void checkPerformance(int cnt, int tries) throws Exception {
-        GridMarshaller marsh = new GridOptimizedMarshaller();
+        GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
         for (int j = 0; j < tries; j++) {
             System.gc();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
index 63253fe..3aae159 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
@@ -10,7 +10,6 @@
 package org.apache.ignite.marshaller.optimized;
 
 import org.apache.ignite.marshaller.*;
-import org.apache.ignite.marshaller.optimized.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
@@ -209,7 +208,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
      */
     public void testRequireSerializable() throws Exception {
         try {
-            new GridOptimizedMarshaller(true, null, null, 0).marshal(new Object());
+            new IgniteOptimizedMarshaller(true, null, null, 0).marshal(new Object());
 
             assert false : "Exception not thrown.";
         }
@@ -235,7 +234,7 @@ public class GridOptimizedObjectStreamSelfTest extends GridCommonAbstractTest {
         Arrays.fill(obj.longArr, 100L);
         Arrays.fill(obj.doubleArr, 100.0d);
 
-        final GridOptimizedMarshaller marsh = new GridOptimizedMarshaller(false, null, null, 5);
+        final IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller(false, null, null, 5);
 
         try {
             multithreaded(new Callable<Object>() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
index b68ed28..0673e5d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
@@ -26,7 +26,7 @@ public class GridExternalizableAbstractTest extends GridCommonAbstractTest {
         List<GridMarshaller> marshallers = new ArrayList<>();
 
         marshallers.add(new IgniteJdkMarshaller());
-        marshallers.add(new GridOptimizedMarshaller());
+        marshallers.add(new IgniteOptimizedMarshaller());
 
         return marshallers;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
index 3c3ac4e..2e8f2a6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.*;
  */
 public class GridGgfsPathSelfTest extends GridCommonAbstractTest {
     /** Marshaller to test {@link Externalizable} interface. */
-    private final GridMarshaller marshaller = new GridOptimizedMarshaller();
+    private final GridMarshaller marshaller = new IgniteOptimizedMarshaller();
 
     /**
      * Test public methods of ggfs path.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
index b45bb03..8d79468 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridFailoverTaskWithPredicateSelfTest.java
@@ -62,7 +62,7 @@ public class GridFailoverTaskWithPredicateSelfTest extends GridCommonAbstractTes
             }
         });
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index 412dc6e..1deefea 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -85,7 +85,7 @@ public class GridJobMasterLeaveAwareSelfTest extends GridCommonAbstractTest {
         cfg.setDiscoverySpi(discoSpi);
 
         cfg.setCommunicationSpi(new CommunicationSpi());
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         GridCacheConfiguration ccfg = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
index 46b8f5f..9def3f6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobStealingSelfTest.java
@@ -283,7 +283,7 @@ public class GridJobStealingSelfTest extends GridCommonAbstractTest {
         cfg.setCollisionSpi(colSpi);
         cfg.setFailoverSpi(failSpi);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
index 8e0c7e4..dacdecc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridLifecycleAwareSelfTest.java
@@ -93,7 +93,7 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe
 
     /**
      */
-    private static class TestMarshaller extends GridOptimizedMarshaller implements LifecycleAware {
+    private static class TestMarshaller extends IgniteOptimizedMarshaller implements LifecycleAware {
         /** */
         private final TestLifecycleAware lifecycleAware = new TestLifecycleAware(null);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
index 0018cfc..572d50f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridProjectionLocalJobMultipleArgumentsSelfTest.java
@@ -49,7 +49,7 @@ public class GridProjectionLocalJobMultipleArgumentsSelfTest extends GridCommonA
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         GridCacheConfiguration cache = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
index 9912065..ee2fafa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTaskExecutionContextSelfTest.java
@@ -36,7 +36,7 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
index 96ced99..6919647 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/managers/GridManagerStopSelfTest.java
@@ -116,7 +116,7 @@ public class GridManagerStopSelfTest extends GridCommonAbstractTest {
         injectLogger(spi);
 
         ctx.config().setCommunicationSpi(spi);
-        ctx.config().setMarshaller(new GridOptimizedMarshaller());
+        ctx.config().setMarshaller(new IgniteOptimizedMarshaller());
 
         GridIoManager mgr = new GridIoManager(ctx);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
index bb835c9..3d42c55 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractSelfTest.java
@@ -206,7 +206,7 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
 
         cfg.setCacheConfiguration(cacheConfiguration(gridName));
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 bcd5f55..6f3a35e 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
@@ -88,7 +88,7 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
             cfg.setCacheConfiguration();
         }
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
index ac236d9..b2368b9 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -85,7 +85,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
 
         cfg.setRestEnabled(false);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index 6b52ee4..fe05d81 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -74,7 +74,7 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
             NEAR_ENTRY_OVERHEAD = U.<Integer>staticField(GridNearCacheEntry.class, "NEAR_SIZE_OVERHEAD");
             REPLICATED_ENTRY_OVERHEAD = DHT_ENTRY_OVERHEAD;
 
-            GridMarshaller marsh = new GridOptimizedMarshaller();
+            GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
             KEY_SIZE = marsh.marshal(1).length;
             ONE_KB_VAL_SIZE = marsh.marshal(new Value(new byte[1024])).length;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java
index c812c64..e61b594 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMemoryModeSelfTest.java
@@ -83,7 +83,7 @@ public class GridCacheMemoryModeSelfTest extends GridCommonAbstractTest {
         cacheCfg.setPortableEnabled(portableEnabled());
 
         cfg.setCacheConfiguration(cacheCfg);
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
index 7ec0aed..97e4981 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapSelfTest.java
@@ -77,7 +77,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
 
         cfg.setCacheConfiguration(cacheCfg);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
         cfg.setDeploymentMode(SHARED);
         cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheOffHeapSelfTest.class.getName(),
             CacheValue.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
index 50bb236..f71dc41 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReferenceCleanupSelfTest.java
@@ -62,7 +62,7 @@ public class GridCacheReferenceCleanupSelfTest extends GridCommonAbstractTest {
 
         cfg.setCacheConfiguration(cacheCfg);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
index 2b3b073..b97a534 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
@@ -52,7 +52,7 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra
 
         cfg.setDiscoverySpi(disco);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
index 57567c3..d417e13 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
@@ -75,7 +75,7 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb
         c.setDeploymentMode(GridDeploymentMode.SHARED);
         c.setNetworkTimeout(10000);
         c.setRestEnabled(false);
-        c.setMarshaller(new GridOptimizedMarshaller(false));
+        c.setMarshaller(new IgniteOptimizedMarshaller(false));
 
 //        c.setPeerClassLoadingLocalClassPathExclude(GridCachePreloadLifecycleAbstractTest.class.getName(),
 //            MyValue.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
index 6201ca8..8a7fde2 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java
@@ -63,7 +63,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest {
 
         c.setDiscoverySpi(disco);
 
-        c.setMarshaller(new GridOptimizedMarshaller(false));
+        c.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index b83d848..0bf7d44 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@ -48,7 +48,7 @@ public abstract class GridCacheSwapScanQueryAbstractSelfTest extends GridCommonA
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         GridTcpDiscoverySpi disco = new GridTcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index c8675e0..8814648 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -80,7 +80,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
 
         cfg.setDiscoverySpi(disco);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index de1d1a2..633afc0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@ -52,7 +52,7 @@ public abstract class GridCacheAbstractReduceFieldsQuerySelfTest extends GridCom
             cfg.setCacheConfiguration();
 
         cfg.setDiscoverySpi(discovery());
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 46ba6da..334900c 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
@@ -51,7 +51,7 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         GridTcpDiscoverySpi discoSpi = new GridTcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java
index c1b4449..b533e0d 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/continuous/GridEventConsumeSelfTest.java
@@ -66,7 +66,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest {
         if (include)
             cfg.setUserAttributes(F.asMap("include", true));
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
index db44d7c..0f79da7 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
@@ -136,8 +136,8 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
 
             GridMarshaller marsh = g0.configuration().getMarshaller();
 
-            if (marsh instanceof GridOptimizedMarshaller)
-                assertTrue(((GridOptimizedMarshaller)marsh).isRequireSerializable());
+            if (marsh instanceof IgniteOptimizedMarshaller)
+                assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable());
             else
                 fail("Expected GridOptimizedMarshaller, but found: " + marsh.getClass().getName());
 
@@ -186,8 +186,8 @@ public class GridDataLoaderImplSelfTest extends GridCommonAbstractTest {
 
             GridMarshaller marsh = g0.configuration().getMarshaller();
 
-            if (marsh instanceof GridOptimizedMarshaller)
-                assertTrue(((GridOptimizedMarshaller)marsh).isRequireSerializable());
+            if (marsh instanceof IgniteOptimizedMarshaller)
+                assertTrue(((IgniteOptimizedMarshaller)marsh).isRequireSerializable());
             else
                 fail("Expected GridOptimizedMarshaller, but found: " + marsh.getClass().getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
index ec55cca..a807f4f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderProcessorSelfTest.java
@@ -74,7 +74,7 @@ public class GridDataLoaderProcessorSelfTest extends GridCommonAbstractTest {
 
         cfg.setIncludeProperties();
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         if (useCache) {
             GridCacheConfiguration cc = defaultCacheConfiguration();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
index 619082a..da1519c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
@@ -24,7 +24,7 @@ import java.util.concurrent.*;
  */
 public class GridGgfsFileInfoSelfTest extends GridGgfsCommonAbstractTest {
     /** Marshaller to test {@link Externalizable} interface. */
-    private final GridMarshaller marshaller = new GridOptimizedMarshaller();
+    private final GridMarshaller marshaller = new IgniteOptimizedMarshaller();
 
     /**
      * Test node info serialization.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java
index 6397cde..9a3c859 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerEvictionSelfTest.java
@@ -54,7 +54,7 @@ public class GridStreamerEvictionSelfTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 3da4159..51986a9 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
@@ -73,7 +73,7 @@ public class GridStreamerSelfTest extends GridCommonAbstractTest {
         if (p2pEnabled)
             cfg.setDeploymentMode(SHARED);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 5d3ea8f..147935f 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
@@ -102,7 +102,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
         namedCache.setAtomicityMode(TRANSACTIONAL);
         namedCache.setQueryIndexEnabled(true);
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
         cfg.setStreamerConfiguration(streamerConfiguration());
         cfg.setCacheConfiguration(new GridCacheConfiguration(), namedCache);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java
index f458745..3c8ffaa 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerPerformanceTest.java
@@ -92,7 +92,7 @@ public class GridMarshallerPerformanceTest extends GridCommonAbstractTest {
     public void testGridMarshaller() throws Exception {
         final GridTuple<byte[]> tuple = new GridTuple<>();
 
-        final GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        final IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setClassNames(Arrays.asList(TestObject.class.getName()));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java
index 2a63c73..dfab0af 100644
--- a/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/messaging/GridMessagingSelfTest.java
@@ -156,7 +156,7 @@ public class GridMessagingSelfTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        ((GridOptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false);
+        ((IgniteOptimizedMarshaller)cfg.getMarshaller()).setRequireSerializable(false);
 
         GridTcpDiscoverySpi discoSpi = new GridTcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
index d7aa2b9..4375eea 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/GridTcpSpiForwardingSelfTest.java
@@ -91,7 +91,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest {
         cfg.setDiscoverySpi(spi);
         cfg.setLocalHost("127.0.0.1");
         cfg.setRestEnabled(false);
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         GridTcpCommunicationSpi commSpi = new GridTcpCommunicationSpi() {
             @Override protected GridCommunicationClient createTcpClient(ClusterNode node) throws GridException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
index 9fafe0d..15c41c0 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java
@@ -46,7 +46,7 @@ public class GridTcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractT
         if (flag)
             cfg.setMarshaller(new IgniteJdkMarshaller());
         else
-            cfg.setMarshaller(sameMarsh ? new IgniteJdkMarshaller() : new GridOptimizedMarshaller());
+            cfg.setMarshaller(sameMarsh ? new IgniteJdkMarshaller() : new IgniteOptimizedMarshaller());
 
         // Flip flag.
         flag = !flag;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
index d9b7de8..42f9dda 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
@@ -58,7 +58,7 @@ public class GridFinishedFutureSelfTest extends GridCommonAbstractTest {
     private void testExternalizable(@Nullable Object t, @Nullable Throwable ex, boolean syncNotify) throws Exception {
         GridKernalContext ctx = ((GridKernal)grid()).context();
 
-        GridMarshaller m = new GridOptimizedMarshaller();
+        GridMarshaller m = new IgniteOptimizedMarshaller();
         ClassLoader clsLdr = getClass().getClassLoader();
 
         IgniteFuture<Object> orig = t == null ? new GridFinishedFuture<>(ctx, ex) :

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 95c9883..d9d1513 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
@@ -1166,7 +1166,7 @@ public abstract class GridAbstractTest extends TestCase {
 
                 // Remove resources cached in static, if any.
                 GridClassLoaderCache.clear();
-                GridOptimizedMarshaller.clearCache();
+                IgniteOptimizedMarshaller.clearCache();
                 GridMarshallerExclusions.clearCache();
                 GridEnumCache.clear();
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 c0755a5..e997486 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
@@ -234,7 +234,7 @@ public class GridTestResources {
             String marshallerName = GridTestProperties.getProperty("marshaller.class");
 
             if (marshallerName == null)
-                marshaller = new GridOptimizedMarshaller();
+                marshaller = new IgniteOptimizedMarshaller();
             else {
                 try {
                     Class<? extends GridMarshaller> cls = (Class<? extends GridMarshaller>)Class.forName(marshallerName);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/test/webapp/META-INF/gg-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml
index 918df61..1a9923c 100644
--- a/modules/core/src/test/webapp/META-INF/gg-config.xml
+++ b/modules/core/src/test/webapp/META-INF/gg-config.xml
@@ -45,7 +45,7 @@
             Configure optimized marshaller.
         -->
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!--
                     For better performance set this property to true in case
                     all marshalled classes implement java.io.Serializable.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 f7b0a86..df267a2 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
@@ -83,7 +83,7 @@ public class GridHadoopExternalProcessStarter {
         GridHadoopExternalCommunication comm = new GridHadoopExternalCommunication(
             args.nodeId,
             args.childProcId,
-            new GridOptimizedMarshaller(),
+            new IgniteOptimizedMarshaller(),
             log,
             msgExecSvc,
             "external"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/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 79d40ca..1b18ae7 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
@@ -45,7 +45,7 @@ public class GridHadoopExternalCommunicationSelfTest extends GridCommonAbstractT
     private void checkSimpleMessageSending(boolean useShmem) throws Exception {
         UUID parentNodeId = UUID.randomUUID();
 
-        GridMarshaller marsh = new GridOptimizedMarshaller();
+        GridMarshaller marsh = new IgniteOptimizedMarshaller();
 
         IgniteLogger log = log();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index f1e33c0..2530ca4 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -68,7 +68,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
 
         cfg.setIndexingSpi(indexing(null, true), indexing(SPI_NO_PRIMITIVES, false), indexing(SPI_COMPLEX_KEYS, false));
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         if (hasCache)
             cfg.setCacheConfiguration(cache(null, null), cache(CACHE, null), cache(EMPTY_CACHE, null),

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
index ddc2a35..94639bf 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -107,7 +107,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         // Otherwise noop swap space will be chosen on Windows.
         c.setSwapSpaceSpi(new GridFileSwapSpaceSpi());
 
-        c.setMarshaller(new GridOptimizedMarshaller(false));
+        c.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         GridCacheConfiguration[] ccs = new GridCacheConfiguration[2];
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index 11df811..1f87b7f 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@ -47,7 +47,7 @@ public class GridCacheCrossCacheQuerySelfTest extends GridCommonAbstractTest {
 
         c.setDiscoverySpi(disco);
 
-        c.setMarshaller(new GridOptimizedMarshaller(false));
+        c.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         GridH2IndexingSpi indexing = new GridH2IndexingSpi();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
index 317f259..451dec2 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
@@ -75,7 +75,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
         cfg.setDiscoverySpi(disco);
 
         cfg.setSwapSpaceSpi(new GridFileSwapSpaceSpi());
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
index 58f91df..b2355ee 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReduceQueryMultithreadedSelfTest.java
@@ -54,7 +54,7 @@ public class GridCacheReduceQueryMultithreadedSelfTest extends GridCacheAbstract
 
         c.setIndexingSpi(indexing);
 
-        c.setMarshaller(new GridOptimizedMarshaller(false));
+        c.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
index b7d6d83..25022bb 100644
--- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSwapSelfTest.java
@@ -81,7 +81,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
         cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheSwapSelfTest.class.getName(),
             CacheValue.class.getName());
 
-        cfg.setMarshaller(new GridOptimizedMarshaller(false));
+        cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;
     }


[35/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: f586cfc239e325200ff0a002cb406fd842241d92
Parents: cecd94b
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:34:04 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:34:11 2014 +0300

----------------------------------------------------------------------
 examples/config/example-cache.xml               |    2 +-
 examples/config/example-compute.xml             |    2 +-
 examples/config/example-streamer.xml            |    2 +-
 examples/config/filesystem/example-ggfs.xml     |    2 +-
 .../MemcacheRestExampleNodeStartup.java         |    2 +-
 .../examples/misc/springbean/spring-bean.xml    |    2 +-
 .../GridOptimizedMarshallerAopTest.java         |    2 +-
 .../java/org/apache/ignite/IgniteCompute.java   |    2 +-
 .../configuration/IgniteConfiguration.java      |    2 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |    2 +-
 .../ignite/marshaller/GridMarshaller.java       |    2 +-
 .../marshaller/jdk/IgniteJdkMarshaller.java     |    2 +-
 .../optimized/GridOptimizedClassDescriptor.java | 1032 ------------------
 .../optimized/GridOptimizedClassResolver.java   |  469 --------
 .../optimized/GridOptimizedFieldType.java       |   42 -
 .../optimized/GridOptimizedMarshallable.java    |   57 -
 .../optimized/GridOptimizedMarshaller.java      |  408 -------
 .../optimized/GridOptimizedMarshallerUtils.java |   28 +-
 .../GridOptimizedObjectInputStream.java         |   20 +-
 .../GridOptimizedObjectOutputStream.java        |   22 +-
 .../IgniteOptimizedClassDescriptor.java         | 1032 ++++++++++++++++++
 .../optimized/IgniteOptimizedClassResolver.java |  469 ++++++++
 .../optimized/IgniteOptimizedFieldType.java     |   42 +
 .../optimized/IgniteOptimizedMarshallable.java  |   57 +
 .../optimized/IgniteOptimizedMarshaller.java    |  408 +++++++
 .../GridClientOptimizedMarshaller.java          |   10 +-
 .../GridCacheRendezvousAffinityFunction.java    |    2 +-
 .../org/gridgain/grid/kernal/GridGainEx.java    |    6 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |    6 +-
 .../org/gridgain/grid/kernal/GridTopic.java     |   16 +-
 .../deployment/GridDeploymentLocalStore.java    |    2 +-
 .../GridDeploymentPerLoaderStore.java           |    2 +-
 .../GridDeploymentPerVersionStore.java          |    2 +-
 .../affinity/GridAffinityMessage.java           |    2 +-
 .../processors/cache/GridCacheReturn.java       |    2 +-
 .../processors/cache/GridCacheTxEntry.java      |    2 +-
 .../processors/cache/GridCacheVersion.java      |    2 +-
 .../jdbc/GridCacheQueryJdbcMetadataTask.java    |    2 +-
 .../query/jdbc/GridCacheQueryJdbcTask.java      |    2 +-
 .../streamer/GridStreamerExecutionBatch.java    |    2 +-
 modules/core/src/test/config/example-cache.xml  |    2 +-
 modules/core/src/test/config/ggfs-loopback.xml  |    2 +-
 .../core/src/test/config/ggfs-no-endpoint.xml   |    2 +-
 modules/core/src/test/config/ggfs-shmem.xml     |    2 +-
 .../src/test/config/io-manager-benchmark.xml    |    2 +-
 modules/core/src/test/config/jobs-load-base.xml |    2 +-
 .../core/src/test/config/load/dsi-load-base.xml |    2 +-
 .../src/test/config/spring-start-nodes-attr.xml |    2 +-
 .../core/src/test/config/spring-start-nodes.xml |    2 +-
 .../GridOptimizedMarshallerEnumSelfTest.java    |    3 +-
 .../GridOptimizedMarshallerSelfTest.java        |   11 +-
 .../optimized/GridOptimizedMarshallerTest.java  |   48 +-
 .../GridOptimizedObjectStreamSelfTest.java      |    5 +-
 .../grid/GridExternalizableAbstractTest.java    |    2 +-
 .../grid/ggfs/GridGgfsPathSelfTest.java         |    2 +-
 .../GridFailoverTaskWithPredicateSelfTest.java  |    2 +-
 .../kernal/GridJobMasterLeaveAwareSelfTest.java |    2 +-
 .../grid/kernal/GridJobStealingSelfTest.java    |    2 +-
 .../grid/kernal/GridLifecycleAwareSelfTest.java |    2 +-
 ...ectionLocalJobMultipleArgumentsSelfTest.java |    2 +-
 .../GridTaskExecutionContextSelfTest.java       |    2 +-
 .../managers/GridManagerStopSelfTest.java       |    2 +-
 .../cache/GridCacheAbstractSelfTest.java        |    2 +-
 .../cache/GridCacheAffinityRoutingSelfTest.java |    2 +-
 .../cache/GridCacheDeploymentSelfTest.java      |    2 +-
 .../cache/GridCacheEntryMemorySizeSelfTest.java |    2 +-
 .../cache/GridCacheMemoryModeSelfTest.java      |    2 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    2 +-
 .../GridCacheReferenceCleanupSelfTest.java      |    2 +-
 .../GridCacheAbstractJobExecutionTest.java      |    2 +-
 .../GridCachePreloadLifecycleAbstractTest.java  |    2 +-
 .../near/GridCacheNearEvictionSelfTest.java     |    2 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |    2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    2 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |    2 +-
 .../closure/GridClosureProcessorSelfTest.java   |    2 +-
 .../continuous/GridEventConsumeSelfTest.java    |    2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |    8 +-
 .../GridDataLoaderProcessorSelfTest.java        |    2 +-
 .../ggfs/GridGgfsFileInfoSelfTest.java          |    2 +-
 .../streamer/GridStreamerEvictionSelfTest.java  |    2 +-
 .../streamer/GridStreamerSelfTest.java          |    2 +-
 .../marshaller/GridMarshallerAbstractTest.java  |    2 +-
 .../GridMarshallerPerformanceTest.java          |    2 +-
 .../grid/messaging/GridMessagingSelfTest.java   |    2 +-
 .../grid/spi/GridTcpSpiForwardingSelfTest.java  |    2 +-
 ...GridTcpDiscoveryMarshallerCheckSelfTest.java |    2 +-
 .../util/future/GridFinishedFutureSelfTest.java |    2 +-
 .../testframework/junits/GridAbstractTest.java  |    2 +-
 .../testframework/junits/GridTestResources.java |    2 +-
 .../core/src/test/webapp/META-INF/gg-config.xml |    2 +-
 .../child/GridHadoopExternalProcessStarter.java |    2 +-
 ...GridHadoopExternalCommunicationSelfTest.java |    2 +-
 .../GridCacheAbstractFieldsQuerySelfTest.java   |    2 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |    2 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    2 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |    2 +-
 ...idCacheReduceQueryMultithreadedSelfTest.java |    2 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    2 +-
 .../h2/opt/GridLuceneIndexLoadTest.java         |    2 +-
 .../h2indexing/GridH2IndexingSpiLoadTest.java   |    2 +-
 .../test/resources/spring-ping-pong-partner.xml |    2 +-
 .../GridSpringBeanSerializationSelfTest.java    |    2 +-
 103 files changed, 2179 insertions(+), 2182 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index f7024c0..3e1ebcb 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -36,7 +36,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/examples/config/example-compute.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-compute.xml b/examples/config/example-compute.xml
index ffd6b04..c7bc319 100644
--- a/examples/config/example-compute.xml
+++ b/examples/config/example-compute.xml
@@ -30,7 +30,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/examples/config/example-streamer.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml
index 1c01e14..4334239 100644
--- a/examples/config/example-streamer.xml
+++ b/examples/config/example-streamer.xml
@@ -44,7 +44,7 @@
         <property name="localHost" value="127.0.0.1"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/examples/config/filesystem/example-ggfs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml
index c33c806..c038506 100644
--- a/examples/config/filesystem/example-ggfs.xml
+++ b/examples/config/filesystem/example-ggfs.xml
@@ -54,7 +54,7 @@
         <property name="peerClassLoadingEnabled" value="true"/>
 
         <property name="marshaller">
-            <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+            <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                 <property name="requireSerializable" value="false"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
index 8322759..f78c616 100644
--- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
+++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
@@ -55,7 +55,7 @@ public class MemcacheRestExampleNodeStartup {
         cfg.setDeploymentMode(SHARED);
         cfg.setPeerClassLoadingEnabled(true);
 
-        GridOptimizedMarshaller marsh = new GridOptimizedMarshaller();
+        IgniteOptimizedMarshaller marsh = new IgniteOptimizedMarshaller();
 
         marsh.setRequireSerializable(false);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml
index 23c562e..764f69e 100644
--- a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml
+++ b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml
@@ -33,7 +33,7 @@
                 <property name="peerClassLoadingEnabled" value="true"/>
 
                 <property name="marshaller">
-                    <bean class="org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller">
+                    <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
                         <!-- Set to false to allow non-serializable objects in examples, default is true. -->
                         <property name="requireSerializable" value="false"/>
                     </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java
index 80c596f..f0b4e2f 100644
--- a/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java
+++ b/modules/aop/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerAopTest.java
@@ -51,7 +51,7 @@ public class GridOptimizedMarshallerAopTest extends GridCommonAbstractTest {
     @Override protected void beforeTestsStarted() throws Exception {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setMarshaller(new GridOptimizedMarshaller());
+        cfg.setMarshaller(new IgniteOptimizedMarshaller());
 
         G.start(cfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
index 4ea1d8a..a4e26a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@ -46,7 +46,7 @@ import java.util.concurrent.*;
  * not have any alive nodes), then {@link GridEmptyProjectionException} will be thrown out of result future.
  * <h1 class="header">Serializable</h1>
  * Also note that {@link Runnable} and {@link Callable} implementations must support serialization as required
- * by the configured marshaller. For example, {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} requires {@link Serializable}
+ * by the configured marshaller. For example, {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} requires {@link Serializable}
  * objects by default, but can be configured not to. Generally speaking objects that implement {@link Serializable}
  * or {@link Externalizable} will perform better. For {@link Runnable} and {@link Callable} interfaces
  * GridGain provides analogous {@link org.apache.ignite.lang.IgniteRunnable} and {@link org.apache.ignite.lang.IgniteCallable} classes which are

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index b733597..a6f0d33 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -1454,7 +1454,7 @@ public class IgniteConfiguration {
 
     /**
      * Should return an instance of marshaller to use in grid. If not provided,
-     * {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} will be used on Java HotSpot VM, and
+     * {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} will be used on Java HotSpot VM, and
      * {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller} will be used on other VMs.
      *
      * @return Marshaller to use in grid.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
index 5f02da9..c2ca8f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteUuid.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.*;
  * internal UUID.
  */
 public final class IgniteUuid implements Comparable<IgniteUuid>, Iterable<IgniteUuid>, Cloneable, Externalizable,
-    GridOptimizedMarshallable {
+    IgniteOptimizedMarshallable {
     /** */
     private static final long serialVersionUID = 0L;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
index df3d0d6..1656571 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/GridMarshaller.java
@@ -21,7 +21,7 @@ import java.io.*;
  * <p>
  * Gridgain provides the following {@code GridMarshaller} implementations:
  * <ul>
- * <li>{@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller} - default</li>
+ * <li>{@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} - default</li>
  * <li>{@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller}</li>
  * </ul>
  * <p>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
index 3ed5b6c..4c02c3c 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/jdk/IgniteJdkMarshaller.java
@@ -23,7 +23,7 @@ import java.io.*;
  * <h2 class="header">Mandatory</h2>
  * This marshaller has no mandatory configuration parameters.
  * <h2 class="header">Java Example</h2>
- * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.GridOptimizedMarshaller}.
+ * {@code GridJdkMarshaller} needs to be explicitly configured to override default {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller}.
  * <pre name="code" class="java">
  * GridJdkMarshaller marshaller = new GridJdkMarshaller();
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassDescriptor.java
deleted file mode 100644
index 6384e3b..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassDescriptor.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.*;
-
-import static java.lang.reflect.Modifier.*;
-
-/**
- * Class descriptor.
- */
-class GridOptimizedClassDescriptor {
-    /** Unsafe. */
-    private static final Unsafe UNSAFE = GridUnsafe.unsafe();
-
-    /** */
-    private static final int TYPE_BYTE = 1;
-
-    /** */
-    private static final int TYPE_SHORT = 2;
-
-    /** */
-    private static final int TYPE_INT = 3;
-
-    /** */
-    private static final int TYPE_LONG = 4;
-
-    /** */
-    private static final int TYPE_FLOAT = 5;
-
-    /** */
-    private static final int TYPE_DOUBLE = 6;
-
-    /** */
-    private static final int TYPE_CHAR = 7;
-
-    /** */
-    private static final int TYPE_BOOLEAN = 8;
-
-    /** */
-    private static final int TYPE_BYTE_ARR = 9;
-
-    /** */
-    private static final int TYPE_SHORT_ARR = 10;
-
-    /** */
-    private static final int TYPE_INT_ARR = 11;
-
-    /** */
-    private static final int TYPE_LONG_ARR = 12;
-
-    /** */
-    private static final int TYPE_FLOAT_ARR = 13;
-
-    /** */
-    private static final int TYPE_DOUBLE_ARR = 14;
-
-    /** */
-    private static final int TYPE_CHAR_ARR = 15;
-
-    /** */
-    private static final int TYPE_BOOLEAN_ARR = 16;
-
-    /** */
-    private static final int TYPE_OBJ_ARR = 17;
-
-    /** */
-    private static final int TYPE_STR = 18;
-
-    /** */
-    private static final int TYPE_ENUM = 19;
-
-    /** */
-    private static final int TYPE_UUID = 20;
-
-    /** */
-    private static final int TYPE_PROPS = 21;
-
-    /** */
-    private static final int TYPE_ARRAY_LIST = 22;
-
-    /** */
-    private static final int TYPE_HASH_MAP = 23;
-
-    /** */
-    private static final int TYPE_HASH_SET = 24;
-
-    /** */
-    private static final int TYPE_LINKED_LIST = 25;
-
-    /** */
-    private static final int TYPE_LINKED_HASH_MAP = 26;
-
-    /** */
-    private static final int TYPE_LINKED_HASH_SET = 27;
-
-    /** */
-    private static final int TYPE_DATE = 28;
-
-    /** */
-    private static final int TYPE_CLS = 29;
-
-    /** */
-    private static final int TYPE_EXTERNALIZABLE = 50;
-
-    /** */
-    private static final int TYPE_SERIALIZABLE = 51;
-
-    /** Class. */
-    private Class<?> cls;
-
-    /** Header. */
-    private Integer hdr;
-
-    /** ID. */
-    private Integer id;
-
-    /** Short ID. */
-    private Short shortId;
-
-    /** Class name. */
-    private String name;
-
-    /** Class type. */
-    private int type;
-
-    /** Primitive flag. */
-    private boolean isPrimitive;
-
-    /** Enum flag. */
-    private boolean isEnum;
-
-    /** Serializable flag. */
-    private boolean isSerial;
-
-    /** Excluded flag. */
-    private final boolean excluded;
-
-    /** {@code True} if descriptor is for {@link Class}. */
-    private boolean isCls;
-
-    /** Array component type. */
-    private Class<?> arrCompType;
-
-    /** Enumeration values. */
-    private Object[] enumVals;
-
-    /** Constructor. */
-    private Constructor<?> constructor;
-
-    /** Fields. */
-    private Fields fields;
-
-    /** {@code writeObject} methods. */
-    private List<Method> writeObjMtds;
-
-    /** {@code writeReplace} method. */
-    private Method writeReplaceMtd;
-
-    /** {@code readObject} methods. */
-    private List<Method> readObjMtds;
-
-    /** {@code readResolve} method. */
-    private Method readResolveMtd;
-
-    /** Defaults field offset. */
-    private long dfltsFieldOff;
-
-    /** Load factor field offset. */
-    private long loadFactorFieldOff;
-
-    /** Map field offset. */
-    private long mapFieldOff;
-
-    /** Access order field offset. */
-    private long accessOrderFieldOff;
-
-    /**
-     * Creates descriptor for class.
-     *
-     * @param cls Class.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings({"ForLoopReplaceableByForEach", "MapReplaceableByEnumMap"})
-    GridOptimizedClassDescriptor(Class<?> cls) throws IOException {
-        this.cls = cls;
-
-        excluded = GridMarshallerExclusions.isExcluded(cls);
-
-        T2<Integer, Integer> t = GridOptimizedClassResolver.writeClassData(cls);
-
-        hdr = t.get1();
-        id = t.get2();
-        name = cls.getName();
-
-        if (!excluded) {
-            Class<?> parent;
-
-            if (cls == byte.class || cls == Byte.class) {
-                type = TYPE_BYTE;
-
-                isPrimitive = true;
-            }
-            else if (cls == short.class || cls == Short.class) {
-                type = TYPE_SHORT;
-
-                isPrimitive = true;
-            }
-            else if (cls == int.class || cls == Integer.class) {
-                type = TYPE_INT;
-
-                isPrimitive = true;
-            }
-            else if (cls == long.class || cls == Long.class) {
-                type = TYPE_LONG;
-
-                isPrimitive = true;
-            }
-            else if (cls == float.class || cls == Float.class) {
-                type = TYPE_FLOAT;
-
-                isPrimitive = true;
-            }
-            else if (cls == double.class || cls == Double.class) {
-                type = TYPE_DOUBLE;
-
-                isPrimitive = true;
-            }
-            else if (cls == char.class || cls == Character.class) {
-                type = TYPE_CHAR;
-
-                isPrimitive = true;
-            }
-            else if (cls == boolean.class || cls == Boolean.class) {
-                type = TYPE_BOOLEAN;
-
-                isPrimitive = true;
-            }
-            else if (cls == byte[].class)
-                type = TYPE_BYTE_ARR;
-            else if (cls == short[].class)
-                type = TYPE_SHORT_ARR;
-            else if (cls == int[].class)
-                type = TYPE_INT_ARR;
-            else if (cls == long[].class)
-                type = TYPE_LONG_ARR;
-            else if (cls == float[].class)
-                type = TYPE_FLOAT_ARR;
-            else if (cls == double[].class)
-                type = TYPE_DOUBLE_ARR;
-            else if (cls == char[].class)
-                type = TYPE_CHAR_ARR;
-            else if (cls == boolean[].class)
-                type = TYPE_BOOLEAN_ARR;
-            else if (cls.isArray()) {
-                type = TYPE_OBJ_ARR;
-
-                arrCompType = cls.getComponentType();
-            }
-            else if (cls == String.class)
-                type = TYPE_STR;
-            else if (cls.isEnum()) {
-                type = TYPE_ENUM;
-
-                isEnum = true;
-                enumVals = cls.getEnumConstants();
-            }
-            // Support for enum constants, based on anonymous children classes.
-            else if ((parent = cls.getSuperclass()) != null && parent.isEnum()) {
-                type = TYPE_ENUM;
-
-                isEnum = true;
-                enumVals = parent.getEnumConstants();
-            }
-            else if (cls == UUID.class)
-                type = TYPE_UUID;
-            else if (cls == Properties.class) {
-                type = TYPE_PROPS;
-
-                try {
-                    dfltsFieldOff = UNSAFE.objectFieldOffset(Properties.class.getDeclaredField("defaults"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == ArrayList.class)
-                type = TYPE_ARRAY_LIST;
-            else if (cls == HashMap.class) {
-                type = TYPE_HASH_MAP;
-
-                try {
-                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == HashSet.class) {
-                type = TYPE_HASH_SET;
-
-                try {
-                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
-                    mapFieldOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == LinkedList.class)
-                type = TYPE_LINKED_LIST;
-            else if (cls == LinkedHashMap.class) {
-                type = TYPE_LINKED_HASH_MAP;
-
-                try {
-                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
-                    accessOrderFieldOff = UNSAFE.objectFieldOffset(LinkedHashMap.class.getDeclaredField("accessOrder"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == LinkedHashSet.class) {
-                type = TYPE_LINKED_HASH_SET;
-
-                try {
-                    loadFactorFieldOff = UNSAFE.objectFieldOffset(HashMap.class.getDeclaredField("loadFactor"));
-                    mapFieldOff = UNSAFE.objectFieldOffset(HashSet.class.getDeclaredField("map"));
-                }
-                catch (NoSuchFieldException e) {
-                    throw new IOException(e);
-                }
-            }
-            else if (cls == Date.class)
-                type = TYPE_DATE;
-            else if (cls == Class.class) {
-                type = TYPE_CLS;
-
-                isCls = true;
-            }
-            else {
-                Class<?> c = cls;
-
-                while ((writeReplaceMtd == null || readResolveMtd == null) && c != null && !c.equals(Object.class)) {
-                    if (writeReplaceMtd == null) {
-                        try {
-                            writeReplaceMtd = c.getDeclaredMethod("writeReplace");
-
-                            if (!isStatic(writeReplaceMtd.getModifiers()) &&
-                                !(isPrivate(writeReplaceMtd.getModifiers()) && c != cls) &&
-                                writeReplaceMtd.getReturnType().equals(Object.class))
-                                writeReplaceMtd.setAccessible(true);
-                            else
-                                // Set method back to null if it has incorrect signature.
-                                writeReplaceMtd = null;
-                        }
-                        catch (NoSuchMethodException ignored) {
-                            // No-op.
-                        }
-                    }
-
-                    if (readResolveMtd == null) {
-                        try {
-                            readResolveMtd = c.getDeclaredMethod("readResolve");
-
-                            if (!isStatic(readResolveMtd.getModifiers()) &&
-                                !(isPrivate(readResolveMtd.getModifiers()) && c != cls) &&
-                                readResolveMtd.getReturnType().equals(Object.class))
-                                readResolveMtd.setAccessible(true);
-                            else
-                                // Set method back to null if it has incorrect signature.
-                                readResolveMtd = null;
-                        }
-                        catch (NoSuchMethodException ignored) {
-                            // No-op.
-                        }
-                    }
-
-                    c = c.getSuperclass();
-                }
-
-                if (Externalizable.class.isAssignableFrom(cls)) {
-                    type = TYPE_EXTERNALIZABLE;
-
-                    try {
-                        constructor = cls.getDeclaredConstructor();
-
-                        constructor.setAccessible(true);
-                    }
-                    catch (NoSuchMethodException e) {
-                        throw new IOException("Externalizable class doesn't have default constructor: " + cls, e);
-                    }
-                }
-                else {
-                    type = TYPE_SERIALIZABLE;
-
-                    isSerial = Serializable.class.isAssignableFrom(cls);
-
-                    writeObjMtds = new ArrayList<>();
-                    readObjMtds = new ArrayList<>();
-                    List<List<Field>> fields = new ArrayList<>();
-                    List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs = new ArrayList<>();
-                    List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps = new ArrayList<>();
-                    List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists = new ArrayList<>();
-
-                    for (c = cls; c != null && !c.equals(Object.class); c = c.getSuperclass()) {
-                        Method mtd;
-
-                        try {
-                            mtd = c.getDeclaredMethod("writeObject", ObjectOutputStream.class);
-
-                            int mod = mtd.getModifiers();
-
-                            if (!isStatic(mod) && isPrivate(mod) && mtd.getReturnType() == Void.TYPE)
-                                mtd.setAccessible(true);
-                            else
-                                // Set method back to null if it has incorrect signature.
-                                mtd = null;
-                        }
-                        catch (NoSuchMethodException ignored) {
-                            mtd = null;
-                        }
-
-                        writeObjMtds.add(mtd);
-
-                        try {
-                            mtd = c.getDeclaredMethod("readObject", ObjectInputStream.class);
-
-                            int mod = mtd.getModifiers();
-
-                            if (!isStatic(mod) && isPrivate(mod) && mtd.getReturnType() == Void.TYPE)
-                                mtd.setAccessible(true);
-                            else
-                                // Set method back to null if it has incorrect signature.
-                                mtd = null;
-                        }
-                        catch (NoSuchMethodException ignored) {
-                            mtd = null;
-                        }
-
-                        readObjMtds.add(mtd);
-
-                        Field[] clsFields0 = c.getDeclaredFields();
-
-                        Arrays.sort(clsFields0, new Comparator<Field>() {
-                            @Override public int compare(Field f1, Field f2) {
-                                return f1.getName().compareTo(f2.getName());
-                            }
-                        });
-
-                        List<Field> clsFields = new ArrayList<>(clsFields0.length);
-                        List<T2<GridOptimizedFieldType, Long>> clsFieldOffs =
-                            new ArrayList<>(clsFields0.length);
-
-                        for (int i = 0; i < clsFields0.length; i++) {
-                            Field f = clsFields0[i];
-
-                            int mod = f.getModifiers();
-
-                            if (!isStatic(mod) && !isTransient(mod)) {
-                                GridOptimizedFieldType type = fieldType(f.getType());
-
-                                clsFields.add(f);
-                                clsFieldOffs.add(new T2<>(type, UNSAFE.objectFieldOffset(f)));
-                            }
-                        }
-
-                        fields.add(clsFields);
-                        fieldOffs.add(clsFieldOffs);
-
-                        Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap = null;
-
-                        try {
-                            Field serFieldsDesc = c.getDeclaredField("serialPersistentFields");
-
-                            int mod = serFieldsDesc.getModifiers();
-
-                            if (serFieldsDesc.getType() == ObjectStreamField[].class &&
-                                isPrivate(mod) && isStatic(mod) && isFinal(mod)) {
-                                serFieldsDesc.setAccessible(true);
-
-                                ObjectStreamField[] serFields = (ObjectStreamField[])serFieldsDesc.get(null);
-
-                                fieldInfoMap = new HashMap<>();
-
-                                for (int i = 0; i < serFields.length; i++) {
-                                    ObjectStreamField serField = serFields[i];
-
-                                    fieldInfoMap.put(serField.getName(), F.t(i, fieldType(serField.getType())));
-                                }
-                            }
-                        }
-                        catch (NoSuchFieldException ignored) {
-                            // No-op.
-                        }
-                        catch (IllegalAccessException e) {
-                            throw new IOException("Failed to get value of 'serialPersistentFields' field in class: " +
-                                cls.getName(), e);
-                        }
-
-                        if (fieldInfoMap == null) {
-                            fieldInfoMap = new HashMap<>();
-
-                            for (int i = 0; i < clsFields.size(); i++) {
-                                Field f = clsFields.get(i);
-
-                                fieldInfoMap.put(f.getName(), F.t(i, fieldType(f.getType())));
-                            }
-                        }
-
-                        fieldInfoMaps.add(fieldInfoMap);
-
-                        List<IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoList =
-                            new ArrayList<>(fieldInfoMap.values());
-
-                        Collections.sort(fieldInfoList, new Comparator<IgniteBiTuple<Integer, GridOptimizedFieldType>>() {
-                            @Override public int compare(IgniteBiTuple<Integer, GridOptimizedFieldType> t1,
-                                IgniteBiTuple<Integer, GridOptimizedFieldType> t2) {
-                                return t1.get1().compareTo(t2.get1());
-                            }
-                        });
-
-                        fieldInfoLists.add(fieldInfoList);
-                    }
-
-                    Collections.reverse(writeObjMtds);
-                    Collections.reverse(readObjMtds);
-                    Collections.reverse(fields);
-                    Collections.reverse(fieldOffs);
-                    Collections.reverse(fieldInfoMaps);
-                    Collections.reverse(fieldInfoLists);
-
-                    this.fields = new Fields(fields, fieldOffs, fieldInfoLists, fieldInfoMaps);
-                }
-            }
-        }
-
-        shortId = GridOptimizedMarshallerUtils.computeSerialVersionUid(cls, fields != null ? fields.ownFields() : null).shortValue();
-    }
-
-    /**
-     * @return Excluded flag.
-     */
-    boolean excluded() {
-        return excluded;
-    }
-
-    /**
-     * @return Class.
-     */
-    Class<?> describedClass() {
-        return cls;
-    }
-
-    /**
-     * @return Header.
-     */
-    Integer header() {
-        return hdr;
-    }
-
-    /**
-     * @return ID.
-     */
-    Integer id() {
-        return id;
-    }
-
-    /**
-     * @return Short ID.
-     */
-    Short shortId() {
-        return shortId;
-    }
-
-    /**
-     * @return Class name.
-     */
-    String name() {
-        return name;
-    }
-
-    /**
-     * @return Array component type.
-     */
-    Class<?> componentType() {
-        return arrCompType;
-    }
-
-    /**
-     * @return Primitive flag.
-     */
-    boolean isPrimitive() {
-        return isPrimitive;
-    }
-
-    /**
-     * @return Enum flag.
-     */
-    boolean isEnum() {
-        return isEnum;
-    }
-
-    /**
-     * @return {@code True} if descriptor is for {@link Class}.
-     */
-    boolean isClass() {
-        return isCls;
-    }
-
-    /**
-     * Replaces object.
-     *
-     * @param obj Object.
-     * @return Replaced object or {@code null} if there is no {@code writeReplace} method.
-     * @throws IOException In case of error.
-     */
-    Object replace(Object obj) throws IOException {
-        if (writeReplaceMtd != null) {
-            try {
-                return writeReplaceMtd.invoke(obj);
-            }
-            catch (IllegalAccessException | InvocationTargetException e) {
-                throw new IOException(e);
-            }
-        }
-
-        return obj;
-    }
-
-    /**
-     * Writes object to stream.
-     *
-     * @param out Output stream.
-     * @param obj Object.
-     * @throws IOException In case of error.
-     */
-    @SuppressWarnings("ForLoopReplaceableByForEach")
-    void write(GridOptimizedObjectOutputStream out, Object obj) throws IOException {
-        switch (type) {
-            case TYPE_BYTE:
-                out.writeByte((Byte)obj);
-
-                break;
-
-            case TYPE_SHORT:
-                out.writeShort((Short)obj);
-
-                break;
-
-            case TYPE_INT:
-                out.writeInt((Integer)obj);
-
-                break;
-
-            case TYPE_LONG:
-                out.writeLong((Long)obj);
-
-                break;
-
-            case TYPE_FLOAT:
-                out.writeFloat((Float)obj);
-
-                break;
-
-            case TYPE_DOUBLE:
-                out.writeDouble((Double)obj);
-
-                break;
-
-            case TYPE_CHAR:
-                out.writeChar((Character)obj);
-
-                break;
-
-            case TYPE_BOOLEAN:
-                out.writeBoolean((Boolean)obj);
-
-                break;
-
-            case TYPE_BYTE_ARR:
-                out.writeByteArray((byte[])obj);
-
-                break;
-
-            case TYPE_SHORT_ARR:
-                out.writeShortArray((short[])obj);
-
-                break;
-
-            case TYPE_INT_ARR:
-                out.writeIntArray((int[])obj);
-
-                break;
-
-            case TYPE_LONG_ARR:
-                out.writeLongArray((long[])obj);
-
-                break;
-
-            case TYPE_FLOAT_ARR:
-                out.writeFloatArray((float[])obj);
-
-                break;
-
-            case TYPE_DOUBLE_ARR:
-                out.writeDoubleArray((double[])obj);
-
-                break;
-
-            case TYPE_CHAR_ARR:
-                out.writeCharArray((char[])obj);
-
-                break;
-
-            case TYPE_BOOLEAN_ARR:
-                out.writeBooleanArray((boolean[])obj);
-
-                break;
-
-            case TYPE_OBJ_ARR:
-                out.writeArray((Object[])obj);
-
-                break;
-
-            case TYPE_STR:
-                out.writeString((String)obj);
-
-                break;
-
-            case TYPE_ENUM:
-                out.writeInt(((Enum)obj).ordinal());
-
-                break;
-
-            case TYPE_UUID:
-                out.writeUuid((UUID)obj);
-
-                break;
-
-            case TYPE_PROPS:
-                out.writeProperties((Properties)obj, dfltsFieldOff);
-
-                break;
-
-            case TYPE_ARRAY_LIST:
-                out.writeArrayList((ArrayList<?>)obj);
-
-                break;
-
-            case TYPE_HASH_MAP:
-                out.writeHashMap((HashMap<?, ?>)obj, loadFactorFieldOff, false);
-
-                break;
-
-            case TYPE_HASH_SET:
-                out.writeHashSet((HashSet<?>)obj, mapFieldOff, loadFactorFieldOff);
-
-                break;
-
-            case TYPE_LINKED_LIST:
-                out.writeLinkedList((LinkedList<?>)obj);
-
-                break;
-
-            case TYPE_LINKED_HASH_MAP:
-                out.writeLinkedHashMap((LinkedHashMap<?, ?>)obj, loadFactorFieldOff, accessOrderFieldOff, false);
-
-                break;
-
-            case TYPE_LINKED_HASH_SET:
-                out.writeLinkedHashSet((LinkedHashSet<?>)obj, mapFieldOff, loadFactorFieldOff);
-
-                break;
-
-            case TYPE_DATE:
-                out.writeDate((Date)obj);
-
-                break;
-
-            case TYPE_CLS:
-                GridOptimizedClassResolver.writeClass(out, GridOptimizedMarshallerUtils.classDescriptor((Class<?>) obj, obj));
-
-                break;
-
-            case TYPE_EXTERNALIZABLE:
-                out.writeExternalizable(obj);
-
-                break;
-
-            case TYPE_SERIALIZABLE:
-                if (out.requireSerializable() && !isSerial)
-                    throw new NotSerializableException("Must implement java.io.Serializable or " +
-                        "set GridOptimizedMarshaller.setRequireSerializable() to false " +
-                        "(note that performance may degrade if object is not Serializable): " + name);
-
-                out.writeSerializable(obj, writeObjMtds, fields);
-
-                break;
-
-            default:
-                throw new IllegalStateException("Invalid class type: " + type);
-        }
-    }
-
-    /**
-     * Reads object from stream.
-     *
-     * @param in Input stream.
-     * @return Object.
-     * @throws ClassNotFoundException If class not found.
-     * @throws IOException In case of error.
-     */
-    Object read(GridOptimizedObjectInputStream in) throws ClassNotFoundException, IOException {
-        switch (type) {
-            case TYPE_BYTE:
-                return in.readByte();
-
-            case TYPE_SHORT:
-                return in.readShort();
-
-            case TYPE_INT:
-                return in.readInt();
-
-            case TYPE_LONG:
-                return in.readLong();
-
-            case TYPE_FLOAT:
-                return in.readFloat();
-
-            case TYPE_DOUBLE:
-                return in.readDouble();
-
-            case TYPE_CHAR:
-                return in.readChar();
-
-            case TYPE_BOOLEAN:
-                return in.readBoolean();
-
-            case TYPE_BYTE_ARR:
-                return in.readByteArray();
-
-            case TYPE_SHORT_ARR:
-                return in.readShortArray();
-
-            case TYPE_INT_ARR:
-                return in.readIntArray();
-
-            case TYPE_LONG_ARR:
-                return in.readLongArray();
-
-            case TYPE_FLOAT_ARR:
-                return in.readFloatArray();
-
-            case TYPE_DOUBLE_ARR:
-                return in.readDoubleArray();
-
-            case TYPE_CHAR_ARR:
-                return in.readCharArray();
-
-            case TYPE_BOOLEAN_ARR:
-                return in.readBooleanArray();
-
-            case TYPE_OBJ_ARR:
-                return in.readArray(arrCompType);
-
-            case TYPE_STR:
-                return in.readString();
-
-            case TYPE_ENUM:
-                return enumVals[in.readInt()];
-
-            case TYPE_UUID:
-                return in.readUuid();
-
-            case TYPE_PROPS:
-                return in.readProperties();
-
-            case TYPE_ARRAY_LIST:
-                return in.readArrayList();
-
-            case TYPE_HASH_MAP:
-                return in.readHashMap(false);
-
-            case TYPE_HASH_SET:
-                return in.readHashSet(mapFieldOff);
-
-            case TYPE_LINKED_LIST:
-                return in.readLinkedList();
-
-            case TYPE_LINKED_HASH_MAP:
-                return in.readLinkedHashMap(false);
-
-            case TYPE_LINKED_HASH_SET:
-                return in.readLinkedHashSet(mapFieldOff);
-
-            case TYPE_DATE:
-                return in.readDate();
-
-            case TYPE_CLS:
-                return GridOptimizedClassResolver.readClass(in, in.classLoader()).describedClass();
-
-            case TYPE_EXTERNALIZABLE:
-                return in.readExternalizable(constructor, readResolveMtd);
-
-            case TYPE_SERIALIZABLE:
-                return in.readSerializable(cls, readObjMtds, readResolveMtd, fields);
-
-            default:
-                throw new IllegalStateException("Invalid class type: " + type);
-        }
-    }
-
-    /**
-     * @param cls Class.
-     * @return Type.
-     */
-    @SuppressWarnings("IfMayBeConditional")
-    private GridOptimizedFieldType fieldType(Class<?> cls) {
-        GridOptimizedFieldType type;
-
-        if (cls == byte.class)
-            type = GridOptimizedFieldType.BYTE;
-        else if (cls == short.class)
-            type = GridOptimizedFieldType.SHORT;
-        else if (cls == int.class)
-            type = GridOptimizedFieldType.INT;
-        else if (cls == long.class)
-            type = GridOptimizedFieldType.LONG;
-        else if (cls == float.class)
-            type = GridOptimizedFieldType.FLOAT;
-        else if (cls == double.class)
-            type = GridOptimizedFieldType.DOUBLE;
-        else if (cls == char.class)
-            type = GridOptimizedFieldType.CHAR;
-        else if (cls == boolean.class)
-            type = GridOptimizedFieldType.BOOLEAN;
-        else
-            type = GridOptimizedFieldType.OTHER;
-
-        return type;
-    }
-
-    /**
-     * Encapsulates data about class fields.
-     */
-    @SuppressWarnings("PackageVisibleInnerClass")
-    static class Fields {
-        /** Fields. */
-        private final List<List<Field>> fields;
-
-        /** Fields offsets. */
-        private final List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs;
-
-        /** Fields details lists. */
-        private final List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists;
-
-        /** Fields details maps. */
-        private final List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps;
-
-        /**
-         * Creates new instance.
-         *
-         * @param fields Fields.
-         * @param fieldOffs Field offsets.
-         * @param fieldInfoLists List of field details sequences for each type in the object's class hierarchy.
-         * @param fieldInfoMaps List of field details maps for each type in the object's class hierarchy.
-         */
-        Fields(List<List<Field>> fields, List<List<T2<GridOptimizedFieldType, Long>>> fieldOffs,
-            List<List<IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoLists,
-            List<Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>>> fieldInfoMaps) {
-            this.fields = fields;
-            this.fieldOffs = fieldOffs;
-            this.fieldInfoLists = fieldInfoLists;
-            this.fieldInfoMaps = fieldInfoMaps;
-        }
-
-        /**
-         * Returns class's own fields (excluding inherited).
-         *
-         * @return List of fields or {@code null} if fields list is empty.
-         */
-        List<Field> ownFields() {
-            return fields.isEmpty() ? null : fields.get(fields.size() - 1);
-        }
-
-        /**
-         * Returns field types and their offsets.
-         *
-         * @param i hierarchy level where 0 corresponds to top level.
-         * @return list of pairs where first value is field type and second value is its offset.
-         */
-        List<T2<GridOptimizedFieldType, Long>> fieldOffs(int i) {
-            return fieldOffs.get(i);
-        }
-
-        /**
-         * Returns field sequence numbers and their types as list.
-         *
-         * @param i hierarchy level where 0 corresponds to top level.
-         * @return list of pairs (field number, field type) for the given hierarchy level.
-         */
-        List<IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoList(int i) {
-            return fieldInfoLists.get(i);
-        }
-
-        /**
-         * Returns field sequence numbers and their types as map where key is a field name,
-         *
-         * @param i hierarchy level where 0 corresponds to top level.
-         * @return map of field names and their details.
-         */
-        Map<String, IgniteBiTuple<Integer, GridOptimizedFieldType>> fieldInfoMap(int i) {
-            return fieldInfoMaps.get(i);
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassResolver.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassResolver.java
deleted file mode 100644
index 7b21ebe..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedClassResolver.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-import org.apache.ignite.lang.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jdk8.backport.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.Date;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Resolves class names by serialVersionUID.
- */
-@SuppressWarnings({"UnnecessaryFullyQualifiedName", "unchecked"})
-class GridOptimizedClassResolver {
-    /** File name to generate. */
-    private static final String FILE_NAME = "optimized-classnames.properties";
-
-    /** */
-    private static final Map<String, Integer> ggxName2id = new HashMap<>();
-
-    /** */
-    private static final T2<Class<?>, GridOptimizedClassDescriptor>[] ggxId2name;
-
-    /** */
-    private static final Map<String, Integer> ggName2id = new HashMap<>();
-
-    /** */
-    private static final T3<String, Class<?>, GridOptimizedClassDescriptor>[] ggId2name;
-
-    /** */
-    private static Map<String, Integer> usrName2Id;
-
-    /** */
-    private static T3<String, Class<?>, GridOptimizedClassDescriptor>[] usrId2Name;
-
-    /** */
-    private static final int HEADER_NAME = 255;
-
-    /** */
-    private static final int HEADER_GG_NAME = 254;
-
-    /** */
-    private static final int HEADER_USER_NAME = 253;
-
-    /** */
-    private static final int HEADER_ARRAY = 252;
-
-    /**
-     * Initialize predefined classes to optimize.
-     */
-    static {
-        Class[] superOptCls = new Class[] {
-            // Array types.
-            byte[].class,
-            short[].class,
-            int[].class,
-            long[].class,
-            float[].class,
-            double[].class,
-            boolean[].class,
-            char[].class,
-
-            // Boxed types.
-            Byte.class,
-            Short.class,
-            Integer.class,
-            Long.class,
-            Float.class,
-            Double.class,
-            Boolean.class,
-            Character.class,
-            String.class,
-
-            // Atomic.
-            AtomicBoolean.class,AtomicInteger.class,
-            AtomicLong.class,AtomicReference.class,
-            AtomicMarkableReference.class,
-            AtomicStampedReference.class,
-            AtomicIntegerArray.class,
-            AtomicReferenceArray.class,
-
-            // Concurrent types.
-            ConcurrentHashMap.class,
-            ConcurrentLinkedQueue.class,
-            ConcurrentSkipListMap.class,
-            ConcurrentSkipListSet.class,
-            LinkedBlockingDeque.class,
-            LinkedBlockingQueue.class,
-            PriorityBlockingQueue.class,
-            CopyOnWriteArrayList.class,
-            CopyOnWriteArraySet.class,
-
-            // Locks.
-            ReentrantLock.class,
-            ReentrantReadWriteLock.class,
-            ReentrantReadWriteLock.ReadLock.class,
-            ReentrantReadWriteLock.WriteLock.class,
-
-            // Util types.
-            Date.class,
-            UUID.class,
-            Calendar.class,
-            Random.class,
-            Calendar.class,
-            Currency.class,
-            ArrayList.class,
-            LinkedList.class,
-            Stack.class,
-            Vector.class,
-            HashMap.class,
-            HashSet.class,
-            Hashtable.class,
-            TreeMap.class,
-            TreeSet.class,
-            IdentityHashMap.class,
-            LinkedHashMap.class,
-            LinkedHashSet.class,
-            ArrayDeque.class,
-            BitSet.class,
-            EnumMap.class,
-            EnumSet.class,
-
-            // SQL types.
-            java.sql.Date.class,
-            Time.class,
-            Timestamp.class,
-
-            // Math types.
-            BigDecimal.class,
-            BigInteger.class,
-
-            // GridGain types.
-            IgniteUuid.class,
-            GridBoundedConcurrentOrderedSet.class,
-            GridBoundedLinkedHashSet.class,
-            GridConcurrentHashSet.class,
-            ConcurrentLinkedDeque8.class,
-            GridConcurrentPhantomHashSet.class,
-            GridConcurrentSkipListSet.class,
-            GridConcurrentWeakHashSet.class,
-            GridIdentityHashSet.class,
-            GridLeanSet.class,
-            GridSetWrapper.class
-        };
-
-        // Have to leave a range for special purposes.
-        assert superOptCls.length < 230;
-
-        ggxId2name = new T2[superOptCls.length];
-
-        for (int i = 0; i < superOptCls.length; i++) {
-            Class cls = superOptCls[i];
-
-            ggxName2id.put(cls.getName(), i);
-            ggxId2name[i] = new T2<Class<?>, GridOptimizedClassDescriptor>(cls, null);
-        }
-
-        BufferedReader reader = new BufferedReader(new InputStreamReader(
-            GridOptimizedClassResolver.class.getResourceAsStream(FILE_NAME),
-            GridOptimizedMarshallerUtils.UTF_8));
-
-        List<T3<String, Class<?>, GridOptimizedClassDescriptor>> ggId2name0 =
-            new LinkedList<>();
-
-        try {
-            for (int i = 0; ; i++) {
-                String clsName = reader.readLine();
-
-                if (clsName == null)
-                    break;
-
-                ggName2id.put(clsName, i);
-                ggId2name0.add(new T3<String, Class<?>, GridOptimizedClassDescriptor>(clsName, null, null));
-            }
-
-            ggId2name = ggId2name0.toArray(new T3[ggId2name0.size()]);
-        }
-        catch (IOException e) {
-            throw new AssertionError(e);
-        }
-        finally {
-            U.close(reader, null);
-        }
-    }
-
-    /**
-     * Ensure singleton.
-     */
-    private GridOptimizedClassResolver() {
-        // No-op.
-    }
-
-    /**
-     * @param usrName2id0 From name to ID.
-     * @param usrId2Name0 From ID to name.
-     */
-    static void userClasses(@Nullable Map<String, Integer> usrName2id0,
-        @Nullable T3<String, Class<?>, GridOptimizedClassDescriptor>[] usrId2Name0) {
-        usrName2Id = usrName2id0;
-        usrId2Name = usrId2Name0;
-    }
-
-    /**
-     * @param in DataInput to read from.
-     * @param clsLdr ClassLoader.
-     * @return Class descriptor.
-     * @throws IOException If serial version UID failed.
-     * @throws ClassNotFoundException If the class cannot be located by the specified class loader.
-     */
-    static GridOptimizedClassDescriptor readClass(DataInput in, ClassLoader clsLdr)
-        throws IOException, ClassNotFoundException {
-        assert in != null;
-        assert clsLdr != null;
-
-        int hdr = in.readByte() & 0xff;
-
-        if (hdr < ggxId2name.length) {
-            T2<Class<?>, GridOptimizedClassDescriptor> ggxT = ggxId2name[hdr];
-
-            GridOptimizedClassDescriptor desc = ggxT.get2();
-
-            if (desc == null) {
-                desc = GridOptimizedMarshallerUtils.classDescriptor(ggxT.get1(), null);
-
-                ggxT.set2(desc);
-            }
-
-            return desc;
-        }
-
-        String name;
-        Class<?> cls;
-        GridOptimizedClassDescriptor desc;
-
-        switch (hdr) {
-            case HEADER_GG_NAME:
-                int ggId = in.readInt();
-
-                T3<String, Class<?>, GridOptimizedClassDescriptor> ggT;
-
-                try {
-                    ggT = ggId2name[ggId];
-                }
-                catch (ArrayIndexOutOfBoundsException e) {
-                    throw new ClassNotFoundException("Failed to find optimized class ID " +
-                        "(is same GridGain version running on all nodes?): " + ggId, e);
-                }
-
-                name = ggT.get1();
-                cls = ggT.get2();
-                desc = ggT.get3();
-
-                if (desc == null) {
-                    if (clsLdr == U.gridClassLoader()) {
-                        if (cls == null) {
-                            cls = forName(name, clsLdr);
-
-                            ggT.set2(cls);
-                        }
-
-                        desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
-
-                        ggT.set3(desc);
-                    }
-                    else {
-                        cls = forName(name, clsLdr);
-
-                        desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
-                    }
-                }
-
-                break;
-
-            case HEADER_USER_NAME:
-                int usrId = in.readInt();
-
-                T3<String, Class<?>, GridOptimizedClassDescriptor> usrT;
-
-                try {
-                    if (usrId2Name != null)
-                        usrT = usrId2Name[usrId];
-                    else
-                        throw new ClassNotFoundException("Failed to find user defined class ID " +
-                            "(make sure to register identical classes on all nodes for optimization): " + usrId);
-                }
-                catch (ArrayIndexOutOfBoundsException e) {
-                    throw new ClassNotFoundException("Failed to find user defined class ID " +
-                        "(make sure to register identical classes on all nodes for optimization): " + usrId, e);
-                }
-
-                name = usrT.get1();
-                cls = usrT.get2();
-                desc = usrT.get3();
-
-                if (desc == null) {
-                    if (cls == null) {
-                        cls = forName(name, clsLdr);
-
-                        usrT.set2(cls);
-                    }
-
-                    desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
-
-                    usrT.set3(desc);
-                }
-
-                break;
-
-            case HEADER_ARRAY:
-                name = readClass(in, clsLdr).name();
-
-                name = name.charAt(0) == '[' ? "[" + name : "[L" + name + ';';
-
-                cls = forName(name, clsLdr);
-
-                return GridOptimizedMarshallerUtils.classDescriptor(cls, null);
-
-            case HEADER_NAME:
-                name = in.readUTF();
-
-                cls = forName(name, clsLdr);
-
-                desc = GridOptimizedMarshallerUtils.classDescriptor(cls, null);
-
-                break;
-
-            default:
-                throw new IOException("Unexpected optimized stream header: " + hdr);
-        }
-
-        short actual = desc.shortId();
-
-        short exp = in.readShort();
-
-        if (actual != exp)
-            throw new ClassNotFoundException("Optimized stream class checksum mismatch " +
-                "(is same version of marshalled class present on all nodes?) " +
-                "[expected=" + exp + ", actual=" + actual + ", cls=" + cls + ']');
-
-        return desc;
-    }
-
-    /**
-     * @param out Output.
-     * @param desc Class descriptor.
-     * @throws IOException In case of error.
-     */
-    static void writeClass(DataOutput out, GridOptimizedClassDescriptor desc) throws IOException {
-        assert out != null;
-        assert desc != null;
-
-        int hdr = desc.header();
-
-        out.writeByte(hdr);
-
-        switch (hdr) {
-            case HEADER_GG_NAME:
-            case HEADER_USER_NAME:
-                out.writeInt(desc.id());
-                out.writeShort(desc.shortId());
-
-                return;
-
-            case HEADER_ARRAY:
-                writeClass(out, GridOptimizedMarshallerUtils.classDescriptor(desc.componentType(), null));
-
-                return;
-
-            case HEADER_NAME:
-                out.writeUTF(desc.name());
-                out.writeShort(desc.shortId());
-        }
-    }
-
-    /**
-     * @param cls Class to write.
-     * @return Data for {@code writeClass} method.
-     */
-    static T2<Integer, Integer> writeClassData(Class<?> cls) {
-        assert cls != null;
-
-        String name = cls.getName();
-
-        Integer superHdr = ggxName2id.get(name);
-
-        if (superHdr != null)
-            return new T2<>(superHdr, null);
-
-        Integer id;
-
-        if ((id = ggName2id.get(name)) != null)
-            return new T2<>(HEADER_GG_NAME, id);
-
-        if (usrName2Id != null && (id = usrName2Id.get(name)) != null)
-            return new T2<>(HEADER_USER_NAME, id);
-
-        if (cls.isArray())
-            return new T2<>(HEADER_ARRAY, null);
-
-        return new T2<>(HEADER_NAME, null);
-    }
-
-    /**
-     * @param name Class name.
-     * @param ldr Class loader.
-     * @return Class.
-     * @throws ClassNotFoundException If class not found.
-     */
-    private static Class<?> forName(String name, ClassLoader ldr) throws ClassNotFoundException {
-        Class<?> cls = primitive(name);
-
-        if (cls == null)
-            cls = GridOptimizedMarshallerUtils.forName(name, ldr);
-
-        return cls;
-    }
-
-    /**
-     * @param name Name of primitive class.
-     * @return Primitive type class or null.
-     */
-    @SuppressWarnings("TypeMayBeWeakened")
-    @Nullable private static Class<?> primitive(String name) {
-        if (name.length() > 7)
-            return null;
-
-        switch (name.charAt(0)) {
-            case 'b':
-                if ("boolean".equals(name))
-                    return boolean.class;
-
-                return "byte".equals(name) ? byte.class : null;
-            case 's':
-                return "short".equals(name) ? short.class : null;
-            case 'i':
-                return "int".equals(name) ? int.class : null;
-            case 'l':
-                return "long".equals(name) ? long.class : null;
-            case 'c':
-                return "char".equals(name) ? char.class : null;
-            case 'f':
-                return "float".equals(name) ? float.class : null;
-            case 'd':
-                return "double".equals(name) ? double.class : null;
-            case 'v':
-                return "void".equals(name) ? void.class : null;
-        }
-
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedFieldType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedFieldType.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedFieldType.java
deleted file mode 100644
index f080a87..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedFieldType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-/**
- * Field type used to calculate {@code Unsafe} offsets into objects.
- */
-enum GridOptimizedFieldType {
-    /** */
-    BYTE,
-
-    /** */
-    SHORT,
-
-    /** */
-    INT,
-
-    /** */
-    LONG,
-
-    /** */
-    FLOAT,
-
-    /** */
-    DOUBLE,
-
-    /** */
-    CHAR,
-
-    /** */
-    BOOLEAN,
-
-    /** */
-    OTHER
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallable.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallable.java
deleted file mode 100644
index 2851316..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallable.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-import java.util.*;
-
-/**
- * Optional interface which helps make serialization even faster by removing internal
- * look-ups for classes.
- * <p>
- * All implementation must have the following:
- * <ul>
- * <li>
- *     Must have static filed (private or public) declared of type {@link Object}
- *     with name {@code GG_CLASS_ID}. GridGain will reflectively initialize this field with
- *     proper class ID during system startup.
- * </li>
- * <li>
- *     Must return the value of {@code GG_CLASS_ID} field from {@link #ggClassId} method.
- * </li>
- * </ul>
- * Here is a sample implementation:
- * <pre name="code" class="java">
- * // For better performance consider implementing java.io.Externalizable interface.
- * class ExampleMarshallable implements GridOptimizedMarshallable, Serializable {
- *     // Class ID field required by 'GridOptimizedMarshallable'.
- *     private static Object GG_CLASS_ID;
- *
- *     ...
- *
- *     &#64; public Object ggClassId() {
- *         return GG_CLASS_ID;
- *     }
- * }
- * </pre>
- * <p>
- * Note that for better performance you should also specify list of classes you
- * plan to serialize via {@link GridOptimizedMarshaller#setClassNames(List)} method.
- */
-public interface GridOptimizedMarshallable {
-    /** */
-    public static final String CLS_ID_FIELD_NAME = "GG_CLASS_ID";
-
-    /**
-     * Implementation of this method should simply return value of {@code GG_CLASS_ID} field.
-     *
-     * @return Class ID for optimized marshalling.
-     */
-    public Object ggClassId();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f586cfc2/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
deleted file mode 100644
index 17b3a07..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshaller.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.marshaller.optimized;
-
-import org.apache.ignite.marshaller.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-import sun.misc.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-/**
- * Optimized implementation of {@link GridMarshaller}. Unlike {@link org.apache.ignite.marshaller.jdk.IgniteJdkMarshaller},
- * which is based on standard {@link ObjectOutputStream}, this marshaller does not
- * enforce that all serialized objects implement {@link Serializable} interface. It is also
- * about 20 times faster as it removes lots of serialization overhead that exists in
- * default JDK implementation.
- * <p>
- * {@code GridOptimizedMarshaller} is tested only on Java HotSpot VM on other VMs
- * it could yield unexpected results. It is the default marshaller on Java HotSpot VMs
- * and will be used if no other marshaller was explicitly configured.
- * <p>
- * <h1 class="header">Configuration</h1>
- * <h2 class="header">Mandatory</h2>
- * This marshaller has no mandatory configuration parameters.
- * <h2 class="header">Java Example</h2>
- * <pre name="code" class="java">
- * GridOptimizedMarshaller marshaller = new GridOptimizedMarshaller();
- *
- * // Enforce Serializable interface.
- * marshaller.setRequireSerializable(true);
- *
- * GridConfiguration cfg = new GridConfiguration();
- *
- * // Override marshaller.
- * cfg.setMarshaller(marshaller);
- *
- * // Starts grid.
- * G.start(cfg);
- * </pre>
- * <h2 class="header">Spring Example</h2>
- * GridOptimizedMarshaller can be configured from Spring XML configuration file:
- * <pre name="code" class="xml">
- * &lt;bean id="grid.custom.cfg" class="org.gridgain.grid.GridConfiguration" singleton="true"&gt;
- *     ...
- *     &lt;property name="marshaller"&gt;
- *         &lt;bean class="org.gridgain.grid.marshaller.optimized.GridOptimizedMarshaller"&gt;
- *             &lt;property name="requireSerializable"&gt;true&lt;/property&gt;
- *         &lt;/bean&gt;
- *     &lt;/property&gt;
- *     ...
- * &lt;/bean&gt;
- * </pre>
- * <p>
- * <img src="http://www.gridgain.com/images/spring-small.png">
- * <br>
- * For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
- * <h2 class="header">Injection Example</h2>
- * GridMarshaller can be injected in users task, job or SPI as following:
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     &#64;GridMarshallerResource
- *     private GridMarshaller marshaller;
- *     ...
- * }
- * </pre>
- * or
- * <pre name="code" class="java">
- * public class MyGridJob implements GridComputeJob {
- *     ...
- *     private GridMarshaller marshaller;
- *     ...
- *     &#64;GridMarshallerResource
- *     public void setMarshaller(GridMarshaller marshaller) {
- *         this.marshaller = marshaller;
- *     }
- *     ...
- * }
- * </pre>
- */
-public class GridOptimizedMarshaller extends GridAbstractMarshaller {
-    /** Whether or not to require an object to be serializable in order to be marshalled. */
-    private boolean requireSer = true;
-
-    /** Default class loader. */
-    private final ClassLoader dfltClsLdr = getClass().getClassLoader();
-
-    /**
-     * Initializes marshaller not to enforce {@link Serializable} interface.
-     *
-     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
-     */
-    public GridOptimizedMarshaller() {
-        if (!available())
-            throw new GridRuntimeException("Using GridOptimizedMarshaller on unsupported JVM version (some of " +
-                "JVM-private APIs required for the marshaller to work are missing).");
-    }
-
-    /**
-     * Initializes marshaller with given serialization flag. If {@code true},
-     * then objects will be required to implement {@link Serializable} in order
-     * to be serialize.
-     *
-     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
-     *      then objects will be required to implement {@link Serializable} in order to be
-     *      marshalled, if {@code false}, then such requirement will be relaxed.
-     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
-     */
-    public GridOptimizedMarshaller(boolean requireSer) {
-        this();
-
-        this.requireSer = requireSer;
-    }
-
-    /**
-     * Initializes marshaller with given serialization flag. If {@code true},
-     * then objects will be required to implement {@link Serializable} in order
-     * to be serialize.
-     *
-     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
-     *      then objects will be required to implement {@link Serializable} in order to be
-     *      marshalled, if {@code false}, then such requirement will be relaxed.
-     * @param clsNames User preregistered class names.
-     * @param clsNamesPath Path to a file with user preregistered class names.
-     * @param poolSize Object streams pool size.
-     * @throws GridException If an I/O error occurs while writing stream header.
-     * @throws GridRuntimeException If this marshaller is not supported on the current JVM.
-     */
-    public GridOptimizedMarshaller(boolean requireSer, @Nullable List<String> clsNames,
-        @Nullable String clsNamesPath, int poolSize) throws GridException {
-        this(requireSer);
-
-        setClassNames(clsNames);
-        setClassNamesPath(clsNamesPath);
-        setPoolSize(poolSize);
-    }
-
-    /**
-     * Adds provided class names for marshalling optimization.
-     * <p>
-     * <b>NOTE</b>: these collections of classes must be identical on all nodes and in the same order.
-     *
-     * @param clsNames User preregistered class names to add.
-     */
-    @SuppressWarnings("unchecked")
-    public void setClassNames(@Nullable List<String> clsNames) {
-        if (clsNames != null && !clsNames.isEmpty()) {
-            String[] clsNamesArr = clsNames.toArray(new String[clsNames.size()]);
-
-            Arrays.sort(clsNamesArr);
-
-            Map<String, Integer> name2id = U.newHashMap(clsNamesArr.length);
-            T3<String, Class<?>, GridOptimizedClassDescriptor>[] id2name = new T3[clsNamesArr.length];
-
-            int i = 0;
-
-            for (String name : clsNamesArr) {
-                name2id.put(name, i);
-                id2name[i++] = new T3<>(name, null, null);
-            }
-
-            GridOptimizedClassResolver.userClasses(name2id, id2name);
-        }
-    }
-
-    /**
-     * Specifies a name of the file which lists all class names to be optimized.
-     * The file path can either be absolute path, relative to {@code GRIDGAIN_HOME},
-     * or specify a resource file on the class path.
-     * <p>
-     * The format of the file is class name per line, like this:
-     * <pre>
-     * ...
-     * com.example.Class1
-     * com.example.Class2
-     * ...
-     * </pre>
-     * <p>
-     * <b>NOTE</b>: this class list must be identical on all nodes and in the same order.
-     *
-     * @param path Path to a file with user preregistered class names.
-     * @throws GridException If an error occurs while writing stream header.
-     */
-    public void setClassNamesPath(@Nullable String path) throws GridException {
-        if (path == null)
-            return;
-
-        URL url = GridUtils.resolveGridGainUrl(path, false);
-
-        if (url == null)
-            throw new GridException("Failed to find resource for name: " + path);
-
-        List<String> clsNames;
-
-        try {
-            clsNames = new LinkedList<>();
-
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), GridOptimizedMarshallerUtils.UTF_8))) {
-                String clsName;
-
-                while ((clsName = reader.readLine()) != null)
-                    clsNames.add(clsName);
-            }
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to read class names from path: " + path, e);
-        }
-
-        setClassNames(clsNames);
-    }
-
-    /**
-     * Specifies size of cached object streams used by marshaller. Object streams are cached for
-     * performance reason to avoid costly recreation for every serialization routine. If {@code 0} (default),
-     * pool is not used and each thread has its own cached object stream which it keeps reusing.
-     * <p>
-     * Since each stream has an internal buffer, creating a stream for each thread can lead to
-     * high memory consumption if many large messages are marshalled or unmarshalled concurrently.
-     * Consider using pool in this case. This will limit number of streams that can be created and,
-     * therefore, decrease memory consumption.
-     * <p>
-     * NOTE: Using streams pool can decrease performance since streams will be shared between
-     * different threads which will lead to more frequent context switching.
-     *
-     * @param poolSize Streams pool size. If {@code 0}, pool is not used.
-     */
-    public void setPoolSize(int poolSize) {
-        GridOptimizedObjectStreamRegistry.poolSize(poolSize);
-    }
-
-    /**
-     * @return Whether to enforce {@link Serializable} interface.
-     */
-    public boolean isRequireSerializable() {
-        return requireSer;
-    }
-
-    /**
-     * Sets flag to enforce {@link Serializable} interface or not.
-     *
-     * @param requireSer Flag to enforce {@link Serializable} interface or not. If {@code true},
-     *      then objects will be required to implement {@link Serializable} in order to be
-     *      marshalled, if {@code false}, then such requirement will be relaxed.
-     */
-    public void setRequireSerializable(boolean requireSer) {
-        this.requireSer = requireSer;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void marshal(@Nullable Object obj, OutputStream out) throws GridException {
-        assert out != null;
-
-        GridOptimizedObjectOutputStream objOut = null;
-
-        try {
-            objOut = GridOptimizedObjectStreamRegistry.out();
-
-            objOut.requireSerializable(requireSer);
-
-            objOut.out().outputStream(out);
-
-            objOut.writeObject(obj);
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to serialize object: " + obj, e);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeOut(objOut);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public byte[] marshal(@Nullable Object obj) throws GridException {
-        GridOptimizedObjectOutputStream objOut = null;
-
-        try {
-            objOut = GridOptimizedObjectStreamRegistry.out();
-
-            objOut.requireSerializable(requireSer);
-
-            objOut.writeObject(obj);
-
-            return objOut.out().array();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to serialize object: " + obj, e);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeOut(objOut);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws GridException {
-        assert in != null;
-
-        GridOptimizedObjectInputStream objIn = null;
-
-        try {
-            objIn = GridOptimizedObjectStreamRegistry.in();
-
-            objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
-
-            objIn.in().inputStream(in);
-
-            return (T)objIn.readObject();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
-        }
-        catch (ClassNotFoundException e) {
-            throw new GridException("Failed to find class with given class loader for unmarshalling " +
-                "(make sure same versions of all classes are available on all nodes or enable peer-class-loading): " +
-                clsLdr, e);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeIn(objIn);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public <T> T unmarshal(byte[] arr, @Nullable ClassLoader clsLdr) throws GridException {
-        assert arr != null;
-
-        GridOptimizedObjectInputStream objIn = null;
-
-        try {
-            objIn = GridOptimizedObjectStreamRegistry.in();
-
-            objIn.classLoader(clsLdr != null ? clsLdr : dfltClsLdr);
-
-            objIn.in().bytes(arr, arr.length);
-
-            return (T)objIn.readObject();
-        }
-        catch (IOException e) {
-            throw new GridException("Failed to deserialize object with given class loader: " + clsLdr, e);
-        }
-        catch (ClassNotFoundException e) {
-            throw new GridException("Failed to find class with given class loader for unmarshalling " +
-                "(make sure same version of all classes are available on all nodes or enable peer-class-loading): " +
-                clsLdr, e);
-        }
-        finally {
-            GridOptimizedObjectStreamRegistry.closeIn(objIn);
-        }
-    }
-
-    /**
-     * Checks whether {@code GridOptimizedMarshaller} is able to work on the current JVM.
-     * <p>
-     * As long as {@code GridOptimizedMarshaller} uses JVM-private API, which is not guaranteed
-     * to be available on all JVM, this method should be called to ensure marshaller could work properly.
-     * <p>
-     * Result of this method is automatically checked in constructor.
-     *
-     * @return {@code true} if {@code GridOptimizedMarshaller} can work on the current JVM or
-     *  {@code false} if it can't.
-     */
-    @SuppressWarnings({"TypeParameterExtendsFinalClass", "ErrorNotRethrown"})
-    public static boolean available() {
-        try {
-            Unsafe unsafe = GridUnsafe.unsafe();
-
-            Class<? extends Unsafe> unsafeCls = unsafe.getClass();
-
-            unsafeCls.getMethod("allocateInstance", Class.class);
-            unsafeCls.getMethod("copyMemory", Object.class, long.class, Object.class, long.class, long.class);
-
-            return true;
-        }
-        catch (Exception ignored) {
-            return false;
-        }
-        catch (NoClassDefFoundError ignored) {
-            return false;
-        }
-    }
-
-    /**
-     * Undeployment callback invoked when class loader is being undeployed.
-     *
-     * @param ldr Class loader being undeployed.
-     */
-    public static void onUndeploy(ClassLoader ldr) {
-        GridOptimizedMarshallerUtils.onUndeploy(ldr);
-    }
-
-    /**
-     * Clears internal caches and frees memory. Usually called on system stop.
-     */
-    public static void clearCache() {
-        GridOptimizedMarshallerUtils.clearCache();
-    }
-}


[21/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3edf39ef/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/optimized-classnames.previous.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/optimized-classnames.previous.properties b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/optimized-classnames.previous.properties
deleted file mode 100644
index 9038b45..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/optimized-classnames.previous.properties
+++ /dev/null
@@ -1,30621 +0,0 @@
-EDU.oswego.cs.dl.util.concurrent.BrokenBarrierException
-EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap
-EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap$Segment
-EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap
-EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap$BarrierLock
-EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArrayList
-EDU.oswego.cs.dl.util.concurrent.CopyOnWriteArraySet
-EDU.oswego.cs.dl.util.concurrent.PropertyChangeMulticaster
-EDU.oswego.cs.dl.util.concurrent.TimeoutException
-EDU.oswego.cs.dl.util.concurrent.VetoableChangeMulticaster
-EDU.oswego.cs.dl.util.concurrent.misc.AClongRNG
-EDU.oswego.cs.dl.util.concurrent.misc.AllSynchRNG
-EDU.oswego.cs.dl.util.concurrent.misc.ChanRNG
-EDU.oswego.cs.dl.util.concurrent.misc.DirectExecutorRNG
-EDU.oswego.cs.dl.util.concurrent.misc.FIFORWlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.FifoRNG
-EDU.oswego.cs.dl.util.concurrent.misc.Fraction
-EDU.oswego.cs.dl.util.concurrent.misc.LockedSemRNG
-EDU.oswego.cs.dl.util.concurrent.misc.MutexRNG
-EDU.oswego.cs.dl.util.concurrent.misc.NoSynchRNG
-EDU.oswego.cs.dl.util.concurrent.misc.PooledExecutorRNG
-EDU.oswego.cs.dl.util.concurrent.misc.PrioritySemRNG
-EDU.oswego.cs.dl.util.concurrent.misc.PublicSynchRNG
-EDU.oswego.cs.dl.util.concurrent.misc.QueuedExecutorRNG
-EDU.oswego.cs.dl.util.concurrent.misc.RWLockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.ReaderPrefRWlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.ReentrantRWlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.RlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.SDelegatedRNG
-EDU.oswego.cs.dl.util.concurrent.misc.SemRNG
-EDU.oswego.cs.dl.util.concurrent.misc.SyncDelegatedRNG
-EDU.oswego.cs.dl.util.concurrent.misc.SynchLongRNG
-EDU.oswego.cs.dl.util.concurrent.misc.ThreadedExecutorRNG
-EDU.oswego.cs.dl.util.concurrent.misc.UpdateCommand
-EDU.oswego.cs.dl.util.concurrent.misc.WpRWlockRNG
-EDU.oswego.cs.dl.util.concurrent.misc.WpSemRNG
-antlr.ANTLRError
-antlr.ANTLRException
-antlr.CharStreamException
-antlr.CharStreamIOException
-antlr.CommonAST
-antlr.CommonASTWithHiddenTokens
-antlr.FileCopyException
-antlr.MismatchedCharException
-antlr.MismatchedTokenException
-antlr.NoViableAltException
-antlr.NoViableAltForCharException
-antlr.ParseTreeRule
-antlr.ParseTreeToken
-antlr.RecognitionException
-antlr.SemanticException
-antlr.TokenStreamException
-antlr.TokenStreamIOException
-antlr.TokenStreamRecognitionException
-antlr.TokenStreamRetryException
-antlr.debug.InputBufferEvent
-antlr.debug.MessageEvent
-antlr.debug.NewLineEvent
-antlr.debug.ParserMatchEvent
-antlr.debug.ParserTokenEvent
-antlr.debug.SemanticPredicateEvent
-antlr.debug.SyntacticPredicateEvent
-antlr.debug.TraceEvent
-antlr.debug.misc.ASTFrame
-antlr.debug.misc.JTreeASTPanel
-ch.epfl.lamp.compiler.msil.emit.ILGenerator$$anonfun$Emit$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anon$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$addPrimitive$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseILGenerator$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseOpCode$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$caseTypeBuilder$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$hasControlChars$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$pad$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printAssemblyBoilerplate$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printAttributes$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printHeader$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printSignature$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printSignature$2
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printTypeParams$1
-ch.epfl.lamp.compiler.msil.emit.ILPrinterVisitor$$anonfun$printTypeParams$1$$anonfun$apply$mcVI$sp$1
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseAssemblyBuilder$1
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseAssemblyBuilder$2
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$1
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$1$$anonfun$apply$mcVI$sp$1
-ch.epfl.lamp.compiler.msil.emit.MultipleFilesILPrinterVisitor$$anonfun$caseModuleBuilder$2
-ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseAssemblyBuilder$1
-ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseAssemblyBuilder$2
-ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseModuleBuilder$1
-ch.epfl.lamp.compiler.msil.emit.SingleFileILPrinterVisitor$$anonfun$caseModuleBuilder$2
-ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$constructorsEqual$1
-ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$methodsEqual$1
-ch.epfl.lamp.compiler.msil.emit.TypeBuilder$$anonfun$types2String$1
-ch.epfl.lamp.fjbg.JCode$OffsetTooBigException
-com.amazonaws.AmazonClientException
-com.amazonaws.AmazonServiceException
-com.amazonaws.AmazonServiceException$ErrorType
-com.amazonaws.HttpMethod
-com.amazonaws.Protocol
-com.amazonaws.auth.SignatureVersion
-com.amazonaws.auth.SigningAlgorithm
-com.amazonaws.auth.policy.Statement$Effect
-com.amazonaws.auth.policy.actions.CloudFormationActions
-com.amazonaws.auth.policy.actions.S3Actions
-com.amazonaws.auth.policy.actions.SNSActions
-com.amazonaws.auth.policy.actions.SQSActions
-com.amazonaws.auth.policy.conditions.ArnCondition$ArnComparisonType
-com.amazonaws.auth.policy.conditions.DateCondition$DateComparisonType
-com.amazonaws.auth.policy.conditions.IpAddressCondition$IpAddressComparisonType
-com.amazonaws.auth.policy.conditions.NumericCondition$NumericComparisonType
-com.amazonaws.auth.policy.conditions.StringCondition$StringComparisonType
-com.amazonaws.http.HttpMethodName
-com.amazonaws.services.autoscaling.model.AlreadyExistsException
-com.amazonaws.services.autoscaling.model.InvalidNextTokenException
-com.amazonaws.services.autoscaling.model.LifecycleState
-com.amazonaws.services.autoscaling.model.LimitExceededException
-com.amazonaws.services.autoscaling.model.ResourceInUseException
-com.amazonaws.services.autoscaling.model.ScalingActivityInProgressException
-com.amazonaws.services.autoscaling.model.ScalingActivityStatusCode
-com.amazonaws.services.cloudformation.model.AlreadyExistsException
-com.amazonaws.services.cloudformation.model.Capability
-com.amazonaws.services.cloudformation.model.InsufficientCapabilitiesException
-com.amazonaws.services.cloudformation.model.LimitExceededException
-com.amazonaws.services.cloudformation.model.OnFailure
-com.amazonaws.services.cloudformation.model.ResourceStatus
-com.amazonaws.services.cloudformation.model.StackStatus
-com.amazonaws.services.cloudfront.model.AccessDeniedException
-com.amazonaws.services.cloudfront.model.BatchTooLargeException
-com.amazonaws.services.cloudfront.model.CNAMEAlreadyExistsException
-com.amazonaws.services.cloudfront.model.CloudFrontOriginAccessIdentityAlreadyExistsException
-com.amazonaws.services.cloudfront.model.CloudFrontOriginAccessIdentityInUseException
-com.amazonaws.services.cloudfront.model.DistributionAlreadyExistsException
-com.amazonaws.services.cloudfront.model.DistributionNotDisabledException
-com.amazonaws.services.cloudfront.model.IllegalUpdateException
-com.amazonaws.services.cloudfront.model.InconsistentQuantitiesException
-com.amazonaws.services.cloudfront.model.InvalidArgumentException
-com.amazonaws.services.cloudfront.model.InvalidDefaultRootObjectException
-com.amazonaws.services.cloudfront.model.InvalidIfMatchVersionException
-com.amazonaws.services.cloudfront.model.InvalidOriginAccessIdentityException
-com.amazonaws.services.cloudfront.model.InvalidOriginException
-com.amazonaws.services.cloudfront.model.InvalidRequiredProtocolException
-com.amazonaws.services.cloudfront.model.MissingBodyException
-com.amazonaws.services.cloudfront.model.NoSuchCloudFrontOriginAccessIdentityException
-com.amazonaws.services.cloudfront.model.NoSuchDistributionException
-com.amazonaws.services.cloudfront.model.NoSuchInvalidationException
-com.amazonaws.services.cloudfront.model.NoSuchOriginException
-com.amazonaws.services.cloudfront.model.NoSuchStreamingDistributionException
-com.amazonaws.services.cloudfront.model.OriginProtocolPolicy
-com.amazonaws.services.cloudfront.model.PreconditionFailedException
-com.amazonaws.services.cloudfront.model.StreamingDistributionAlreadyExistsException
-com.amazonaws.services.cloudfront.model.StreamingDistributionNotDisabledException
-com.amazonaws.services.cloudfront.model.TooManyCacheBehaviorsException
-com.amazonaws.services.cloudfront.model.TooManyCloudFrontOriginAccessIdentitiesException
-com.amazonaws.services.cloudfront.model.TooManyDistributionCNAMEsException
-com.amazonaws.services.cloudfront.model.TooManyDistributionsException
-com.amazonaws.services.cloudfront.model.TooManyInvalidationsInProgressException
-com.amazonaws.services.cloudfront.model.TooManyOriginsException
-com.amazonaws.services.cloudfront.model.TooManyStreamingDistributionCNAMEsException
-com.amazonaws.services.cloudfront.model.TooManyStreamingDistributionsException
-com.amazonaws.services.cloudfront.model.TooManyTrustedSignersException
-com.amazonaws.services.cloudfront.model.TrustedSignerDoesNotExistException
-com.amazonaws.services.cloudfront.model.ViewerProtocolPolicy
-com.amazonaws.services.cloudfront_2012_03_15.model.AccessDeniedException
-com.amazonaws.services.cloudfront_2012_03_15.model.BatchTooLargeException
-com.amazonaws.services.cloudfront_2012_03_15.model.CNAMEAlreadyExistsException
-com.amazonaws.services.cloudfront_2012_03_15.model.CloudFrontOriginAccessIdentityAlreadyExistsException
-com.amazonaws.services.cloudfront_2012_03_15.model.CloudFrontOriginAccessIdentityInUseException
-com.amazonaws.services.cloudfront_2012_03_15.model.DistributionAlreadyExistsException
-com.amazonaws.services.cloudfront_2012_03_15.model.DistributionNotDisabledException
-com.amazonaws.services.cloudfront_2012_03_15.model.IllegalUpdateException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidArgumentException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidDefaultRootObjectException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidIfMatchVersionException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidOriginAccessIdentityException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidOriginException
-com.amazonaws.services.cloudfront_2012_03_15.model.InvalidRequiredProtocolException
-com.amazonaws.services.cloudfront_2012_03_15.model.MissingBodyException
-com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchCloudFrontOriginAccessIdentityException
-com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchDistributionException
-com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchInvalidationException
-com.amazonaws.services.cloudfront_2012_03_15.model.NoSuchStreamingDistributionException
-com.amazonaws.services.cloudfront_2012_03_15.model.OriginProtocolPolicy
-com.amazonaws.services.cloudfront_2012_03_15.model.PreconditionFailedException
-com.amazonaws.services.cloudfront_2012_03_15.model.StreamingDistributionAlreadyExistsException
-com.amazonaws.services.cloudfront_2012_03_15.model.StreamingDistributionNotDisabledException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyCloudFrontOriginAccessIdentitiesException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyDistributionCNAMEsException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyDistributionsException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyInvalidationsInProgressException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyStreamingDistributionCNAMEsException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyStreamingDistributionsException
-com.amazonaws.services.cloudfront_2012_03_15.model.TooManyTrustedSignersException
-com.amazonaws.services.cloudfront_2012_03_15.model.TrustedSignerDoesNotExistException
-com.amazonaws.services.cloudsearch.model.BaseException
-com.amazonaws.services.cloudsearch.model.IndexFieldType
-com.amazonaws.services.cloudsearch.model.InternalException
-com.amazonaws.services.cloudsearch.model.InvalidTypeException
-com.amazonaws.services.cloudsearch.model.LimitExceededException
-com.amazonaws.services.cloudsearch.model.OptionState
-com.amazonaws.services.cloudsearch.model.ResourceNotFoundException
-com.amazonaws.services.cloudsearch.model.SearchInstanceType
-com.amazonaws.services.cloudsearch.model.SourceDataFunction
-com.amazonaws.services.cloudwatch.model.ComparisonOperator
-com.amazonaws.services.cloudwatch.model.HistoryItemType
-com.amazonaws.services.cloudwatch.model.InternalServiceException
-com.amazonaws.services.cloudwatch.model.InvalidFormatException
-com.amazonaws.services.cloudwatch.model.InvalidNextTokenException
-com.amazonaws.services.cloudwatch.model.InvalidParameterCombinationException
-com.amazonaws.services.cloudwatch.model.InvalidParameterValueException
-com.amazonaws.services.cloudwatch.model.LimitExceededException
-com.amazonaws.services.cloudwatch.model.MissingRequiredParameterException
-com.amazonaws.services.cloudwatch.model.ResourceNotFoundException
-com.amazonaws.services.cloudwatch.model.StandardUnit
-com.amazonaws.services.cloudwatch.model.StateValue
-com.amazonaws.services.cloudwatch.model.Statistic
-com.amazonaws.services.dynamodb.datamodeling.DynamoDBMapperConfig$ConsistentReads
-com.amazonaws.services.dynamodb.datamodeling.DynamoDBMapperConfig$SaveBehavior
-com.amazonaws.services.dynamodb.datamodeling.DynamoDBMappingException
-com.amazonaws.services.dynamodb.model.AttributeAction
-com.amazonaws.services.dynamodb.model.ComparisonOperator
-com.amazonaws.services.dynamodb.model.ConditionalCheckFailedException
-com.amazonaws.services.dynamodb.model.InternalServerErrorException
-com.amazonaws.services.dynamodb.model.LimitExceededException
-com.amazonaws.services.dynamodb.model.ProvisionedThroughputExceededException
-com.amazonaws.services.dynamodb.model.ResourceInUseException
-com.amazonaws.services.dynamodb.model.ResourceNotFoundException
-com.amazonaws.services.dynamodb.model.ReturnValue
-com.amazonaws.services.dynamodb.model.ScalarAttributeType
-com.amazonaws.services.dynamodb.model.TableStatus
-com.amazonaws.services.ec2.model.ContainerFormat
-com.amazonaws.services.ec2.model.DiskImageFormat
-com.amazonaws.services.ec2.model.DomainType
-com.amazonaws.services.ec2.model.ExportEnvironment
-com.amazonaws.services.ec2.model.HypervisorType
-com.amazonaws.services.ec2.model.ImageState
-com.amazonaws.services.ec2.model.InstanceAttributeName
-com.amazonaws.services.ec2.model.InstanceStateName
-com.amazonaws.services.ec2.model.InstanceType
-com.amazonaws.services.ec2.model.PlacementGroupState
-com.amazonaws.services.ec2.model.PlacementStrategy
-com.amazonaws.services.ec2.model.ResourceType
-com.amazonaws.services.ec2.model.RuleAction
-com.amazonaws.services.ec2.model.SnapshotAttributeName
-com.amazonaws.services.ec2.model.SnapshotState
-com.amazonaws.services.ec2.model.SpotInstanceType
-com.amazonaws.services.ec2.model.VirtualizationType
-com.amazonaws.services.ec2.model.VolumeAttachmentState
-com.amazonaws.services.ec2.model.VolumeAttributeName
-com.amazonaws.services.ec2.model.VolumeState
-com.amazonaws.services.ec2.model.VolumeType
-com.amazonaws.services.elasticache.model.AuthorizationAlreadyExistsException
-com.amazonaws.services.elasticache.model.AuthorizationNotFoundException
-com.amazonaws.services.elasticache.model.CacheClusterAlreadyExistsException
-com.amazonaws.services.elasticache.model.CacheClusterNotFoundException
-com.amazonaws.services.elasticache.model.CacheParameterGroupAlreadyExistsException
-com.amazonaws.services.elasticache.model.CacheParameterGroupNotFoundException
-com.amazonaws.services.elasticache.model.CacheParameterGroupQuotaExceededException
-com.amazonaws.services.elasticache.model.CacheSecurityGroupAlreadyExistsException
-com.amazonaws.services.elasticache.model.CacheSecurityGroupNotFoundException
-com.amazonaws.services.elasticache.model.CacheSecurityGroupQuotaExceededException
-com.amazonaws.services.elasticache.model.ClusterQuotaForCustomerExceededException
-com.amazonaws.services.elasticache.model.InsufficientCacheClusterCapacityException
-com.amazonaws.services.elasticache.model.InvalidCacheClusterStateException
-com.amazonaws.services.elasticache.model.InvalidCacheParameterGroupStateException
-com.amazonaws.services.elasticache.model.InvalidCacheSecurityGroupStateException
-com.amazonaws.services.elasticache.model.InvalidParameterCombinationException
-com.amazonaws.services.elasticache.model.InvalidParameterValueException
-com.amazonaws.services.elasticache.model.NodeQuotaForClusterExceededException
-com.amazonaws.services.elasticache.model.NodeQuotaForCustomerExceededException
-com.amazonaws.services.elasticache.model.ReservedCacheNodeAlreadyExistsException
-com.amazonaws.services.elasticache.model.ReservedCacheNodeNotFoundException
-com.amazonaws.services.elasticache.model.ReservedCacheNodeQuotaExceededException
-com.amazonaws.services.elasticache.model.ReservedCacheNodesOfferingNotFoundException
-com.amazonaws.services.elasticache.model.SourceType
-com.amazonaws.services.elasticbeanstalk.model.ConfigurationDeploymentStatus
-com.amazonaws.services.elasticbeanstalk.model.ConfigurationOptionValueType
-com.amazonaws.services.elasticbeanstalk.model.EnvironmentHealth
-com.amazonaws.services.elasticbeanstalk.model.EnvironmentInfoType
-com.amazonaws.services.elasticbeanstalk.model.EnvironmentStatus
-com.amazonaws.services.elasticbeanstalk.model.EventSeverity
-com.amazonaws.services.elasticbeanstalk.model.S3SubscriptionRequiredException
-com.amazonaws.services.elasticbeanstalk.model.SourceBundleDeletionException
-com.amazonaws.services.elasticbeanstalk.model.TooManyApplicationVersionsException
-com.amazonaws.services.elasticbeanstalk.model.TooManyApplicationsException
-com.amazonaws.services.elasticbeanstalk.model.TooManyBucketsException
-com.amazonaws.services.elasticbeanstalk.model.TooManyConfigurationTemplatesException
-com.amazonaws.services.elasticbeanstalk.model.TooManyEnvironmentsException
-com.amazonaws.services.elasticbeanstalk.model.ValidationSeverity
-com.amazonaws.services.elasticloadbalancing.model.CertificateNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.DuplicateListenerException
-com.amazonaws.services.elasticloadbalancing.model.DuplicateLoadBalancerNameException
-com.amazonaws.services.elasticloadbalancing.model.DuplicatePolicyNameException
-com.amazonaws.services.elasticloadbalancing.model.InvalidConfigurationRequestException
-com.amazonaws.services.elasticloadbalancing.model.InvalidInstanceException
-com.amazonaws.services.elasticloadbalancing.model.InvalidSchemeException
-com.amazonaws.services.elasticloadbalancing.model.InvalidSecurityGroupException
-com.amazonaws.services.elasticloadbalancing.model.InvalidSubnetException
-com.amazonaws.services.elasticloadbalancing.model.ListenerNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.LoadBalancerNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.PolicyNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.PolicyTypeNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.SubnetNotFoundException
-com.amazonaws.services.elasticloadbalancing.model.TooManyLoadBalancersException
-com.amazonaws.services.elasticloadbalancing.model.TooManyPoliciesException
-com.amazonaws.services.elasticmapreduce.model.ActionOnFailure
-com.amazonaws.services.elasticmapreduce.model.InstanceGroupState
-com.amazonaws.services.elasticmapreduce.model.InstanceRoleType
-com.amazonaws.services.elasticmapreduce.model.InternalServerErrorException
-com.amazonaws.services.elasticmapreduce.model.JobFlowExecutionState
-com.amazonaws.services.elasticmapreduce.model.MarketType
-com.amazonaws.services.elasticmapreduce.model.StepExecutionState
-com.amazonaws.services.elasticmapreduce.util.BootstrapActions$ConfigFile
-com.amazonaws.services.elasticmapreduce.util.BootstrapActions$Daemon
-com.amazonaws.services.elasticmapreduce.util.ResizeJobFlowStep$OnArrested
-com.amazonaws.services.elasticmapreduce.util.ResizeJobFlowStep$OnFailure
-com.amazonaws.services.elasticmapreduce.util.StepFactory$HiveVersion
-com.amazonaws.services.glacier.model.ActionCode
-com.amazonaws.services.glacier.model.InvalidParameterValueException
-com.amazonaws.services.glacier.model.LimitExceededException
-com.amazonaws.services.glacier.model.MissingParameterValueException
-com.amazonaws.services.glacier.model.RequestTimeoutException
-com.amazonaws.services.glacier.model.ResourceNotFoundException
-com.amazonaws.services.glacier.model.ServiceUnavailableException
-com.amazonaws.services.glacier.model.StatusCode
-com.amazonaws.services.identitymanagement.model.AssignmentStatusType
-com.amazonaws.services.identitymanagement.model.DeleteConflictException
-com.amazonaws.services.identitymanagement.model.DuplicateCertificateException
-com.amazonaws.services.identitymanagement.model.EntityAlreadyExistsException
-com.amazonaws.services.identitymanagement.model.EntityTemporarilyUnmodifiableException
-com.amazonaws.services.identitymanagement.model.InvalidAuthenticationCodeException
-com.amazonaws.services.identitymanagement.model.InvalidCertificateException
-com.amazonaws.services.identitymanagement.model.InvalidUserTypeException
-com.amazonaws.services.identitymanagement.model.KeyPairMismatchException
-com.amazonaws.services.identitymanagement.model.LimitExceededException
-com.amazonaws.services.identitymanagement.model.MalformedCertificateException
-com.amazonaws.services.identitymanagement.model.MalformedPolicyDocumentException
-com.amazonaws.services.identitymanagement.model.NoSuchEntityException
-com.amazonaws.services.identitymanagement.model.PasswordPolicyViolationException
-com.amazonaws.services.identitymanagement.model.StatusType
-com.amazonaws.services.identitymanagement.model.SummaryKeyType
-com.amazonaws.services.importexport.model.BucketPermissionException
-com.amazonaws.services.importexport.model.CanceledJobIdException
-com.amazonaws.services.importexport.model.ExpiredJobIdException
-com.amazonaws.services.importexport.model.InvalidAccessKeyIdException
-com.amazonaws.services.importexport.model.InvalidAddressException
-com.amazonaws.services.importexport.model.InvalidCustomsException
-com.amazonaws.services.importexport.model.InvalidFileSystemException
-com.amazonaws.services.importexport.model.InvalidJobIdException
-com.amazonaws.services.importexport.model.InvalidManifestFieldException
-com.amazonaws.services.importexport.model.InvalidParameterException
-com.amazonaws.services.importexport.model.JobType
-com.amazonaws.services.importexport.model.MalformedManifestException
-com.amazonaws.services.importexport.model.MissingCustomsException
-com.amazonaws.services.importexport.model.MissingManifestFieldException
-com.amazonaws.services.importexport.model.MissingParameterException
-com.amazonaws.services.importexport.model.MultipleRegionsException
-com.amazonaws.services.importexport.model.NoSuchBucketException
-com.amazonaws.services.importexport.model.UnableToCancelJobIdException
-com.amazonaws.services.rds.model.ApplyMethod
-com.amazonaws.services.rds.model.AuthorizationAlreadyExistsException
-com.amazonaws.services.rds.model.AuthorizationNotFoundException
-com.amazonaws.services.rds.model.AuthorizationQuotaExceededException
-com.amazonaws.services.rds.model.DBInstanceAlreadyExistsException
-com.amazonaws.services.rds.model.DBInstanceNotFoundException
-com.amazonaws.services.rds.model.DBParameterGroupAlreadyExistsException
-com.amazonaws.services.rds.model.DBParameterGroupNotFoundException
-com.amazonaws.services.rds.model.DBParameterGroupQuotaExceededException
-com.amazonaws.services.rds.model.DBSecurityGroupAlreadyExistsException
-com.amazonaws.services.rds.model.DBSecurityGroupNotFoundException
-com.amazonaws.services.rds.model.DBSecurityGroupQuotaExceededException
-com.amazonaws.services.rds.model.DBSnapshotAlreadyExistsException
-com.amazonaws.services.rds.model.DBSnapshotNotFoundException
-com.amazonaws.services.rds.model.DBSubnetGroupAlreadyExistsException
-com.amazonaws.services.rds.model.DBSubnetGroupListDoesNotCoverAllAzException
-com.amazonaws.services.rds.model.DBSubnetGroupNotFoundException
-com.amazonaws.services.rds.model.DBSubnetGroupQuotaExceededException
-com.amazonaws.services.rds.model.DBSubnetQuotaExceededException
-com.amazonaws.services.rds.model.InstanceQuotaExceededException
-com.amazonaws.services.rds.model.InsufficientDBInstanceCapacityException
-com.amazonaws.services.rds.model.InvalidDBInstanceStateException
-com.amazonaws.services.rds.model.InvalidDBParameterGroupStateException
-com.amazonaws.services.rds.model.InvalidDBSecurityGroupStateException
-com.amazonaws.services.rds.model.InvalidDBSnapshotStateException
-com.amazonaws.services.rds.model.InvalidDBSubnetGroupStateException
-com.amazonaws.services.rds.model.InvalidDBSubnetStateException
-com.amazonaws.services.rds.model.InvalidOptionGroupStateException
-com.amazonaws.services.rds.model.InvalidRestoreException
-com.amazonaws.services.rds.model.InvalidSubnetException
-com.amazonaws.services.rds.model.InvalidVPCNetworkStateException
-com.amazonaws.services.rds.model.OptionGroupAlreadyExistsException
-com.amazonaws.services.rds.model.OptionGroupNotFoundException
-com.amazonaws.services.rds.model.OptionGroupQuotaExceededException
-com.amazonaws.services.rds.model.PointInTimeRestoreNotEnabledException
-com.amazonaws.services.rds.model.ReservedDBInstanceAlreadyExistsException
-com.amazonaws.services.rds.model.ReservedDBInstanceNotFoundException
-com.amazonaws.services.rds.model.ReservedDBInstanceQuotaExceededException
-com.amazonaws.services.rds.model.ReservedDBInstancesOfferingNotFoundException
-com.amazonaws.services.rds.model.SnapshotQuotaExceededException
-com.amazonaws.services.rds.model.SourceType
-com.amazonaws.services.rds.model.StorageQuotaExceededException
-com.amazonaws.services.rds.model.SubnetAlreadyInUseException
-com.amazonaws.services.route53.model.ChangeAction
-com.amazonaws.services.route53.model.ChangeStatus
-com.amazonaws.services.route53.model.DelegationSetNotAvailableException
-com.amazonaws.services.route53.model.HostedZoneAlreadyExistsException
-com.amazonaws.services.route53.model.HostedZoneNotEmptyException
-com.amazonaws.services.route53.model.InvalidChangeBatchException
-com.amazonaws.services.route53.model.InvalidDomainNameException
-com.amazonaws.services.route53.model.InvalidInputException
-com.amazonaws.services.route53.model.NoSuchChangeException
-com.amazonaws.services.route53.model.NoSuchHostedZoneException
-com.amazonaws.services.route53.model.RRType
-com.amazonaws.services.route53.model.ResourceRecordSetRegion
-com.amazonaws.services.route53.model.TooManyHostedZonesException
-com.amazonaws.services.s3.model.AccessControlList
-com.amazonaws.services.s3.model.AmazonS3Exception
-com.amazonaws.services.s3.model.CORSRule$AllowedMethods
-com.amazonaws.services.s3.model.CannedAccessControlList
-com.amazonaws.services.s3.model.CryptoStorageMode
-com.amazonaws.services.s3.model.GroupGrantee
-com.amazonaws.services.s3.model.MultiObjectDeleteException
-com.amazonaws.services.s3.model.Owner
-com.amazonaws.services.s3.model.Permission
-com.amazonaws.services.s3.model.Region
-com.amazonaws.services.s3.model.StorageClass
-com.amazonaws.services.s3.transfer.Transfer$TransferState
-com.amazonaws.services.securitytoken.model.MalformedPolicyDocumentException
-com.amazonaws.services.securitytoken.model.PackedPolicyTooLargeException
-com.amazonaws.services.simpledb.model.AttributeDoesNotExistException
-com.amazonaws.services.simpledb.model.DuplicateItemNameException
-com.amazonaws.services.simpledb.model.InvalidNextTokenException
-com.amazonaws.services.simpledb.model.InvalidNumberPredicatesException
-com.amazonaws.services.simpledb.model.InvalidNumberValueTestsException
-com.amazonaws.services.simpledb.model.InvalidParameterValueException
-com.amazonaws.services.simpledb.model.InvalidQueryExpressionException
-com.amazonaws.services.simpledb.model.MissingParameterException
-com.amazonaws.services.simpledb.model.NoSuchDomainException
-com.amazonaws.services.simpledb.model.NumberDomainAttributesExceededException
-com.amazonaws.services.simpledb.model.NumberDomainBytesExceededException
-com.amazonaws.services.simpledb.model.NumberDomainsExceededException
-com.amazonaws.services.simpledb.model.NumberItemAttributesExceededException
-com.amazonaws.services.simpledb.model.NumberSubmittedAttributesExceededException
-com.amazonaws.services.simpledb.model.NumberSubmittedItemsExceededException
-com.amazonaws.services.simpledb.model.RequestTimeoutException
-com.amazonaws.services.simpledb.model.TooManyRequestedAttributesException
-com.amazonaws.services.simpleemail.model.IdentityType
-com.amazonaws.services.simpleemail.model.MessageRejectedException
-com.amazonaws.services.simpleemail.model.NotificationType
-com.amazonaws.services.simpleemail.model.VerificationStatus
-com.amazonaws.services.simpleworkflow.flow.ActivityFailureException
-com.amazonaws.services.simpleworkflow.flow.ActivityTaskFailedException
-com.amazonaws.services.simpleworkflow.flow.ActivityTaskTimedOutException
-com.amazonaws.services.simpleworkflow.flow.ChildWorkflowFailedException
-com.amazonaws.services.simpleworkflow.flow.ChildWorkflowTerminatedException
-com.amazonaws.services.simpleworkflow.flow.ChildWorkflowTimedOutException
-com.amazonaws.services.simpleworkflow.flow.DataConverterException
-com.amazonaws.services.simpleworkflow.flow.ScheduleActivityTaskFailedException
-com.amazonaws.services.simpleworkflow.flow.SignalExternalWorkflowException
-com.amazonaws.services.simpleworkflow.flow.StartChildWorkflowFailedException
-com.amazonaws.services.simpleworkflow.flow.StartTimerFailedException
-com.amazonaws.services.simpleworkflow.flow.WorkflowException
-com.amazonaws.services.simpleworkflow.flow.common.FlowValueConstraint
-com.amazonaws.services.simpleworkflow.flow.core.TryCatchFinally$State
-com.amazonaws.services.simpleworkflow.flow.worker.DecisionState
-com.amazonaws.services.simpleworkflow.flow.worker.DecisionTarget
-com.amazonaws.services.simpleworkflow.model.ActivityTaskTimeoutType
-com.amazonaws.services.simpleworkflow.model.CancelTimerFailedCause
-com.amazonaws.services.simpleworkflow.model.CancelWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.ChildPolicy
-com.amazonaws.services.simpleworkflow.model.CloseStatus
-com.amazonaws.services.simpleworkflow.model.CompleteWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.ContinueAsNewWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.DecisionTaskTimeoutType
-com.amazonaws.services.simpleworkflow.model.DecisionType
-com.amazonaws.services.simpleworkflow.model.DefaultUndefinedException
-com.amazonaws.services.simpleworkflow.model.DomainAlreadyExistsException
-com.amazonaws.services.simpleworkflow.model.DomainDeprecatedException
-com.amazonaws.services.simpleworkflow.model.EventType
-com.amazonaws.services.simpleworkflow.model.ExecutionStatus
-com.amazonaws.services.simpleworkflow.model.FailWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.LimitExceededException
-com.amazonaws.services.simpleworkflow.model.OperationNotPermittedException
-com.amazonaws.services.simpleworkflow.model.PredefinedDuration
-com.amazonaws.services.simpleworkflow.model.RegistrationStatus
-com.amazonaws.services.simpleworkflow.model.RequestCancelActivityTaskFailedCause
-com.amazonaws.services.simpleworkflow.model.RequestCancelExternalWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.ScheduleActivityTaskFailedCause
-com.amazonaws.services.simpleworkflow.model.SignalExternalWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.StartChildWorkflowExecutionFailedCause
-com.amazonaws.services.simpleworkflow.model.StartTimerFailedCause
-com.amazonaws.services.simpleworkflow.model.TypeAlreadyExistsException
-com.amazonaws.services.simpleworkflow.model.TypeDeprecatedException
-com.amazonaws.services.simpleworkflow.model.UnknownResourceException
-com.amazonaws.services.simpleworkflow.model.WorkflowExecutionAlreadyStartedException
-com.amazonaws.services.simpleworkflow.model.WorkflowExecutionCancelRequestedCause
-com.amazonaws.services.simpleworkflow.model.WorkflowExecutionTerminatedCause
-com.amazonaws.services.simpleworkflow.model.WorkflowExecutionTimeoutType
-com.amazonaws.services.sns.model.AuthorizationErrorException
-com.amazonaws.services.sns.model.InternalErrorException
-com.amazonaws.services.sns.model.InvalidParameterException
-com.amazonaws.services.sns.model.NotFoundException
-com.amazonaws.services.sns.model.SubscriptionLimitExceededException
-com.amazonaws.services.sns.model.TopicLimitExceededException
-com.amazonaws.services.sqs.model.BatchEntryIdsNotDistinctException
-com.amazonaws.services.sqs.model.BatchRequestTooLongException
-com.amazonaws.services.sqs.model.EmptyBatchRequestException
-com.amazonaws.services.sqs.model.InvalidAttributeNameException
-com.amazonaws.services.sqs.model.InvalidBatchEntryIdException
-com.amazonaws.services.sqs.model.InvalidIdFormatException
-com.amazonaws.services.sqs.model.InvalidMessageContentsException
-com.amazonaws.services.sqs.model.MessageNotInflightException
-com.amazonaws.services.sqs.model.OverLimitException
-com.amazonaws.services.sqs.model.QueueAttributeName
-com.amazonaws.services.sqs.model.QueueDeletedRecentlyException
-com.amazonaws.services.sqs.model.QueueDoesNotExistException
-com.amazonaws.services.sqs.model.QueueNameExistsException
-com.amazonaws.services.sqs.model.ReceiptHandleIsInvalidException
-com.amazonaws.services.sqs.model.TooManyEntriesInBatchRequestException
-com.amazonaws.services.storagegateway.model.BandwidthType
-com.amazonaws.services.storagegateway.model.DiskAllocationType
-com.amazonaws.services.storagegateway.model.ErrorCode
-com.amazonaws.services.storagegateway.model.GatewayState
-com.amazonaws.services.storagegateway.model.GatewayTimezone
-com.amazonaws.services.storagegateway.model.InternalServerErrorException
-com.amazonaws.services.storagegateway.model.InvalidGatewayRequestException
-com.amazonaws.services.storagegateway.model.VolumeStatus
-com.amazonaws.services.storagegateway.model.VolumeType
-com.amazonaws.util.AWSRequestMetrics$Field
-com.amazonaws.util.json.JSONException
-com.beust.jcommander.MissingCommandException
-com.beust.jcommander.ParameterException
-com.enterprisedt.BaseIOException
-com.enterprisedt.net.ftp.FTPException
-com.enterprisedt.net.ftp.FTPTransferCancelledException
-com.google.common.base.Absent
-com.google.common.base.AbstractIterator$State
-com.google.common.base.CaseFormat$1
-com.google.common.base.CaseFormat$2
-com.google.common.base.CaseFormat$3
-com.google.common.base.CaseFormat$4
-com.google.common.base.CaseFormat$5
-com.google.common.base.Enums$ValueOfFunction
-com.google.common.base.Equivalence$Equals
-com.google.common.base.Equivalence$EquivalentToPredicate
-com.google.common.base.Equivalence$Identity
-com.google.common.base.Equivalence$Wrapper
-com.google.common.base.FunctionalEquivalence
-com.google.common.base.Functions$ConstantFunction
-com.google.common.base.Functions$ForMapWithDefault
-com.google.common.base.Functions$FunctionComposition
-com.google.common.base.Functions$FunctionForMapNoDefault
-com.google.common.base.Functions$IdentityFunction
-com.google.common.base.Functions$PredicateFunction
-com.google.common.base.Functions$SupplierFunction
-com.google.common.base.Functions$ToStringFunction
-com.google.common.base.PairwiseEquivalence
-com.google.common.base.Predicates$AndPredicate
-com.google.common.base.Predicates$AssignableFromPredicate
-com.google.common.base.Predicates$CompositionPredicate
-com.google.common.base.Predicates$ContainsPatternPredicate
-com.google.common.base.Predicates$InPredicate
-com.google.common.base.Predicates$InstanceOfPredicate
-com.google.common.base.Predicates$IsEqualToPredicate
-com.google.common.base.Predicates$NotPredicate
-com.google.common.base.Predicates$ObjectPredicate$1
-com.google.common.base.Predicates$ObjectPredicate$2
-com.google.common.base.Predicates$ObjectPredicate$3
-com.google.common.base.Predicates$ObjectPredicate$4
-com.google.common.base.Predicates$OrPredicate
-com.google.common.base.Present
-com.google.common.base.Suppliers$ExpiringMemoizingSupplier
-com.google.common.base.Suppliers$MemoizingSupplier
-com.google.common.base.Suppliers$SupplierComposition
-com.google.common.base.Suppliers$SupplierFunction
-com.google.common.base.Suppliers$SupplierOfInstance
-com.google.common.base.Suppliers$ThreadSafeSupplier
-com.google.common.base.internal.Finalizer$ShutDown
-com.google.common.cache.CacheBuilder$NullListener
-com.google.common.cache.CacheBuilder$OneWeigher
-com.google.common.cache.CacheLoader$FunctionToCacheLoader
-com.google.common.cache.CacheLoader$InvalidCacheLoadException
-com.google.common.cache.CacheLoader$SupplierToCacheLoader
-com.google.common.cache.CacheLoader$UnsupportedLoadingOperationException
-com.google.common.cache.LocalCache$EntryFactory$1
-com.google.common.cache.LocalCache$EntryFactory$2
-com.google.common.cache.LocalCache$EntryFactory$3
-com.google.common.cache.LocalCache$EntryFactory$4
-com.google.common.cache.LocalCache$EntryFactory$5
-com.google.common.cache.LocalCache$EntryFactory$6
-com.google.common.cache.LocalCache$EntryFactory$7
-com.google.common.cache.LocalCache$EntryFactory$8
-com.google.common.cache.LocalCache$LoadingSerializationProxy
-com.google.common.cache.LocalCache$LocalLoadingCache
-com.google.common.cache.LocalCache$LocalManualCache
-com.google.common.cache.LocalCache$ManualSerializationProxy
-com.google.common.cache.LocalCache$NullEntry
-com.google.common.cache.LocalCache$Segment
-com.google.common.cache.LocalCache$Strength$1
-com.google.common.cache.LocalCache$Strength$2
-com.google.common.cache.LocalCache$Strength$3
-com.google.common.cache.LongAddables$PureJavaLongAddable
-com.google.common.cache.LongAdder
-com.google.common.cache.RemovalCause$1
-com.google.common.cache.RemovalCause$2
-com.google.common.cache.RemovalCause$3
-com.google.common.cache.RemovalCause$4
-com.google.common.cache.RemovalCause$5
-com.google.common.collect.AbstractBiMap$Inverse
-com.google.common.collect.AbstractIterator$State
-com.google.common.collect.AllEqualOrdering
-com.google.common.collect.ArrayListMultimap
-com.google.common.collect.ArrayTable
-com.google.common.collect.BoundType$1
-com.google.common.collect.BoundType$2
-com.google.common.collect.ByFunctionOrdering
-com.google.common.collect.CartesianList$1
-com.google.common.collect.ComparatorOrdering
-com.google.common.collect.CompoundOrdering
-com.google.common.collect.ComputationException
-com.google.common.collect.ComputingConcurrentHashMap
-com.google.common.collect.ComputingConcurrentHashMap$ComputingSegment
-com.google.common.collect.ComputingConcurrentHashMap$ComputingSerializationProxy
-com.google.common.collect.ConcurrentHashMultiset
-com.google.common.collect.Constraints$NotNullConstraint
-com.google.common.collect.Count
-com.google.common.collect.Cut$AboveAll
-com.google.common.collect.Cut$AboveValue
-com.google.common.collect.Cut$BelowAll
-com.google.common.collect.Cut$BelowValue
-com.google.common.collect.DescendingImmutableSortedMultiset
-com.google.common.collect.DescendingImmutableSortedMultiset$1
-com.google.common.collect.DescendingImmutableSortedSet
-com.google.common.collect.DiscreteDomain$BigIntegerDomain
-com.google.common.collect.DiscreteDomain$IntegerDomain
-com.google.common.collect.DiscreteDomain$LongDomain
-com.google.common.collect.EmptyContiguousSet
-com.google.common.collect.EmptyContiguousSet$SerializedForm
-com.google.common.collect.EmptyImmutableBiMap
-com.google.common.collect.EmptyImmutableList
-com.google.common.collect.EmptyImmutableListMultimap
-com.google.common.collect.EmptyImmutableMultiset
-com.google.common.collect.EmptyImmutableSet
-com.google.common.collect.EmptyImmutableSetMultimap
-com.google.common.collect.EmptyImmutableSortedMap
-com.google.common.collect.EmptyImmutableSortedMultiset
-com.google.common.collect.EmptyImmutableSortedSet
-com.google.common.collect.EnumBiMap
-com.google.common.collect.EnumHashBiMap
-com.google.common.collect.EnumMultiset
-com.google.common.collect.ExplicitOrdering
-com.google.common.collect.GeneralRange
-com.google.common.collect.GenericMapMaker$NullListener
-com.google.common.collect.HashBasedTable
-com.google.common.collect.HashBasedTable$Factory
-com.google.common.collect.HashBiMap
-com.google.common.collect.HashBiMap$Inverse
-com.google.common.collect.HashBiMap$InverseSerializedForm
-com.google.common.collect.HashMultimap
-com.google.common.collect.HashMultiset
-com.google.common.collect.ImmutableAsList$SerializedForm
-com.google.common.collect.ImmutableBiMap$SerializedForm
-com.google.common.collect.ImmutableCollection$ArrayImmutableCollection
-com.google.common.collect.ImmutableCollection$EmptyImmutableCollection
-com.google.common.collect.ImmutableCollection$SerializedForm
-com.google.common.collect.ImmutableEntry
-com.google.common.collect.ImmutableEnumMap
-com.google.common.collect.ImmutableEnumMap$1
-com.google.common.collect.ImmutableEnumMap$2
-com.google.common.collect.ImmutableEnumMap$EnumSerializedForm
-com.google.common.collect.ImmutableEnumSet
-com.google.common.collect.ImmutableEnumSet$EnumSerializedForm
-com.google.common.collect.ImmutableList$ReverseImmutableList
-com.google.common.collect.ImmutableList$SerializedForm
-com.google.common.collect.ImmutableList$SubList
-com.google.common.collect.ImmutableListMultimap
-com.google.common.collect.ImmutableMap$1MapViewOfValuesAsSingletonSets
-com.google.common.collect.ImmutableMap$1MapViewOfValuesAsSingletonSets$1
-com.google.common.collect.ImmutableMap$SerializedForm
-com.google.common.collect.ImmutableMapEntrySet$EntrySetSerializedForm
-com.google.common.collect.ImmutableMapKeySet
-com.google.common.collect.ImmutableMapKeySet$1
-com.google.common.collect.ImmutableMapKeySet$KeySetSerializedForm
-com.google.common.collect.ImmutableMapValues
-com.google.common.collect.ImmutableMapValues$1
-com.google.common.collect.ImmutableMapValues$SerializedForm
-com.google.common.collect.ImmutableMultimap$BuilderMultimap
-com.google.common.collect.ImmutableMultimap$EntryCollection
-com.google.common.collect.ImmutableMultimap$Keys
-com.google.common.collect.ImmutableMultimap$Keys$KeysEntrySet
-com.google.common.collect.ImmutableMultimap$Keys$KeysEntrySet$1
-com.google.common.collect.ImmutableMultimap$Values
-com.google.common.collect.ImmutableMultiset$EntrySetSerializedForm
-com.google.common.collect.ImmutableMultiset$SerializedForm
-com.google.common.collect.ImmutableRangeMap$1
-com.google.common.collect.ImmutableRangeSet
-com.google.common.collect.ImmutableRangeSet$1
-com.google.common.collect.ImmutableRangeSet$AsSet
-com.google.common.collect.ImmutableRangeSet$AsSetSerializedForm
-com.google.common.collect.ImmutableRangeSet$ComplementRanges
-com.google.common.collect.ImmutableRangeSet$SerializedForm
-com.google.common.collect.ImmutableSet$SerializedForm
-com.google.common.collect.ImmutableSetMultimap
-com.google.common.collect.ImmutableSetMultimap$BuilderMultimap
-com.google.common.collect.ImmutableSortedAsList
-com.google.common.collect.ImmutableSortedMap$SerializedForm
-com.google.common.collect.ImmutableSortedMultiset$SerializedForm
-com.google.common.collect.ImmutableSortedSet$SerializedForm
-com.google.common.collect.Interners$WeakInterner$Dummy
-com.google.common.collect.LexicographicalOrdering
-com.google.common.collect.LinkedHashMultimap
-com.google.common.collect.LinkedHashMultiset
-com.google.common.collect.LinkedListMultimap
-com.google.common.collect.Lists$OnePlusArrayList
-com.google.common.collect.Lists$StringAsImmutableList
-com.google.common.collect.Lists$TransformingRandomAccessList
-com.google.common.collect.Lists$TransformingSequentialList
-com.google.common.collect.Lists$TwoPlusArrayList
-com.google.common.collect.MapConstraints$ConstrainedListMultimap
-com.google.common.collect.MapConstraints$ConstrainedMultimap
-com.google.common.collect.MapConstraints$ConstrainedSetMultimap
-com.google.common.collect.MapConstraints$ConstrainedSortedSetMultimap
-com.google.common.collect.MapConstraints$NotNullMapConstraint
-com.google.common.collect.MapMaker$ComputingMapAdapter
-com.google.common.collect.MapMaker$NullComputingConcurrentMap
-com.google.common.collect.MapMaker$NullConcurrentMap
-com.google.common.collect.MapMaker$RemovalCause$1
-com.google.common.collect.MapMaker$RemovalCause$2
-com.google.common.collect.MapMaker$RemovalCause$3
-com.google.common.collect.MapMaker$RemovalCause$4
-com.google.common.collect.MapMaker$RemovalCause$5
-com.google.common.collect.MapMaker$RemovalNotification
-com.google.common.collect.MapMakerInternalMap
-com.google.common.collect.MapMakerInternalMap$EntryFactory$1
-com.google.common.collect.MapMakerInternalMap$EntryFactory$2
-com.google.common.collect.MapMakerInternalMap$EntryFactory$3
-com.google.common.collect.MapMakerInternalMap$EntryFactory$4
-com.google.common.collect.MapMakerInternalMap$EntryFactory$5
-com.google.common.collect.MapMakerInternalMap$EntryFactory$6
-com.google.common.collect.MapMakerInternalMap$EntryFactory$7
-com.google.common.collect.MapMakerInternalMap$EntryFactory$8
-com.google.common.collect.MapMakerInternalMap$NullEntry
-com.google.common.collect.MapMakerInternalMap$Segment
-com.google.common.collect.MapMakerInternalMap$SerializationProxy
-com.google.common.collect.MapMakerInternalMap$Strength$1
-com.google.common.collect.MapMakerInternalMap$Strength$2
-com.google.common.collect.MapMakerInternalMap$Strength$3
-com.google.common.collect.Maps$EntryFunction$1
-com.google.common.collect.Maps$EntryFunction$2
-com.google.common.collect.Maps$UnmodifiableBiMap
-com.google.common.collect.Maps$UnmodifiableNavigableMap
-com.google.common.collect.Multimaps$CustomListMultimap
-com.google.common.collect.Multimaps$CustomMultimap
-com.google.common.collect.Multimaps$CustomSetMultimap
-com.google.common.collect.Multimaps$CustomSortedSetMultimap
-com.google.common.collect.Multimaps$MapMultimap
-com.google.common.collect.Multimaps$UnmodifiableListMultimap
-com.google.common.collect.Multimaps$UnmodifiableMultimap
-com.google.common.collect.Multimaps$UnmodifiableSetMultimap
-com.google.common.collect.Multimaps$UnmodifiableSortedSetMultimap
-com.google.common.collect.Multisets$ImmutableEntry
-com.google.common.collect.Multisets$UnmodifiableMultiset
-com.google.common.collect.NaturalOrdering
-com.google.common.collect.NullsFirstOrdering
-com.google.common.collect.NullsLastOrdering
-com.google.common.collect.Ordering$IncomparableValueException
-com.google.common.collect.Range
-com.google.common.collect.RegularContiguousSet
-com.google.common.collect.RegularContiguousSet$SerializedForm
-com.google.common.collect.RegularImmutableAsList
-com.google.common.collect.RegularImmutableBiMap
-com.google.common.collect.RegularImmutableBiMap$1
-com.google.common.collect.RegularImmutableBiMap$BiMapEntry
-com.google.common.collect.RegularImmutableBiMap$Inverse
-com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet
-com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1
-com.google.common.collect.RegularImmutableBiMap$InverseSerializedForm
-com.google.common.collect.RegularImmutableBiMap$NonTerminalBiMapEntry
-com.google.common.collect.RegularImmutableList
-com.google.common.collect.RegularImmutableMap
-com.google.common.collect.RegularImmutableMap$EntrySet
-com.google.common.collect.RegularImmutableMap$NonTerminalEntry
-com.google.common.collect.RegularImmutableMap$TerminalEntry
-com.google.common.collect.RegularImmutableMultiset
-com.google.common.collect.RegularImmutableMultiset$EntrySet
-com.google.common.collect.RegularImmutableMultiset$EntrySet$1
-com.google.common.collect.RegularImmutableSet
-com.google.common.collect.RegularImmutableSortedMap
-com.google.common.collect.RegularImmutableSortedMap$EntrySet
-com.google.common.collect.RegularImmutableSortedMap$EntrySet$1
-com.google.common.collect.RegularImmutableSortedMultiset
-com.google.common.collect.RegularImmutableSortedMultiset$EntrySet
-com.google.common.collect.RegularImmutableSortedMultiset$EntrySet$1
-com.google.common.collect.RegularImmutableSortedSet
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$1
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$Column
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$ColumnMap
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$DenseCellSet
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$DenseCellSet$1
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$Row
-com.google.common.collect.RegularImmutableTable$DenseImmutableTable$RowMap
-com.google.common.collect.RegularImmutableTable$ImmutableArrayMap$1
-com.google.common.collect.RegularImmutableTable$ImmutableArrayMap$2
-com.google.common.collect.RegularImmutableTable$SparseImmutableTable$1
-com.google.common.collect.RegularImmutableTable$SparseImmutableTable$SparseCellSet
-com.google.common.collect.RegularImmutableTable$SparseImmutableTable$SparseCellSet$1
-com.google.common.collect.ReverseNaturalOrdering
-com.google.common.collect.ReverseOrdering
-com.google.common.collect.Sets$CartesianSet$1
-com.google.common.collect.Sets$SetFromMap
-com.google.common.collect.Sets$UnmodifiableNavigableSet
-com.google.common.collect.SingletonImmutableBiMap
-com.google.common.collect.SingletonImmutableList
-com.google.common.collect.SingletonImmutableSet
-com.google.common.collect.SortedLists$KeyAbsentBehavior$1
-com.google.common.collect.SortedLists$KeyAbsentBehavior$2
-com.google.common.collect.SortedLists$KeyAbsentBehavior$3
-com.google.common.collect.SortedLists$KeyPresentBehavior$1
-com.google.common.collect.SortedLists$KeyPresentBehavior$2
-com.google.common.collect.SortedLists$KeyPresentBehavior$3
-com.google.common.collect.SortedLists$KeyPresentBehavior$4
-com.google.common.collect.SortedLists$KeyPresentBehavior$5
-com.google.common.collect.StandardRowSortedTable
-com.google.common.collect.StandardTable
-com.google.common.collect.Synchronized$SynchronizedAsMap
-com.google.common.collect.Synchronized$SynchronizedAsMapEntries
-com.google.common.collect.Synchronized$SynchronizedAsMapValues
-com.google.common.collect.Synchronized$SynchronizedBiMap
-com.google.common.collect.Synchronized$SynchronizedCollection
-com.google.common.collect.Synchronized$SynchronizedEntry
-com.google.common.collect.Synchronized$SynchronizedList
-com.google.common.collect.Synchronized$SynchronizedListMultimap
-com.google.common.collect.Synchronized$SynchronizedMap
-com.google.common.collect.Synchronized$SynchronizedMultimap
-com.google.common.collect.Synchronized$SynchronizedMultiset
-com.google.common.collect.Synchronized$SynchronizedNavigableMap
-com.google.common.collect.Synchronized$SynchronizedNavigableSet
-com.google.common.collect.Synchronized$SynchronizedObject
-com.google.common.collect.Synchronized$SynchronizedQueue
-com.google.common.collect.Synchronized$SynchronizedRandomAccessList
-com.google.common.collect.Synchronized$SynchronizedSet
-com.google.common.collect.Synchronized$SynchronizedSetMultimap
-com.google.common.collect.Synchronized$SynchronizedSortedMap
-com.google.common.collect.Synchronized$SynchronizedSortedSet
-com.google.common.collect.Synchronized$SynchronizedSortedSetMultimap
-com.google.common.collect.Tables$ImmutableCell
-com.google.common.collect.Tables$UnmodifiableRowSortedMap
-com.google.common.collect.Tables$UnmodifiableTable
-com.google.common.collect.TreeBasedTable
-com.google.common.collect.TreeBasedTable$Factory
-com.google.common.collect.TreeMultimap
-com.google.common.collect.TreeMultiset
-com.google.common.collect.TreeMultiset$Aggregate$1
-com.google.common.collect.TreeMultiset$Aggregate$2
-com.google.common.collect.UnmodifiableSortedMultiset
-com.google.common.collect.UsingToStringOrdering
-com.google.common.hash.BloomFilter
-com.google.common.hash.BloomFilter$SerialForm
-com.google.common.hash.BloomFilterStrategies$1
-com.google.common.hash.ChecksumHashFunction
-com.google.common.hash.Funnels$ByteArrayFunnel
-com.google.common.hash.Funnels$IntegerFunnel
-com.google.common.hash.Funnels$LongFunnel
-com.google.common.hash.Funnels$StringFunnel
-com.google.common.hash.HashCodes$BytesHashCode
-com.google.common.hash.HashCodes$IntHashCode
-com.google.common.hash.HashCodes$LongHashCode
-com.google.common.hash.Hashing$ChecksumType$1
-com.google.common.hash.Hashing$ChecksumType$2
-com.google.common.hash.MessageDigestHashFunction
-com.google.common.hash.MessageDigestHashFunction$SerializedForm
-com.google.common.hash.Murmur3_128HashFunction
-com.google.common.hash.Murmur3_32HashFunction
-com.google.common.io.FileWriteMode
-com.google.common.net.HostAndPort
-com.google.common.primitives.Booleans$BooleanArrayAsList
-com.google.common.primitives.Booleans$LexicographicalComparator
-com.google.common.primitives.Bytes$ByteArrayAsList
-com.google.common.primitives.Chars$CharArrayAsList
-com.google.common.primitives.Chars$LexicographicalComparator
-com.google.common.primitives.Doubles$DoubleArrayAsList
-com.google.common.primitives.Doubles$LexicographicalComparator
-com.google.common.primitives.Floats$FloatArrayAsList
-com.google.common.primitives.Floats$LexicographicalComparator
-com.google.common.primitives.Ints$IntArrayAsList
-com.google.common.primitives.Ints$LexicographicalComparator
-com.google.common.primitives.Longs$LexicographicalComparator
-com.google.common.primitives.Longs$LongArrayAsList
-com.google.common.primitives.Shorts$LexicographicalComparator
-com.google.common.primitives.Shorts$ShortArrayAsList
-com.google.common.primitives.SignedBytes$LexicographicalComparator
-com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$PureJavaComparator
-com.google.common.primitives.UnsignedBytes$LexicographicalComparatorHolder$UnsafeComparator
-com.google.common.primitives.UnsignedInteger
-com.google.common.primitives.UnsignedInts$LexicographicalComparator
-com.google.common.primitives.UnsignedLong
-com.google.common.primitives.UnsignedLongs$LexicographicalComparator
-com.google.common.reflect.TypeToken$ClassSet
-com.google.common.reflect.TypeToken$InterfaceSet
-com.google.common.reflect.TypeToken$SimpleTypeToken
-com.google.common.reflect.TypeToken$TypeFilter$1
-com.google.common.reflect.TypeToken$TypeFilter$2
-com.google.common.reflect.TypeToken$TypeSet
-com.google.common.reflect.Types$ClassOwnership$1
-com.google.common.reflect.Types$ClassOwnership$2
-com.google.common.reflect.Types$GenericArrayTypeImpl
-com.google.common.reflect.Types$JavaVersion$2
-com.google.common.reflect.Types$JavaVersion$3
-com.google.common.reflect.Types$ParameterizedTypeImpl
-com.google.common.reflect.Types$WildcardTypeImpl
-com.google.common.util.concurrent.AbstractFuture$Sync
-com.google.common.util.concurrent.AtomicDouble
-com.google.common.util.concurrent.AtomicDoubleArray
-com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantLock
-com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantReadLock
-com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantReadWriteLock
-com.google.common.util.concurrent.CycleDetectingLockFactory$CycleDetectingReentrantWriteLock
-com.google.common.util.concurrent.CycleDetectingLockFactory$ExampleStackTrace
-com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$1
-com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$2
-com.google.common.util.concurrent.CycleDetectingLockFactory$Policies$3
-com.google.common.util.concurrent.CycleDetectingLockFactory$PotentialDeadlockException
-com.google.common.util.concurrent.ExecutionError
-com.google.common.util.concurrent.Service$State
-com.google.common.util.concurrent.Striped$PaddedLock
-com.google.common.util.concurrent.Striped$PaddedSemaphore
-com.google.common.util.concurrent.UncheckedExecutionException
-com.google.common.util.concurrent.UncheckedTimeoutException
-com.google.protobuf.CodedOutputStream$OutOfSpaceException
-com.google.protobuf.DescriptorProtos$DescriptorProto
-com.google.protobuf.DescriptorProtos$DescriptorProto$ExtensionRange
-com.google.protobuf.DescriptorProtos$EnumDescriptorProto
-com.google.protobuf.DescriptorProtos$EnumOptions
-com.google.protobuf.DescriptorProtos$EnumValueDescriptorProto
-com.google.protobuf.DescriptorProtos$EnumValueOptions
-com.google.protobuf.DescriptorProtos$FieldDescriptorProto
-com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Label
-com.google.protobuf.DescriptorProtos$FieldDescriptorProto$Type
-com.google.protobuf.DescriptorProtos$FieldOptions
-com.google.protobuf.DescriptorProtos$FieldOptions$CType
-com.google.protobuf.DescriptorProtos$FileDescriptorProto
-com.google.protobuf.DescriptorProtos$FileDescriptorSet
-com.google.protobuf.DescriptorProtos$FileOptions
-com.google.protobuf.DescriptorProtos$FileOptions$OptimizeMode
-com.google.protobuf.DescriptorProtos$MessageOptions
-com.google.protobuf.DescriptorProtos$MethodDescriptorProto
-com.google.protobuf.DescriptorProtos$MethodOptions
-com.google.protobuf.DescriptorProtos$ServiceDescriptorProto
-com.google.protobuf.DescriptorProtos$ServiceOptions
-com.google.protobuf.DescriptorProtos$SourceCodeInfo
-com.google.protobuf.DescriptorProtos$SourceCodeInfo$Location
-com.google.protobuf.DescriptorProtos$UninterpretedOption
-com.google.protobuf.DescriptorProtos$UninterpretedOption$NamePart
-com.google.protobuf.Descriptors$DescriptorValidationException
-com.google.protobuf.Descriptors$FieldDescriptor$JavaType
-com.google.protobuf.Descriptors$FieldDescriptor$Type
-com.google.protobuf.GeneratedMessageLite$SerializedForm
-com.google.protobuf.InvalidProtocolBufferException
-com.google.protobuf.RpcUtil$AlreadyCalledException
-com.google.protobuf.ServiceException
-com.google.protobuf.TextFormat$InvalidEscapeSequenceException
-com.google.protobuf.TextFormat$ParseException
-com.google.protobuf.UninitializedMessageException
-com.google.protobuf.WireFormat$FieldType
-com.google.protobuf.WireFormat$FieldType$1
-com.google.protobuf.WireFormat$FieldType$2
-com.google.protobuf.WireFormat$FieldType$3
-com.google.protobuf.WireFormat$FieldType$4
-com.google.protobuf.WireFormat$JavaType
-com.jcraft.jsch.ChannelSftp$RequestQueue$OutOfOrderException
-com.jcraft.jsch.JSchAuthCancelException
-com.jcraft.jsch.JSchException
-com.jcraft.jsch.JSchPartialAuthException
-com.jcraft.jsch.SftpException
-com.jidesoft.alert.Alert
-com.jidesoft.alert.InputPopup
-com.jidesoft.animation.CustomAnimation
-com.jidesoft.animation.CustomAnimation$n_
-com.jidesoft.awt.geom.Insets2D$Double
-com.jidesoft.awt.geom.Insets2D$Float
-com.jidesoft.chart.AboveBoundsException
-com.jidesoft.chart.BarLabelPlacement
-com.jidesoft.chart.BarResizePolicy
-com.jidesoft.chart.BelowBoundsException
-com.jidesoft.chart.Chart
-com.jidesoft.chart.ChartBoundsException
-com.jidesoft.chart.ChartException
-com.jidesoft.chart.ChartType
-com.jidesoft.chart.LabelPlacement
-com.jidesoft.chart.Legend
-com.jidesoft.chart.Legend$d_
-com.jidesoft.chart.Legend$e_
-com.jidesoft.chart.Meter
-com.jidesoft.chart.Orientation
-com.jidesoft.chart.PointShape
-com.jidesoft.chart.ShadowVisibility
-com.jidesoft.chart.a
-com.jidesoft.chart.annotation.Rotation
-com.jidesoft.chart.axis.AxisComponent
-com.jidesoft.chart.axis.AxisPlacement
-com.jidesoft.chart.axis.AxisQuantity
-com.jidesoft.chart.axis.AxisType
-com.jidesoft.chart.event.AxisZoomController
-com.jidesoft.chart.event.AxisZoomController$b_
-com.jidesoft.chart.event.ChartValueReporter
-com.jidesoft.chart.event.DirectionZoomEvent
-com.jidesoft.chart.event.ImageChangeEvent
-com.jidesoft.chart.event.PanEvent
-com.jidesoft.chart.event.PanIndicator$Placement
-com.jidesoft.chart.event.PointSelectionEvent
-com.jidesoft.chart.event.RectangleSelectionEvent
-com.jidesoft.chart.event.ZoomDirection
-com.jidesoft.chart.event.ZoomLocation
-com.jidesoft.chart.event.ZoomOrientation
-com.jidesoft.chart.l
-com.jidesoft.chart.model.ChartModelChangeEvent
-com.jidesoft.chart.model.ChartModelChangeType
-com.jidesoft.chart.model.ChartableTableModel
-com.jidesoft.chart.preference.ChartPreferencePanel
-com.jidesoft.chart.preference.LineWidthChooser
-com.jidesoft.chart.preference.PointShapeChooser
-com.jidesoft.chart.preference.PointShapeLabel
-com.jidesoft.chart.preference.PointSizeChooser
-com.jidesoft.chart.render.CandlestickChartType
-com.jidesoft.chart.render.ZAlignment
-com.jidesoft.chart.render.a
-com.jidesoft.chart.servlet.ChartServlet
-com.jidesoft.chart.servlet.ComponentServlet
-com.jidesoft.chart.servlet.JButtonServlet
-com.jidesoft.chart.util.Rotation
-com.jidesoft.combobox.AbstractComboBox$6
-com.jidesoft.combobox.AbstractComboBox$7
-com.jidesoft.combobox.AbstractComboBox$8
-com.jidesoft.combobox.AbstractComboBox$9
-com.jidesoft.combobox.AbstractComboBox$AccessibleJComboBox
-com.jidesoft.combobox.AbstractComboBox$ComboBoxSpinner
-com.jidesoft.combobox.AbstractComboBox$ComboBoxTextField
-com.jidesoft.combobox.AbstractComboBox$DefaultRendererComponent
-com.jidesoft.combobox.AbstractComboBox$DefaultTextFieldEditorComponent
-com.jidesoft.combobox.AbstractComboBox$EditorComponent$0
-com.jidesoft.combobox.AbstractComboBox$EditorComponent$1
-com.jidesoft.combobox.AbstractComboBox$EnterLazyDelegateAction
-com.jidesoft.combobox.AbstractComboBox$LazyDelegateAction
-com.jidesoft.combobox.AbstractComboBox$SpinnerEditorComponent
-com.jidesoft.combobox.AbstractComboBox$a_
-com.jidesoft.combobox.AbstractComboBox$a_$2
-com.jidesoft.combobox.AbstractComboBox$a_$3
-com.jidesoft.combobox.AbstractComboBox$a_$4
-com.jidesoft.combobox.CalculatorComboBox
-com.jidesoft.combobox.CalculatorComboBox$4
-com.jidesoft.combobox.CalculatorComboBox$4$0
-com.jidesoft.combobox.CalculatorComboBox$5
-com.jidesoft.combobox.CalculatorComboBox$5$0
-com.jidesoft.combobox.CalculatorComboBox$6
-com.jidesoft.combobox.CalculatorComboBox$a_
-com.jidesoft.combobox.CalculatorPopupPanel
-com.jidesoft.combobox.CalendarViewer
-com.jidesoft.combobox.CheckBoxListChooserPanel
-com.jidesoft.combobox.CheckBoxListChooserPanel$CheckBoxListWithResourceProvider
-com.jidesoft.combobox.CheckBoxListComboBox
-com.jidesoft.combobox.CheckBoxListComboBox$1
-com.jidesoft.combobox.CheckBoxListExComboBox
-com.jidesoft.combobox.CheckBoxListExComboBox$1
-com.jidesoft.combobox.CheckBoxTreeChooserPanel
-com.jidesoft.combobox.CheckBoxTreeChooserPanel$0
-com.jidesoft.combobox.CheckBoxTreeChooserPanel$d_
-com.jidesoft.combobox.CheckBoxTreeExComboBox
-com.jidesoft.combobox.CheckBoxTreeExComboBox$0
-com.jidesoft.combobox.ColorChooserPanel
-com.jidesoft.combobox.ColorChooserPanel$0
-com.jidesoft.combobox.ColorChooserPanel$10
-com.jidesoft.combobox.ColorChooserPanel$4
-com.jidesoft.combobox.ColorChooserPanel$5
-com.jidesoft.combobox.ColorChooserPanel$6
-com.jidesoft.combobox.ColorChooserPanel$7
-com.jidesoft.combobox.ColorChooserPanel$8
-com.jidesoft.combobox.ColorChooserPanel$9
-com.jidesoft.combobox.ColorChooserPanel$ColorButton
-com.jidesoft.combobox.ColorChooserPanel$b_
-com.jidesoft.combobox.ColorComboBox
-com.jidesoft.combobox.ColorComboBox$ColorEditorComponent
-com.jidesoft.combobox.ColorComboBox$ColorLabel
-com.jidesoft.combobox.ColorComboBox$ColorRendererComponent
-com.jidesoft.combobox.ColorExComboBox
-com.jidesoft.combobox.DateChooserPanel
-com.jidesoft.combobox.DateChooserPanel$0
-com.jidesoft.combobox.DateChooserPanel$1
-com.jidesoft.combobox.DateChooserPanel$16
-com.jidesoft.combobox.DateChooserPanel$17
-com.jidesoft.combobox.DateChooserPanel$18
-com.jidesoft.combobox.DateChooserPanel$19
-com.jidesoft.combobox.DateChooserPanel$2
-com.jidesoft.combobox.DateChooserPanel$20
-com.jidesoft.combobox.DateChooserPanel$21
-com.jidesoft.combobox.DateChooserPanel$22
-com.jidesoft.combobox.DateChooserPanel$23
-com.jidesoft.combobox.DateChooserPanel$24
-com.jidesoft.combobox.DateChooserPanel$25
-com.jidesoft.combobox.DateChooserPanel$26
-com.jidesoft.combobox.DateChooserPanel$27
-com.jidesoft.combobox.DateChooserPanel$4
-com.jidesoft.combobox.DateChooserPanel$d_
-com.jidesoft.combobox.DateComboBox
-com.jidesoft.combobox.DateComboBox$DateEditorComponent
-com.jidesoft.combobox.DateComboBox$DateRendererComponent
-com.jidesoft.combobox.DateExComboBox
-com.jidesoft.combobox.DateModelEvent
-com.jidesoft.combobox.DateSelectionEvent
-com.jidesoft.combobox.DateSpinnerComboBox
-com.jidesoft.combobox.DateSpinnerComboBox$0
-com.jidesoft.combobox.DateSpinnerComboBox$DateSpinnerEditorComponent
-com.jidesoft.combobox.DefaultComboBoxModelWrapper
-com.jidesoft.combobox.ExComboBox$0
-com.jidesoft.combobox.ExComboBox$1
-com.jidesoft.combobox.ExComboBox$2
-com.jidesoft.combobox.ExComboBox$3
-com.jidesoft.combobox.ExComboBox$LazyDelegateAction
-com.jidesoft.combobox.FileChooserComboBox
-com.jidesoft.combobox.FileChooserComboBox$0
-com.jidesoft.combobox.FileChooserComboBox$1
-com.jidesoft.combobox.FileChooserExComboBox
-com.jidesoft.combobox.FileChooserExComboBox$0
-com.jidesoft.combobox.FileChooserExComboBox$1
-com.jidesoft.combobox.FileChooserPanel
-com.jidesoft.combobox.FileNameChooserComboBox
-com.jidesoft.combobox.FileNameChooserComboBox$0
-com.jidesoft.combobox.FileNameChooserComboBox$1
-com.jidesoft.combobox.FileNameChooserExComboBox
-com.jidesoft.combobox.FileNameChooserExComboBox$0
-com.jidesoft.combobox.FileNameChooserExComboBox$1
-com.jidesoft.combobox.FileNameChooserPanel
-com.jidesoft.combobox.FilterableComboBoxModel
-com.jidesoft.combobox.FolderChooserComboBox
-com.jidesoft.combobox.FolderChooserExComboBox
-com.jidesoft.combobox.FolderChooserPanel
-com.jidesoft.combobox.FolderChooserPanel$0
-com.jidesoft.combobox.FolderNameChooserComboBox
-com.jidesoft.combobox.FolderNameChooserExComboBox
-com.jidesoft.combobox.FolderNameChooserPanel
-com.jidesoft.combobox.FontChooserPanel
-com.jidesoft.combobox.FontComboBox
-com.jidesoft.combobox.FontExComboBox
-com.jidesoft.combobox.FontListCellRenderer
-com.jidesoft.combobox.InsetsChooserPanel
-com.jidesoft.combobox.InsetsChooserPanel$1
-com.jidesoft.combobox.InsetsChooserPanel$2
-com.jidesoft.combobox.InsetsChooserPanel$d_
-com.jidesoft.combobox.InsetsComboBox
-com.jidesoft.combobox.InsetsExComboBox
-com.jidesoft.combobox.JideColorSplitButton
-com.jidesoft.combobox.JideColorSplitButton$2
-com.jidesoft.combobox.ListChooserPanel
-com.jidesoft.combobox.ListChooserPanel$2
-com.jidesoft.combobox.ListChooserPanel$Handler
-com.jidesoft.combobox.ListChooserPanel$d_
-com.jidesoft.combobox.ListComboBox
-com.jidesoft.combobox.ListComboBox$1
-com.jidesoft.combobox.ListComboBox$2
-com.jidesoft.combobox.ListComboBox$3
-com.jidesoft.combobox.ListComboBox$4
-com.jidesoft.combobox.ListComboBox$5
-com.jidesoft.combobox.ListComboBox$6
-com.jidesoft.combobox.ListComboBox$7
-com.jidesoft.combobox.ListComboBox$ListEditorComponent
-com.jidesoft.combobox.ListComboBox$ListRendererComponent
-com.jidesoft.combobox.ListExComboBox
-com.jidesoft.combobox.ListExComboBox$0
-com.jidesoft.combobox.MonthChooserPanel
-com.jidesoft.combobox.MonthChooserPanel$0
-com.jidesoft.combobox.MonthChooserPanel$1
-com.jidesoft.combobox.MonthChooserPanel$10
-com.jidesoft.combobox.MonthChooserPanel$11
-com.jidesoft.combobox.MonthChooserPanel$12
-com.jidesoft.combobox.MonthChooserPanel$4
-com.jidesoft.combobox.MonthChooserPanel$5
-com.jidesoft.combobox.MonthChooserPanel$6
-com.jidesoft.combobox.MonthChooserPanel$7
-com.jidesoft.combobox.MonthChooserPanel$8
-com.jidesoft.combobox.MonthChooserPanel$9
-com.jidesoft.combobox.MonthComboBox
-com.jidesoft.combobox.MonthExComboBox
-com.jidesoft.combobox.MultiSelectListChooserPanel
-com.jidesoft.combobox.MultiSelectListChooserPanel$2
-com.jidesoft.combobox.MultiSelectListChooserPanel$3
-com.jidesoft.combobox.MultiSelectListChooserPanel$Handler
-com.jidesoft.combobox.MultiSelectListComboBox
-com.jidesoft.combobox.MultiSelectListComboBox$1
-com.jidesoft.combobox.MultiSelectListExComboBox
-com.jidesoft.combobox.MultiSelectListExComboBox$1
-com.jidesoft.combobox.MultilineStringComboBox
-com.jidesoft.combobox.MultilineStringExComboBox
-com.jidesoft.combobox.MultilineStringPopupPanel
-com.jidesoft.combobox.NumberSpinnerComboBox$NumberSpinner
-com.jidesoft.combobox.NumberSpinnerComboBox$NumberSpinnerEditorComponent
-com.jidesoft.combobox.PopupPanel
-com.jidesoft.combobox.QuickComboBoxFilterField
-com.jidesoft.combobox.SortableComboBoxModel
-com.jidesoft.combobox.StringArrayComboBox
-com.jidesoft.combobox.StringArrayExComboBox
-com.jidesoft.combobox.StringArrayPopupPanel
-com.jidesoft.combobox.TableChooserPanel
-com.jidesoft.combobox.TableChooserPanel$3
-com.jidesoft.combobox.TableChooserPanel$c_
-com.jidesoft.combobox.TableComboBox
-com.jidesoft.combobox.TableComboBox$0
-com.jidesoft.combobox.TableComboBox$3
-com.jidesoft.combobox.TableComboBox$b_
-com.jidesoft.combobox.TableComboBox$b_$0
-com.jidesoft.combobox.TableComboBox$b_$1
-com.jidesoft.combobox.TableComboBox$c_
-com.jidesoft.combobox.TableComboBox$c_$1
-com.jidesoft.combobox.TableComboBox$c_$2
-com.jidesoft.combobox.TableExComboBox
-com.jidesoft.combobox.TableExComboBox$2
-com.jidesoft.combobox.TableExComboBox$b_
-com.jidesoft.combobox.TreeChooserPanel
-com.jidesoft.combobox.TreeChooserPanel$2
-com.jidesoft.combobox.TreeChooserPanel$3
-com.jidesoft.combobox.TreeChooserPanel$b_
-com.jidesoft.combobox.TreeComboBox
-com.jidesoft.combobox.TreeComboBox$0
-com.jidesoft.combobox.TreeComboBox$2
-com.jidesoft.combobox.TreeComboBox$b_
-com.jidesoft.combobox.TreeExComboBox
-com.jidesoft.combobox.TreeExComboBox$0
-com.jidesoft.comparator.CharSequenceComparator
-com.jidesoft.comparator.ComparableComparator
-com.jidesoft.comparator.ComparatorContext
-com.jidesoft.comparator.FastComparableComparator
-com.jidesoft.converter.ConverterContext
-com.jidesoft.converter.RegistrationEvent
-com.jidesoft.csv.CsvParseEvent
-com.jidesoft.csv.CsvParseEvent$EventType
-com.jidesoft.csv.a$a_
-com.jidesoft.dialog.BannerPanel
-com.jidesoft.dialog.BannerPanel$1
-com.jidesoft.dialog.BannerPanel$3
-com.jidesoft.dialog.ButtonEvent
-com.jidesoft.dialog.ButtonPanel
-com.jidesoft.dialog.ButtonPanelLayout
-com.jidesoft.dialog.DialogPageListCellRenderer
-com.jidesoft.dialog.DialogPageTreeCellRenderer
-com.jidesoft.dialog.JideOptionPane
-com.jidesoft.dialog.MultiplePageDialog
-com.jidesoft.dialog.MultiplePageDialog$1
-com.jidesoft.dialog.MultiplePageDialog$14
-com.jidesoft.dialog.MultiplePageDialog$16
-com.jidesoft.dialog.MultiplePageDialog$18
-com.jidesoft.dialog.MultiplePageDialog$2
-com.jidesoft.dialog.MultiplePageDialog$3
-com.jidesoft.dialog.MultiplePageDialogPane
-com.jidesoft.dialog.MultiplePageDialogPane$1
-com.jidesoft.dialog.MultiplePageDialogPane$12
-com.jidesoft.dialog.MultiplePageDialogPane$14
-com.jidesoft.dialog.MultiplePageDialogPane$16
-com.jidesoft.dialog.MutableTreeNodeEx
-com.jidesoft.dialog.PageEvent
-com.jidesoft.dialog.PageList
-com.jidesoft.dialog.ScrollableButtonPanel
-com.jidesoft.dialog.StandardDialog$2
-com.jidesoft.dialog.StandardDialog$3
-com.jidesoft.dialog.StandardDialog$DefaultStandardDialogPane
-com.jidesoft.dialog.StandardDialog$StandardDialogPropertyChangeListener$1
-com.jidesoft.dialog.StandardDialogPane$1
-com.jidesoft.dialog.StandardDialogPane$2
-com.jidesoft.document.DialogFloatingDocumentContainer
-com.jidesoft.document.DialogFloatingDocumentContainer$4
-com.jidesoft.document.DocumentComponentEvent
-com.jidesoft.document.DocumentPane
-com.jidesoft.document.DocumentPane$32
-com.jidesoft.document.DocumentPane$33
-com.jidesoft.document.DocumentPane$34
-com.jidesoft.document.FrameFloatingDocumentContainer
-com.jidesoft.document.FrameFloatingDocumentContainer$4
-com.jidesoft.document.TdiGroup
-com.jidesoft.document.a
-com.jidesoft.field.IPTextField
-com.jidesoft.field.IPTextField$a_
-com.jidesoft.field.IPTextField$b_
-com.jidesoft.field.IPTextField$c_
-com.jidesoft.field.IPTextField$d_
-com.jidesoft.field.IPTextField$e_
-com.jidesoft.field.IPTextField$k_
-com.jidesoft.field.creditcard.CreditCardTextField
-com.jidesoft.filter.AllFilter
-com.jidesoft.filter.AndFilter
-com.jidesoft.filter.BetweenFilter
-com.jidesoft.filter.CustomFilterEditor
-com.jidesoft.filter.CustomFilterEditor$3
-com.jidesoft.filter.EmptyFilter
-com.jidesoft.filter.EqualFilter
-com.jidesoft.filter.GreaterOrEqualFilter
-com.jidesoft.filter.GreaterThanFilter
-com.jidesoft.filter.InFilter
-com.jidesoft.filter.LastMonthFilter
-com.jidesoft.filter.LastQuarterFilter
-com.jidesoft.filter.LastWeekFilter
-com.jidesoft.filter.LastYearFilter
-com.jidesoft.filter.LessOrEqualFilter
-com.jidesoft.filter.LessThanFilter
-com.jidesoft.filter.LikeFilter
-com.jidesoft.filter.LikeFilter$0
-com.jidesoft.filter.MonthFilter
-com.jidesoft.filter.NextMonthFilter
-com.jidesoft.filter.NextQuarterFilter
-com.jidesoft.filter.NextWeekFilter
-com.jidesoft.filter.NextYearFilter
-com.jidesoft.filter.NoneFilter
-com.jidesoft.filter.NotBetweenFilter
-com.jidesoft.filter.NotEqualFilter
-com.jidesoft.filter.NotFilter
-com.jidesoft.filter.NotInFilter
-com.jidesoft.filter.NotLikeFilter
-com.jidesoft.filter.OrFilter
-com.jidesoft.filter.QuarterFilter
-com.jidesoft.filter.RegexFilter
-com.jidesoft.filter.ThisMonthFilter
-com.jidesoft.filter.ThisQuarterFilter
-com.jidesoft.filter.ThisWeekFilter
-com.jidesoft.filter.ThisYearFilter
-com.jidesoft.filter.TodayFilter
-com.jidesoft.filter.TomorrowFilter
-com.jidesoft.filter.ValueEditor
-com.jidesoft.filter.ValueEditor$2
-com.jidesoft.filter.WildcardFilter
-com.jidesoft.filter.YearFilter
-com.jidesoft.filter.YesterdayFilter
-com.jidesoft.gauge.Bullet
-com.jidesoft.gauge.BulletAxisPlacement
-com.jidesoft.gauge.BulletIndicatorLegendItem
-com.jidesoft.gauge.BulletIntervalMarkerLegendItem
-com.jidesoft.gauge.BulletLabel
-com.jidesoft.gauge.Clock
-com.jidesoft.gauge.Dial
-com.jidesoft.gauge.DialIntervalMarkerLegendItem
-com.jidesoft.gauge.DialLabelOrientation
-com.jidesoft.gauge.GaugeModelEvent
-com.jidesoft.gauge.LineLabelPlacement
-com.jidesoft.gauge.MarkerShape
-com.jidesoft.gauge.NeedleEndShape
-com.jidesoft.gauge.NeedleLegendItem
-com.jidesoft.gauge.PointerIndicatorPlacement
-com.jidesoft.gauge.PointerLabelPlacement
-com.jidesoft.grid.AutoFilterBox
-com.jidesoft.grid.AutoFilterBox$10
-com.jidesoft.grid.AutoFilterBox$7
-com.jidesoft.grid.AutoFilterBox$9
-com.jidesoft.grid.AutoFilterBox$AutoFilterBoxFilterField
-com.jidesoft.grid.AutoFilterBox$AutoFilterBoxFilterField$a_
-com.jidesoft.grid.AutoFilterTableHeader
-com.jidesoft.grid.AutoFilterTableHeader$0
-com.jidesoft.grid.AutoFilterTableHeader$1
-com.jidesoft.grid.AutoFilterTableHeaderEditor
-com.jidesoft.grid.AutoFilterTableHeaderRenderer
-com.jidesoft.grid.AutoFilterUtils$5
-com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTable
-com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTable$1
-com.jidesoft.grid.AutoFilterUtils$AutoFilterRowTableModel
-com.jidesoft.grid.AutoFilterUtils$TableWildcardFilter
-com.jidesoft.grid.AutoResizePopupMenuCustomizer$0
-com.jidesoft.grid.AutoResizePopupMenuCustomizer$1
-com.jidesoft.grid.BasicTableModel
-com.jidesoft.grid.BeanTableModel
-com.jidesoft.grid.BooleanCellEditor
-com.jidesoft.grid.BooleanCheckBoxCellEditor
-com.jidesoft.grid.BooleanCheckBoxCellRenderer
-com.jidesoft.grid.ButtonTableCellEditorRenderer
-com.jidesoft.grid.ByteCellEditor
-com.jidesoft.grid.CachedTableModel
-com.jidesoft.grid.CalculatorCellEditor
-com.jidesoft.grid.CalculatorCellEditor$0
-com.jidesoft.grid.CalculatorCellEditor$0$1
-com.jidesoft.grid.CategorizedTable
-com.jidesoft.grid.CellChangeEvent
-com.jidesoft.grid.CellRendererPaneEx
-com.jidesoft.grid.CellSpanTable
-com.jidesoft.grid.CellSpanTable$DelegateAction
-com.jidesoft.grid.CellStyleEditor
-com.jidesoft.grid.CellStyleEditor$1
-com.jidesoft.grid.CellStyleTable
-com.jidesoft.grid.CellStyleTableHeader
-com.jidesoft.grid.CheckBoxListComboBoxCellEditor
-com.jidesoft.grid.CheckBoxTreeComboBoxCellEditor
-com.jidesoft.grid.ColorCellEditor
-com.jidesoft.grid.ColorCellRenderer
-com.jidesoft.grid.ComboBoxShrinkSearchableSupport$0
-com.jidesoft.grid.CompoundTableModelEvent
-com.jidesoft.grid.ContextSensitiveCellRenderer
-com.jidesoft.grid.ContextSensitiveTable
-com.jidesoft.grid.ContextSensitiveTable$0
-com.jidesoft.grid.ContextSensitiveTableTransferHandler
-com.jidesoft.grid.CustomFilterEditorDialog
-com.jidesoft.grid.CustomValueFilterListSelectionModel
-com.jidesoft.grid.DateCellEditor
-com.jidesoft.grid.DefaultColumnTableModelWrapper
-com.jidesoft.grid.DefaultContextSensitiveTableModel
-com.jidesoft.grid.DefaultGroupTableModel
-com.jidesoft.grid.DefaultGroupableTableModel
-com.jidesoft.grid.DefaultMultiTableModel
-com.jidesoft.grid.DefaultNavigableTableModel
-com.jidesoft.grid.DefaultProperty
-com.jidesoft.grid.DefaultSpanTableModel
-com.jidesoft.grid.DefaultStyleTableModel
-com.jidesoft.grid.DefaultTableModelWrapper
-com.jidesoft.grid.DefaultTableSelectionModel
-com.jidesoft.grid.DefaultUndoableTableModel
-com.jidesoft.grid.DimensionCellEditor
-com.jidesoft.grid.DoubleCellEditor
-com.jidesoft.grid.DraggingTableHeader
-com.jidesoft.grid.DualTable
-com.jidesoft.grid.DualTable$4
-com.jidesoft.grid.DualTable$5
-com.jidesoft.grid.DualTable$6
-com.jidesoft.grid.DualTable$7
-com.jidesoft.grid.DualTable$8
-com.jidesoft.grid.DualTable$d_
-com.jidesoft.grid.EditableTableHeader
-com.jidesoft.grid.EditableTableHeader$4
-com.jidesoft.grid.EditableTableHeader$4$0
-com.jidesoft.grid.EditingNotStoppedException
-com.jidesoft.grid.EditorContext
-com.jidesoft.grid.EnumCellEditor
-com.jidesoft.grid.EnumCellRenderer
-com.jidesoft.grid.ExpandablePanel
-com.jidesoft.grid.ExpandableTableCellRenderer
-com.jidesoft.grid.Field
-com.jidesoft.grid.FileCellEditor
-com.jidesoft.grid.FileNameCellEditor
-com.jidesoft.grid.FilterEvent
-com.jidesoft.grid.FilterListCellRenderer
-com.jidesoft.grid.FilterableTableModel
-com.jidesoft.grid.FilterableTableModel$0
-com.jidesoft.grid.FilterableTableModel$1
-com.jidesoft.grid.FilterableTableModelEvent
-com.jidesoft.grid.FilterableTreeTableModel
-com.jidesoft.grid.FloatCellEditor
-com.jidesoft.grid.FolderCellEditor
-com.jidesoft.grid.FolderNameCellEditor
-com.jidesoft.grid.FontCellEditor
-com.jidesoft.grid.FontNameCellEditor
-com.jidesoft.grid.FontNameCellEditor$a_
-com.jidesoft.grid.FormattedTextFieldCellEditor
-com.jidesoft.grid.FormattedTextFieldCellEditor$0
-com.jidesoft.grid.FormattedTextFieldCellEditor$1
-com.jidesoft.grid.GroupTable
-com.jidesoft.grid.GroupTableHeader
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$0
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$1
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$2
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$3
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$4
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$5
-com.jidesoft.grid.GroupTablePopupMenuCustomizer$6
-com.jidesoft.grid.HierarchicalPanel
-com.jidesoft.grid.HierarchicalPanel$c_
-com.jidesoft.grid.HierarchicalTable
-com.jidesoft.grid.HierarchicalTable$HierarchicalTableAction
-com.jidesoft.grid.HierarchicalTableCellRenderer
-com.jidesoft.grid.HyperlinkTableCellEditorRenderer
-com.jidesoft.grid.IFilterableTableModel$FilterItem
-com.jidesoft.grid.IPAddressCellEditor
-com.jidesoft.grid.ISortableTableModel$SortItem
-com.jidesoft.grid.IconCellRenderer
-com.jidesoft.grid.IconRenderer
-com.jidesoft.grid.IndexChangeEvent
-com.jidesoft.grid.IndexChangeListenerHelper
-com.jidesoft.grid.InsetsCellEditor
-com.jidesoft.grid.IntegerCellEditor
-com.jidesoft.grid.JideTable
-com.jidesoft.grid.JideTable$10
-com.jidesoft.grid.JideTable$22
-com.jidesoft.grid.JideTable$23
-com.jidesoft.grid.JideTable$24
-com.jidesoft.grid.JideTable$25
-com.jidesoft.grid.JideTable$26
-com.jidesoft.grid.JideTable$27
-com.jidesoft.grid.JideTable$NonContiguousTransferHandler
-com.jidesoft.grid.JideTable$s_
-com.jidesoft.grid.JideTable$t_
-com.jidesoft.grid.JideTable$u_
-com.jidesoft.grid.JideTableTransferHandler
-com.jidesoft.grid.JoinTableModel
-com.jidesoft.grid.LegacyBooleanCellEditor
-com.jidesoft.grid.LegacyCheckBoxListComboBoxCellEditor
-com.jidesoft.grid.LegacyColorCellEditor
-com.jidesoft.grid.LegacyColorCellRenderer
-com.jidesoft.grid.LegacyDateCellEditor
-com.jidesoft.grid.LegacyEnumCellEditor
-com.jidesoft.grid.LegacyEnumCellRenderer
-com.jidesoft.grid.LegacyFileCellEditor
-com.jidesoft.grid.LegacyFileNameCellEditor
-com.jidesoft.grid.LegacyFolderCellEditor
-com.jidesoft.grid.LegacyFolderNameCellEditor
-com.jidesoft.grid.LegacyFontNameCellEditor
-com.jidesoft.grid.LegacyFontNameCellEditor$a_
-com.jidesoft.grid.LegacyInsetsCellEditor
-com.jidesoft.grid.LegacyListComboBoxCellEditor
-com.jidesoft.grid.LegacyMonthCellEditor
-com.jidesoft.grid.LegacyMultilineStringCellEditor
-com.jidesoft.grid.LegacySortableTableHeader
-com.jidesoft.grid.LegacyStringArrayCellEditor
-com.jidesoft.grid.LegacyTableComboBoxCellEditor
-com.jidesoft.grid.LegacyTreeComboBoxCellEditor
-com.jidesoft.grid.ListComboBoxCellEditor
-com.jidesoft.grid.ListComboBoxShrinkSearchableSupport$0
-com.jidesoft.grid.ListSelectionModelGroup
-com.jidesoft.grid.ListShrinkSearchableSupport$0
-com.jidesoft.grid.ListTableModelAdapter
-com.jidesoft.grid.LongCellEditor
-com.jidesoft.grid.MarginExpandablePanel
-com.jidesoft.grid.MixedTableSelectionModelGroup
-com.jidesoft.grid.MixedTableSelectionModelGroup$0
-com.jidesoft.grid.MonthCellEditor
-com.jidesoft.grid.MultiValuedMap
-com.jidesoft.grid.MultilineStringCellEditor
-com.jidesoft.grid.MultilineStringCellRenderer
-com.jidesoft.grid.MultilineTableCellEditor
-com.jidesoft.grid.MultilineTableCellRenderer
-com.jidesoft.grid.MultilineTableCellRenderer$UIResource
-com.jidesoft.grid.MultipleEnumCellEditor
-com.jidesoft.grid.MultipleValuesFilter
-com.jidesoft.grid.NavigableTable
-com.jidesoft.grid.NavigationHierarchicalTable
-com.jidesoft.grid.NavigationSortableTable
-com.jidesoft.grid.NavigationTreeTable
-com.jidesoft.grid.NestedSortableTableHeader
-com.jidesoft.grid.NestedTableHeader
-com.jidesoft.grid.NumberCellEditor
-com.jidesoft.grid.NumberCellRenderer
-com.jidesoft.grid.PasswordCellEditor
-com.jidesoft.grid.PasswordCellRenderer
-com.jidesoft.grid.PointCellEditor
-com.jidesoft.grid.PropertyPane
-com.jidesoft.grid.PropertyPane$0
-com.jidesoft.grid.PropertyPane$3
-com.jidesoft.grid.PropertyPane$4
-com.jidesoft.grid.PropertyPane$5
-com.jidesoft.grid.PropertyPane$6
-com.jidesoft.grid.PropertyPane$7
-com.jidesoft.grid.PropertyTable
-com.jidesoft.grid.PropertyTable$0
-com.jidesoft.grid.PropertyTableCellRenderer
-com.jidesoft.grid.PropertyTableModel
-com.jidesoft.grid.QuickFilterField$1
-com.jidesoft.grid.QuickFilterField$2
-com.jidesoft.grid.QuickFilterField$3
-com.jidesoft.grid.QuickFilterField$4
-com.jidesoft.grid.QuickFilterField$5
-com.jidesoft.grid.QuickFilterField$6
-com.jidesoft.grid.QuickFilterField$7
-com.jidesoft.grid.QuickFilterField$8
-com.jidesoft.grid.QuickFilterField$9
-com.jidesoft.grid.QuickFilterField$FieldFilter
-com.jidesoft.grid.QuickFilterPane
-com.jidesoft.grid.QuickFilterPane$0
-com.jidesoft.grid.QuickFilterPane$1
-com.jidesoft.grid.QuickFilterPane$2
-com.jidesoft.grid.QuickFilterPane$QuickFilterCheckBoxList
-com.jidesoft.grid.QuickFilterPane$QuickFilterList
-com.jidesoft.grid.QuickTableFilterField
-com.jidesoft.grid.QuickTableFilterField$0
-com.jidesoft.grid.QuickTableFilterField$0$1
-com.jidesoft.grid.QuickTableFilterField$1
-com.jidesoft.grid.QuickTableFilterField$1$0
-com.jidesoft.grid.QuickTableFilterField$10
-com.jidesoft.grid.QuickTableFilterField$3
-com.jidesoft.grid.QuickTableFilterField$4
-com.jidesoft.grid.QuickTableFilterField$5
-com.jidesoft.grid.QuickTableFilterField$6
-com.jidesoft.grid.QuickTableFilterField$7
-com.jidesoft.grid.QuickTableFilterField$8
-com.jidesoft.grid.QuickTableFilterField$9
-com.jidesoft.grid.QuickTableFilterField$FieldTableFilter
-com.jidesoft.grid.QuickTableFilterField$c_
-com.jidesoft.grid.RectangleCellEditor
-com.jidesoft.grid.RowHeightChangeEvent
-com.jidesoft.grid.SelectTablePopupMenuCustomizer$0
-com.jidesoft.grid.SelectTablePopupMenuCustomizer$1
-com.jidesoft.grid.ShortCellEditor
-com.jidesoft.grid.SingleValueFilter
-com.jidesoft.grid.SliderCellEditor
-com.jidesoft.grid.SortEvent
-com.jidesoft.grid.SortItemEditor
-com.jidesoft.grid.SortOrderEditor
-com.jidesoft.grid.SortTableHeaderRenderer$a_
-com.jidesoft.grid.SortTableHeaderRenderer$b_
-com.jidesoft.grid.SortableTable
-com.jidesoft.grid.SortableTableHeader
-com.jidesoft.grid.SortableTableModel
-com.jidesoft.grid.SortableTableModel$1
-com.jidesoft.grid.SortableTableModel$2
-com.jidesoft.grid.SortableTableModel$3
-com.jidesoft.grid.SortableTreeTableModel
-com.jidesoft.grid.SpanModelEvent
-com.jidesoft.grid.SpinnerCellEditor
-com.jidesoft.grid.SpinnerCellEditor$0
-com.jidesoft.grid.SpinnerCellEditor$0$1
-com.jidesoft.grid.SpinnerCellEditor$0$2
-com.jidesoft.grid.SpinnerCellEditor$0$3
-com.jidesoft.grid.SpinnerCellEditor$0$4
-com.jidesoft.grid.StringArrayCellEditor
-com.jidesoft.grid.StringCellEditor
-com.jidesoft.grid.StyledTableCellRenderer
-com.jidesoft.grid.StyledTableCellRenderer$UIResource
-com.jidesoft.grid.TableCellStyleEditor
-com.jidesoft.grid.TableColumnChooser$0
-com.jidesoft.grid.TableColumnChooser$1
-com.jidesoft.grid.TableColumnChooser$2
-com.jidesoft.grid.TableColumnChooser$3
-com.jidesoft.grid.TableColumnChooser$4
-com.jidesoft.grid.TableColumnChooser$5
-com.jidesoft.grid.TableColumnChooserDialog
-com.jidesoft.grid.TableColumnChooserDialog$0
-com.jidesoft.grid.TableColumnChooserDialog$1
-com.jidesoft.grid.TableColumnChooserDialog$5
-com.jidesoft.grid.TableColumnChooserDialog$6
-com.jidesoft.grid.TableColumnChooserDialog$7
-com.jidesoft.grid.TableColumnChooserDialog$8
-com.jidesoft.grid.TableColumnChooserDialog$j_
-com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$2
-com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$3
-com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$4
-com.jidesoft.grid.TableColumnChooserPopupMenuCustomizer$5
-com.jidesoft.grid.TableColumnGroup
-com.jidesoft.grid.TableComboBoxCellEditor
-com.jidesoft.grid.TableComboBoxShrinkSearchableSupport$0
-com.jidesoft.grid.TableCustomFilterEditor
-com.jidesoft.grid.TableCustomFilterEditor$0
-com.jidesoft.grid.TableCustomFilterEditor$10
-com.jidesoft.grid.TableCustomFilterEditor$11
-com.jidesoft.grid.TableCustomFilterEditor$5
-com.jidesoft.grid.TableCustomFilterEditor$6
-com.jidesoft.grid.TableCustomFilterEditor$7
-com.jidesoft.grid.TableCustomFilterEditor$8
-com.jidesoft.grid.TableCustomFilterEditor$9
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$2
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$3
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$4
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$5
-com.jidesoft.grid.TableCustomFilterEditor$FilterPanel$6
-com.jidesoft.grid.TableModelWrapperImpl
-com.jidesoft.grid.TableScrollPane
-com.jidesoft.grid.TableSelectionEvent
-com.jidesoft.grid.TableSelectionModelGroup
-com.jidesoft.grid.TableSelectionModelGroup$0
-com.jidesoft.grid.TableShrinkSearchableSupport$0
-com.jidesoft.grid.TableSortItemEditor
-com.jidesoft.grid.TableSortItemEditor$2
-com.jidesoft.grid.TableSplitPane
-com.jidesoft.grid.TableSplitPane$0
-com.jidesoft.grid.TableUtils$ab_
-com.jidesoft.grid.TableUtils$bb_
-com.jidesoft.grid.TableUtils$cb_
-com.jidesoft.grid.TableUtils$s_
-com.jidesoft.grid.TableUtils$t_
-com.jidesoft.grid.TableUtils$u_
-com.jidesoft.grid.TableUtils$v_
-com.jidesoft.grid.TableUtils$w_
-com.jidesoft.grid.TableUtils$x_
-com.jidesoft.grid.TableUtils$y_
-com.jidesoft.grid.TableUtils$z_
-com.jidesoft.grid.TextFieldCellEditor
-com.jidesoft.grid.TextFieldCellEditor$0
-com.jidesoft.grid.TransposeTableModel
-com.jidesoft.grid.TreeComboBoxCellEditor
-com.jidesoft.grid.TreeExpandablePanel
-com.jidesoft.grid.TreeLikeHierarchicalPanel
-com.jidesoft.grid.TreeTable
-com.jidesoft.grid.TreeTable$TreeTableAction
-com.jidesoft.grid.TreeTableCellRenderer
-com.jidesoft.grid.TreeTableModel$b_
-com.jidesoft.grid.TristateCheckBoxCellEditor
-com.jidesoft.grid.TristateCheckBoxCellRenderer
-com.jidesoft.grid.UndoableTableModelEvent
-com.jidesoft.grid.ValueFilterListSelectionModel
-com.jidesoft.grid.VerticalContextSensitiveCellRenderer
-com.jidesoft.grid.VerticalTableCellRenderer
-com.jidesoft.grid.VerticalTableCellRenderer$UIResource
-com.jidesoft.grid.a
-com.jidesoft.grid.j
-com.jidesoft.grid.k
-com.jidesoft.grid.l
-com.jidesoft.grid.l$0
-com.jidesoft.grid.m
-com.jidesoft.grid.m$a_
-com.jidesoft.grid.n
-com.jidesoft.grid.o
-com.jidesoft.grouper.GrouperContext
-com.jidesoft.hints.AbstractIntelliHint

<TRUNCATED>

[04/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
index 22add9f..2e67628 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxAdapter.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
index ed6be64..24ff561 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.cache.*;
 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.near.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
index 8bf0eb0..b3e399c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
index bc5bb1d..5896389 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheWriteBehindStore.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.lifecycle.*;
 import org.gridgain.grid.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.store.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.interop.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java
index 437e3c2..c11b676 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/affinity/GridCacheAffinityImpl.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.cache.affinity;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.portables.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
index 2818673..ee6ef24 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicLongImpl.java
@@ -14,7 +14,7 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.datastructures.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.IgniteLogger;
+import org.apache.ignite.IgniteLogger;
 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/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
index 2ddae42..fdb9cbc 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicReferenceImpl.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.cache.datastructures;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.datastructures.*;
 import org.gridgain.grid.kernal.processors.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/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
index 0d29c30..e2f5c93 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicSequenceImpl.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.cache.datastructures;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.datastructures.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
index 0cb63f9..3fd2147 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheAtomicStampedImpl.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.cache.datastructures;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.datastructures.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
index e77faf8..692b994 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheCountDownLatchImpl.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.cache.datastructures;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 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.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueAdapter.java
index b01cee1..6eb742b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheQueueAdapter.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.datastructures;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.cache.datastructures.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.tostring.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java
index ca9e556..57a3085 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheSetImpl.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.datastructures;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -18,7 +19,6 @@ import org.gridgain.grid.cache.datastructures.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
index 493e814..9056916 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
index 33e05f4..c7284b3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePerThreadTxCommitBuffer.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jdk8.backport.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxFinishSync.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxFinishSync.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxFinishSync.java
index b063d24..8541d57 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxFinishSync.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheTxFinishSync.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.future.*;
 import org.jdk8.backport.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridClientPartitionTopology.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index 0d08ec5..1ce0d4a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
index 6db733b..141efc3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtGetFuture.java
index bf98b41..e649265 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 72fb817..75ada8f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
index e774e78..63b3d00 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 3dd6464..65528c7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 8456527..6234230 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index d2e922e..c434d86 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
 import org.gridgain.grid.kernal.processors.dr.*;
-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/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index e3f5e29..d1511ff 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 59cfd1c..6063641 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 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.util.future.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index c65f0a7..eba9afb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht.atomic;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -18,7 +19,6 @@ 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.kernal.processors.cache.dr.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 22cd3b6..2d69f7d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -19,7 +20,6 @@ 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.near.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index 50437d7..11143c0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 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.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/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index c5c360a..7e72404 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
index 7b81ec3..6aac752 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 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.thread.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 50e1dab..7f47127 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.dht.preloader;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -18,7 +19,6 @@ import org.gridgain.grid.kernal.managers.discovery.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
index 2dabe40..507094a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.near;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
index cc8c8e9..262f424 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.near;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -18,7 +19,6 @@ import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index a089b0d..48f30dd 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.near;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
index ad277d8..ac6ba7a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.distributed.near;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.kernal.managers.discovery.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.lang.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalLockFuture.java
index 0ca0cff..e0f4cc8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalLockFuture.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.local;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java
index 3e98c08..c9d5a37 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/GridLocalTxFuture.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.cache.local;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 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 org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java
index 3a20cd8..4931e04 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.cache.query;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.security.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryFutureAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryFutureAdapter.java
index 0b3bbf9..dbdeb31 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryFutureAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryFutureAdapter.java
@@ -9,12 +9,12 @@
 
 package org.gridgain.grid.kernal.processors.cache.query;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-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/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
index 638caac..e8bf233 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.cache.query.continuous;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.cache.query.GridCacheContinuousQueryEntry;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.continuous.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.security.*;
 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/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
index 551306e..ff150df 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java
@@ -17,7 +17,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-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/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 034e47d..1d148d2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -18,7 +18,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-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/main/java/org/gridgain/grid/kernal/processors/clock/GridClockServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockServer.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockServer.java
index 3468ca2..cb5028e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockServer.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/clock/GridClockServer.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.processors.clock;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 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/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadUpdateJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadUpdateJob.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadUpdateJob.java
index a3cd9a4..8b01cb3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadUpdateJob.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoadUpdateJob.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.dataload;
 
+import org.apache.ignite.*;
 import org.apache.ignite.dataload.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.lang.*;
 import org.jetbrains.annotations.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
index 192a975..4742476 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dataload/IgniteDataLoaderImpl.java
@@ -22,7 +22,6 @@ import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.portable.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java
index 9c687f2..74b474d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/dr/GridDrDataLoadCacheUpdater.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.dr;
 
+import org.apache.ignite.*;
 import org.apache.ignite.dataload.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.cache.dr.*;
-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/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java
index 956c2bb..c1e2c7e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java
@@ -23,7 +23,6 @@ import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.dataload.*;
 import org.gridgain.grid.kernal.processors.task.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java
index ff1b359..5d4eca2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDeleteWorker.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java
index 7604d8c..a07539b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java
@@ -25,7 +25,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.task.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.future.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java
index 5b33824..2a0240f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.ggfs.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 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/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java
index 4d8e584..decad5a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.ggfs.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.ggfs.common.*;
 import org.gridgain.grid.kernal.processors.closure.*;
 import org.gridgain.grid.kernal.processors.license.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java
index 8edaaf6..246187a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java
@@ -16,7 +16,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.ggfs.mapreduce.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 
 import java.io.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsManager.java
index 83fa9c8..b5f2a32 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsManager.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 
 import java.util.concurrent.atomic.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java
index 916903e..e1b1391 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
@@ -18,7 +19,6 @@ import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
 import org.gridgain.grid.kernal.processors.cache.*;
 import org.gridgain.grid.kernal.processors.task.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.*;
 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/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java
index 65f4c46..48b337e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServer.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.ggfs.common.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.thread.*;
 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/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
index 2abc887..8fef3ac 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.job;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
@@ -19,7 +20,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.task.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-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/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
index b616dc6..c814579 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceCustomInjector.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.resource;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.managed.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
-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/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceLoggerInjector.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceLoggerInjector.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceLoggerInjector.java
index 20a123a..7034257 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceLoggerInjector.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceLoggerInjector.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.resource;
 
+import org.apache.ignite.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
-import org.gridgain.grid.logger.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
index c68cfdd..1c2bc95 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/resource/GridResourceProcessor.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.resource;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.managed.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/GridRestCommandHandlerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/GridRestCommandHandlerAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/GridRestCommandHandlerAdapter.java
index 7d70d99..2067baf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/GridRestCommandHandlerAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/handlers/GridRestCommandHandlerAdapter.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.rest.handlers;
 
+import org.apache.ignite.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 
 /**
  * Abstract command handler.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
index 1d571cf..b6617ba 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.rest.protocols;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.rest.*;
-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/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
index 71b6d80..6c5ddc7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpMemcachedNioListener.java
@@ -9,13 +9,13 @@
 
 package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.processors.rest.*;
 import org.gridgain.grid.kernal.processors.rest.handlers.cache.*;
 import org.gridgain.grid.kernal.processors.rest.request.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.future.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
index bb599b9..987a4cb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/tcp/GridTcpRestNioListener.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest.protocols.tcp;
 
+import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.client.marshaller.*;
 import org.gridgain.grid.*;
@@ -17,7 +18,6 @@ import org.gridgain.grid.kernal.processors.rest.*;
 import org.gridgain.grid.kernal.processors.rest.client.message.*;
 import org.gridgain.grid.kernal.processors.rest.handlers.cache.*;
 import org.gridgain.grid.kernal.processors.rest.request.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.nio.*;
 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/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java
index a71dc9d..f9e61f2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProxy.java
@@ -16,7 +16,6 @@ import org.apache.ignite.managed.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.util.tostring.*;
 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/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessor.java
index 779046c..6717984 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/spring/GridSpringProcessor.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.processors.spring;
 
+import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-import org.gridgain.grid.logger.*;
 
 import java.net.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java
index 6964b0c..2cc2675 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/GridStreamerStageExecutionFuture.java
@@ -9,10 +9,10 @@
 
 package org.gridgain.grid.kernal.processors.streamer;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.streamer.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
index 808160a..49eab46 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/streamer/IgniteStreamerImpl.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.streamer;
 
+import org.apache.ignite.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
@@ -16,7 +17,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.logger.*;
 import org.gridgain.grid.streamer.*;
 import org.gridgain.grid.streamer.router.*;
 import org.gridgain.grid.thread.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
index 4026fee..9d7c705 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.task;
 
+import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.events.*;
@@ -20,7 +21,6 @@ import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.deployment.*;
 import org.gridgain.grid.kernal.processors.job.*;
 import org.gridgain.grid.kernal.processors.timeout.*;
-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/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java
index 520d388..a2dbc88 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java
@@ -9,11 +9,11 @@
 
 package org.gridgain.grid.kernal.visor;
 
+import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.logger.*;
 import org.jetbrains.annotations.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea0d7c6/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java b/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java
index 3c79aee..a4ee985 100644
--- a/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java
+++ b/modules/core/src/main/java/org/gridgain/grid/logger/GridNullLogger.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.logger;
 
+import org.apache.ignite.*;
 import org.jetbrains.annotations.*;
 
 /**


[10/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: ff14819bc45b99c1f5c466a43941b03138d3d1b9
Parents: ee5e27b
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 21:47:48 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 21:47:48 2014 +0300

----------------------------------------------------------------------
 .../singlesplit/GridSingleSplitsLoadTest.java   |   2 +-
 .../gridify/GridifySingleSplitLoadTest.java     |   2 +-
 .../router/GridTcpRouterAbstractSelfTest.java   |   2 +-
 .../router/GridTcpRouterMultiNodeSelfTest.java  |   2 +-
 .../src/test/resources/spring-router-ssl.xml    |   2 +-
 .../src/test/resources/spring-router.xml        |   2 +-
 .../src/test/resources/spring-server-node.xml   |   2 +-
 .../test/resources/spring-server-ssl-node.xml   |   2 +-
 .../child/GridHadoopExternalProcessStarter.java |   6 +-
 .../GridLog4jDailyRollingFileAppender.java      |  69 ---
 .../GridLog4jExternallyRolledFileAppender.java  |  55 --
 .../logger/log4j/GridLog4jFileAppender.java     |  99 ----
 .../ignite/logger/log4j/GridLog4jFileAware.java |  24 -
 .../ignite/logger/log4j/GridLog4jLogger.java    | 516 -------------------
 .../logger/log4j/GridLog4jNodeIdFilePath.java   |  56 --
 .../log4j/GridLog4jRollingFileAppender.java     |  82 ---
 .../IgniteLog4jDailyRollingFileAppender.java    |  69 +++
 ...IgniteLog4jExternallyRolledFileAppender.java |  55 ++
 .../logger/log4j/IgniteLog4jFileAppender.java   |  99 ++++
 .../logger/log4j/IgniteLog4jFileAware.java      |  24 +
 .../ignite/logger/log4j/IgniteLog4jLogger.java  | 516 +++++++++++++++++++
 .../logger/log4j/IgniteLog4jNodeIdFilePath.java |  56 ++
 .../log4j/IgniteLog4jRollingFileAppender.java   |  82 +++
 .../log4j/GridLog4jCorrectFileNameTest.java     |  16 +-
 .../logger/log4j/GridLog4jInitializedTest.java  |   4 +-
 .../logger/log4j/GridLog4jLoggingFileTest.java  |   2 +-
 .../logger/log4j/GridLog4jLoggingPathTest.java  |   2 +-
 .../logger/log4j/GridLog4jLoggingUrlTest.java   |   2 +-
 .../log4j/GridLog4jNotInitializedTest.java      |   2 +-
 29 files changed, 926 insertions(+), 926 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java
index 75fce32..f2594f2 100644
--- a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java
+++ b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java
@@ -43,7 +43,7 @@ public class GridSingleSplitsLoadTest extends GridCommonAbstractTest {
         cfg.setCommunicationSpi(new GridTcpCommunicationSpi());
         cfg.setDiscoverySpi(new GridTcpDiscoverySpi());
 
-        GridLog4jLogger log = (GridLog4jLogger)cfg.getGridLogger().getLogger(null);
+        IgniteLog4jLogger log = (IgniteLog4jLogger)cfg.getGridLogger().getLogger(null);
 
         log.setLevel(Level.INFO);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java
index 5c53ebb..fdfc09f 100644
--- a/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java
+++ b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java
@@ -60,7 +60,7 @@ public class GridifySingleSplitLoadTest extends GridCommonAbstractTest {
         /*
          */
         @SuppressWarnings("TypeMayBeWeakened")
-        GridLog4jLogger log = (GridLog4jLogger)cfg.getGridLogger();
+        IgniteLog4jLogger log = (IgniteLog4jLogger)cfg.getGridLogger();
 
         log.getLogger("org.gridgain.grid").setLevel(Level.INFO);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java
index 76aaac0..ae8784e 100644
--- a/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterAbstractSelfTest.java
@@ -99,7 +99,7 @@ public abstract class GridTcpRouterAbstractSelfTest extends GridClientAbstractSe
         cfg.setPort(ROUTER_PORT);
         cfg.setPortRange(0);
         cfg.setServers(Collections.singleton(HOST+":"+BINARY_PORT));
-        cfg.setLogger(new GridLog4jLogger(ROUTER_LOG_CFG));
+        cfg.setLogger(new IgniteLog4jLogger(ROUTER_LOG_CFG));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java
index e71dc0b..0fc4764 100644
--- a/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/gridgain/client/router/GridTcpRouterMultiNodeSelfTest.java
@@ -70,7 +70,7 @@ public class GridTcpRouterMultiNodeSelfTest extends GridClientAbstractMultiNodeS
         cfg.setPort(ROUTER_TCP_PORT_BASE + i);
         cfg.setPortRange(0);
         cfg.setServers(Collections.singleton(HOST + ":" + REST_TCP_PORT_BASE));
-        cfg.setLogger(new GridLog4jLogger(ROUTER_LOG_CFG));
+        cfg.setLogger(new IgniteLog4jLogger(ROUTER_LOG_CFG));
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/clients/src/test/resources/spring-router-ssl.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-router-ssl.xml b/modules/clients/src/test/resources/spring-router-ssl.xml
index fd10411..06ecf69 100644
--- a/modules/clients/src/test/resources/spring-router-ssl.xml
+++ b/modules/clients/src/test/resources/spring-router-ssl.xml
@@ -92,7 +92,7 @@
     <!--
         Logger with the same configuration as in default grid instances.
     -->
-    <bean id="router.log" class="org.apache.ignite.logger.log4j.GridLog4jLogger">
+    <bean id="router.log" class="org.apache.ignite.logger.log4j.IgniteLog4jLogger">
         <constructor-arg type="java.lang.String" value="modules/clients/src/test/resources/log4j.xml"/>
     </bean>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/clients/src/test/resources/spring-router.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-router.xml b/modules/clients/src/test/resources/spring-router.xml
index 671ade5..48b883e 100644
--- a/modules/clients/src/test/resources/spring-router.xml
+++ b/modules/clients/src/test/resources/spring-router.xml
@@ -81,7 +81,7 @@
     <!--
         Logger with the same configuration as in default grid instances.
     -->
-    <bean id="router.log" class="org.apache.ignite.logger.log4j.GridLog4jLogger">
+    <bean id="router.log" class="org.apache.ignite.logger.log4j.IgniteLog4jLogger">
         <constructor-arg type="java.lang.String" value="modules/clients/src/test/resources/log4j.xml"/>
     </bean>
 </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index 0068277..c5d9e8a 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -309,7 +309,7 @@
             Logger to use.
         -->
         <property name="gridLogger">
-            <bean class="org.apache.ignite.logger.log4j.GridLog4jLogger">
+            <bean class="org.apache.ignite.logger.log4j.IgniteLog4jLogger">
                 <constructor-arg type="java.lang.String" value="modules/clients/src/test/resources/log4j.xml"/>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index c2255b4..27eb154 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -276,7 +276,7 @@
             Logger to use.
         -->
         <property name="gridLogger">
-            <bean class="org.apache.ignite.logger.log4j.GridLog4jLogger">
+            <bean class="org.apache.ignite.logger.log4j.IgniteLog4jLogger">
                 <constructor-arg type="java.lang.String" value="modules/clients/src/test/resources/log4j.xml"/>
             </bean>
         </property>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/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 d6bf914..6b0e098 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
@@ -142,17 +142,17 @@ public class GridHadoopExternalProcessStarter {
     private IgniteLogger logger(final File outputDir) {
         final URL url = U.resolveGridGainUrl(DFLT_LOG4J_CONFIG);
 
-        GridLog4jLogger logger;
+        IgniteLog4jLogger logger;
 
         try {
-            logger = url != null ? new GridLog4jLogger(url) : new GridLog4jLogger(true);
+            logger = url != null ? new IgniteLog4jLogger(url) : new IgniteLog4jLogger(true);
         }
         catch (GridException e) {
             System.err.println("Failed to create URL-based logger. Will use default one.");
 
             e.printStackTrace();
 
-            logger = new GridLog4jLogger(true);
+            logger = new IgniteLog4jLogger(true);
         }
 
         logger.updateFilePath(new IgniteClosure<String, String>() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jDailyRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jDailyRollingFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jDailyRollingFileAppender.java
deleted file mode 100644
index 39722f0..0000000
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jDailyRollingFileAppender.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.apache.log4j.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Log4J {@link DailyRollingFileAppender} with added support for grid node IDs.
- */
-public class GridLog4jDailyRollingFileAppender extends DailyRollingFileAppender implements GridLog4jFileAware {
-    /** Basic log file name. */
-    private String baseFileName;
-
-    /**
-     * Default constructor (does not do anything).
-     */
-    public GridLog4jDailyRollingFileAppender() {
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @param datePtrn Date pattern.
-     * @throws IOException If failed.
-     */
-    public GridLog4jDailyRollingFileAppender(Layout layout, String filename, String datePtrn) throws IOException {
-        super(layout, filename, datePtrn);
-
-        init();
-    }
-
-    /**
-     *
-     */
-    private void init() {
-        GridLog4jLogger.addAppender(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        if (baseFileName == null)
-            baseFileName = fileName;
-
-        fileName = filePathClos.apply(baseFileName);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
-        throws IOException {
-        if (baseFileName != null)
-            super.setFile(fileName, fileAppend, bufIO, bufSize);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jExternallyRolledFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jExternallyRolledFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jExternallyRolledFileAppender.java
deleted file mode 100644
index 95d7da9..0000000
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jExternallyRolledFileAppender.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.apache.log4j.varia.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Log4J {@link ExternallyRolledFileAppender} with added support for grid node IDs.
- */
-public class GridLog4jExternallyRolledFileAppender extends ExternallyRolledFileAppender implements GridLog4jFileAware {
-    /** Basic log file name. */
-    private String baseFileName;
-
-    /**
-     * Default constructor (does not do anything).
-     */
-    public GridLog4jExternallyRolledFileAppender() {
-        init();
-    }
-
-    /**
-     *
-     */
-    private void init() {
-        GridLog4jLogger.addAppender(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        if (baseFileName == null)
-            baseFileName = fileName;
-
-        fileName = filePathClos.apply(baseFileName);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
-        throws IOException {
-        if (baseFileName != null)
-            super.setFile(fileName, fileAppend, bufIO, bufSize);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAppender.java
deleted file mode 100644
index f6a0aba..0000000
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAppender.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.apache.log4j.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Log4J {@link FileAppender} with added support for grid node IDs.
- */
-public class GridLog4jFileAppender extends FileAppender implements GridLog4jFileAware {
-    /** Basic log file name. */
-    private String baseFileName;
-
-    /**
-     * Default constructor (does not do anything).
-     */
-    public GridLog4jFileAppender() {
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @throws IOException If failed.
-     */
-    public GridLog4jFileAppender(Layout layout, String filename) throws IOException {
-        super(layout, filename);
-
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @param append Append flag.
-     * @throws IOException If failed.
-     */
-    public GridLog4jFileAppender(Layout layout, String filename, boolean append) throws IOException {
-        super(layout, filename, append);
-
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @param append Append flag.
-     * @param bufIO Buffered IO flag.
-     * @param bufSize Buffer size.
-     * @throws IOException If failed.
-     */
-    public GridLog4jFileAppender(Layout layout, String filename, boolean append, boolean bufIO, int bufSize)
-        throws IOException {
-        super(layout, filename, append, bufIO, bufSize);
-
-        init();
-    }
-
-    /**
-     *
-     */
-    private void init() {
-        GridLog4jLogger.addAppender(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
-        throws IOException {
-        if (baseFileName != null)
-            super.setFile(fileName, fileAppend, bufIO, bufSize);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        if (baseFileName == null)
-            baseFileName = fileName;
-
-        fileName = filePathClos.apply(baseFileName);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAware.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAware.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAware.java
deleted file mode 100644
index 4e9dc4c..0000000
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jFileAware.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.log4j;
-
-import org.apache.ignite.lang.*;
-
-/**
- * Interface for those loggers and appenders that evaluate their file paths lazily.
- */
-interface GridLog4jFileAware {
-    /**
-     * Sets closure that later evaluate file path.
-     *
-     * @param filePathClos Closure that generates actual file path.
-     */
-    void updateFilePath(IgniteClosure<String, String> filePathClos);
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jLogger.java
deleted file mode 100644
index 56e7e05..0000000
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jLogger.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.log4j;
-
-import org.apache.ignite.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.logger.*;
-import org.apache.log4j.*;
-import org.apache.log4j.varia.*;
-import org.apache.log4j.xml.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.*;
-import org.gridgain.grid.util.lang.*;
-import org.gridgain.grid.util.tostring.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-
-import static org.gridgain.grid.GridSystemProperties.*;
-
-/**
- * Log4j-based implementation for logging. This logger should be used
- * by loaders that have prefer <a target=_new href="http://logging.apache.org/log4j/docs/">log4j</a>-based logging.
- * <p>
- * Here is a typical example of configuring log4j logger in GridGain configuration file:
- * <pre name="code" class="xml">
- *      &lt;property name="gridLogger"&gt;
- *          &lt;bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"&gt;
- *              &lt;constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/&gt;
- *          &lt;/bean>
- *      &lt;/property&gt;
- * </pre>
- * and from your code:
- * <pre name="code" class="java">
- *      GridConfiguration cfg = new GridConfiguration();
- *      ...
- *      URL xml = U.resolveGridGainUrl("config/custom-log4j.xml");
- *      GridLogger log = new GridLog4jLogger(xml);
- *      ...
- *      cfg.setGridLogger(log);
- * </pre>
- *
- * Please take a look at <a target=_new href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4j 1.2</a>
- * for additional information.
- * <p>
- * It's recommended to use GridGain logger injection instead of using/instantiating
- * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
- * injection.
- */
-public class GridLog4jLogger extends GridMetadataAwareAdapter implements IgniteLogger, IgniteLoggerNodeIdAware,
-    GridLog4jFileAware {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Appenders. */
-    private static Collection<FileAppender> fileAppenders = new GridConcurrentHashSet<>();
-
-    /** */
-    private static volatile boolean inited;
-
-    /** */
-    private static volatile boolean quiet0;
-
-    /** */
-    private static final Object mux = new Object();
-
-    /** Logger implementation. */
-    @GridToStringExclude
-    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
-    private Logger impl;
-
-    /** Path to configuration file. */
-    private final String path;
-
-    /** Quiet flag. */
-    private final boolean quiet;
-
-    /** Node ID. */
-    private UUID nodeId;
-
-    /**
-     * Creates new logger and automatically detects if root logger already
-     * has appenders configured. If it does not, the root logger will be
-     * configured with default appender (analogous to calling
-     * {@link #GridLog4jLogger(boolean) GridLog4jLogger(boolean)}
-     * with parameter {@code true}, otherwise, existing appenders will be used (analogous
-     * to calling {@link #GridLog4jLogger(boolean) GridLog4jLogger(boolean)}
-     * with parameter {@code false}).
-     */
-    public GridLog4jLogger() {
-        this(!isConfigured());
-    }
-
-    /**
-     * Creates new logger. If initialize parameter is {@code true} the Log4j
-     * logger will be initialized with default console appender and {@code INFO}
-     * log level.
-     *
-     * @param init If {@code true}, then a default console appender with
-     *      following pattern layout will be created: {@code %d{ABSOLUTE} %-5p [%c{1}] %m%n}.
-     *      If {@code false}, then no implicit initialization will take place,
-     *      and {@code Log4j} should be configured prior to calling this
-     *      constructor.
-     */
-    public GridLog4jLogger(boolean init) {
-        impl = Logger.getRootLogger();
-
-        if (init) {
-            // Implementation has already been inited, passing NULL.
-            addConsoleAppenderIfNeeded(Level.INFO, null);
-
-            quiet = quiet0;
-        }
-        else
-            quiet = true;
-
-        path = null;
-    }
-
-    /**
-     * Creates new logger with given implementation.
-     *
-     * @param impl Log4j implementation to use.
-     */
-    public GridLog4jLogger(final Logger impl) {
-        assert impl != null;
-
-        path = null;
-
-        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
-            @Override public Logger apply(Boolean init) {
-                return impl;
-            }
-        });
-
-        quiet = quiet0;
-    }
-
-    /**
-     * Creates new logger with given configuration {@code path}.
-     *
-     * @param path Path to log4j configuration XML file.
-     * @throws GridException Thrown in case logger can't be created.
-     */
-    public GridLog4jLogger(String path) throws GridException {
-        if (path == null)
-            throw new GridException("Configuration XML file for Log4j must be specified.");
-
-        this.path = path;
-
-        final URL cfgUrl = U.resolveGridGainUrl(path);
-
-        if (cfgUrl == null)
-            throw new GridException("Log4j configuration path was not found: " + path);
-
-        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
-            @Override public Logger apply(Boolean init) {
-                if (init)
-                    DOMConfigurator.configure(cfgUrl);
-
-                return Logger.getRootLogger();
-            }
-        });
-
-        quiet = quiet0;
-    }
-
-    /**
-     * Creates new logger with given configuration {@code cfgFile}.
-     *
-     * @param cfgFile Log4j configuration XML file.
-     * @throws GridException Thrown in case logger can't be created.
-     */
-    public GridLog4jLogger(File cfgFile) throws GridException {
-        if (cfgFile == null)
-            throw new GridException("Configuration XML file for Log4j must be specified.");
-
-        if (!cfgFile.exists() || cfgFile.isDirectory())
-            throw new GridException("Log4j configuration path was not found or is a directory: " + cfgFile);
-
-        path = cfgFile.getAbsolutePath();
-
-        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
-            @Override public Logger apply(Boolean init) {
-                if (init)
-                    DOMConfigurator.configure(path);
-
-                return Logger.getRootLogger();
-            }
-        });
-
-        quiet = quiet0;
-    }
-
-    /**
-     * Creates new logger with given configuration {@code cfgUrl}.
-     *
-     * @param cfgUrl URL for Log4j configuration XML file.
-     * @throws GridException Thrown in case logger can't be created.
-     */
-    public GridLog4jLogger(final URL cfgUrl) throws GridException {
-        if (cfgUrl == null)
-            throw new GridException("Configuration XML file for Log4j must be specified.");
-
-        path = null;
-
-        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
-            @Override public Logger apply(Boolean init) {
-                if (init)
-                    DOMConfigurator.configure(cfgUrl);
-
-                return Logger.getRootLogger();
-            }
-        });
-
-        quiet = quiet0;
-    }
-
-    /**
-     * Checks if Log4j is already configured within this VM or not.
-     *
-     * @return {@code True} if log4j was already configured, {@code false} otherwise.
-     */
-    public static boolean isConfigured() {
-        return Logger.getRootLogger().getAllAppenders().hasMoreElements();
-    }
-
-    /**
-     * Sets level for internal log4j implementation.
-     *
-     * @param level Log level to set.
-     */
-    public void setLevel(Level level) {
-        impl.setLevel(level);
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public String fileName() {
-        FileAppender fapp = F.first(fileAppenders);
-
-        return fapp != null ? fapp.getFile() : null;
-    }
-
-    /**
-     * Adds console appender when needed with some default logging settings.
-     *
-     * @param logLevel Optional log level.
-     * @param implInitC Optional log implementation init closure.
-     */
-    private void addConsoleAppenderIfNeeded(@Nullable Level logLevel,
-        @Nullable IgniteClosure<Boolean, Logger> implInitC) {
-        if (inited) {
-            if (implInitC != null)
-                // Do not init.
-                impl = implInitC.apply(false);
-
-            return;
-        }
-
-        synchronized (mux) {
-            if (inited) {
-                if (implInitC != null)
-                    // Do not init.
-                    impl = implInitC.apply(false);
-
-                return;
-            }
-
-            if (implInitC != null)
-                // Init logger impl.
-                impl = implInitC.apply(true);
-
-            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
-
-            boolean consoleAppenderFound = false;
-            Category rootCategory = null;
-            ConsoleAppender errAppender = null;
-
-            for (Category l = impl; l != null; ) {
-                if (!consoleAppenderFound) {
-                    for (Enumeration appenders = l.getAllAppenders(); appenders.hasMoreElements(); ) {
-                        Appender appender = (Appender)appenders.nextElement();
-
-                        if (appender instanceof ConsoleAppender) {
-                            if ("CONSOLE_ERR".equals(appender.getName())) {
-                                // Treat CONSOLE_ERR appender as a system one and don't count it.
-                                errAppender = (ConsoleAppender)appender;
-
-                                continue;
-                            }
-
-                            consoleAppenderFound = true;
-
-                            break;
-                        }
-                    }
-                }
-
-                if (l.getParent() == null) {
-                    rootCategory = l;
-
-                    break;
-                }
-                else
-                    l = l.getParent();
-            }
-
-            if (consoleAppenderFound && quiet)
-                // User configured console appender, but log is quiet.
-                quiet = false;
-
-            if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"))) {
-                // Console appender not found => we've looked through all categories up to root.
-                assert rootCategory != null;
-
-                // User launched gridgain in verbose mode and did not add console appender with INFO level
-                // to configuration and did not set GG_CONSOLE_APPENDER to false.
-                if (errAppender != null) {
-                    rootCategory.addAppender(createConsoleAppender(Level.INFO));
-
-                    if (errAppender.getThreshold() == Level.ERROR)
-                        errAppender.setThreshold(Level.WARN);
-                }
-                else
-                    // No error console appender => create console appender with no level limit.
-                    rootCategory.addAppender(createConsoleAppender(Level.OFF));
-
-                if (logLevel != null)
-                    impl.setLevel(logLevel);
-            }
-
-            quiet0 = quiet;
-            inited = true;
-        }
-    }
-
-    /**
-     * Creates console appender with some reasonable default logging settings.
-     *
-     * @param maxLevel Max logging level.
-     * @return New console appender.
-     */
-    private Appender createConsoleAppender(Level maxLevel) {
-        String fmt = "[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n";
-
-        // Configure output that should go to System.out
-        Appender app = new ConsoleAppender(new PatternLayout(fmt), ConsoleAppender.SYSTEM_OUT);
-
-        LevelRangeFilter lvlFilter = new LevelRangeFilter();
-
-        lvlFilter.setLevelMin(Level.TRACE);
-        lvlFilter.setLevelMax(maxLevel);
-
-        app.addFilter(lvlFilter);
-
-        return app;
-    }
-
-    /**
-     * Adds file appender.
-     *
-     * @param a Appender.
-     */
-    public static void addAppender(FileAppender a) {
-        A.notNull(a, "a");
-
-        fileAppenders.add(a);
-    }
-
-    /**
-     * Removes file appender.
-     *
-     * @param a Appender.
-     */
-    public static void removeAppender(FileAppender a) {
-        A.notNull(a, "a");
-
-        fileAppenders.remove(a);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void setNodeId(UUID nodeId) {
-        A.notNull(nodeId, "nodeId");
-
-        this.nodeId = nodeId;
-
-        updateFilePath(new GridLog4jNodeIdFilePath(nodeId));
-    }
-
-    /** {@inheritDoc} */
-    @Override public UUID getNodeId() {
-        return nodeId;
-    }
-
-    /**
-     * Gets files for all registered file appenders.
-     *
-     * @return List of files.
-     */
-    public static Collection<String> logFiles() {
-        Collection<String> res = new ArrayList<>(fileAppenders.size());
-
-        for (FileAppender a : fileAppenders)
-            res.add(a.getFile());
-
-        return res;
-    }
-
-    /**
-     * 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.apache.ignite.IgniteLogger} wrapper around log4j logger.
-     */
-    @Override public GridLog4jLogger getLogger(Object ctgr) {
-        return new GridLog4jLogger(ctgr == null ? Logger.getRootLogger() :
-            ctgr instanceof Class ? Logger.getLogger(((Class<?>)ctgr).getName()) :
-                Logger.getLogger(ctgr.toString()));
-    }
-
-    /** {@inheritDoc} */
-    @Override public void trace(String msg) {
-        if (!impl.isTraceEnabled())
-            warning("Logging at TRACE level without checking if TRACE level is enabled: " + msg);
-
-        impl.trace(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void debug(String msg) {
-        if (!impl.isDebugEnabled())
-            warning("Logging at DEBUG level without checking if DEBUG level is enabled: " + msg);
-
-        impl.debug(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void info(String msg) {
-        if (!impl.isInfoEnabled())
-            warning("Logging at INFO level without checking if INFO level is enabled: " + msg);
-
-        impl.info(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg) {
-        impl.warn(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void warning(String msg, @Nullable Throwable e) {
-        impl.warn(msg, e);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg) {
-        impl.error(msg);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void error(String msg, @Nullable Throwable e) {
-        impl.error(msg, e);
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isTraceEnabled() {
-        return impl.isTraceEnabled();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isDebugEnabled() {
-        return impl.isDebugEnabled();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isInfoEnabled() {
-        return impl.isInfoEnabled();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isQuiet() {
-        return quiet;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(GridLog4jLogger.class, this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        for (FileAppender a : fileAppenders) {
-            if (a instanceof GridLog4jFileAware) {
-                ((GridLog4jFileAware)a).updateFilePath(filePathClos);
-
-                a.activateOptions();
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jNodeIdFilePath.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jNodeIdFilePath.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jNodeIdFilePath.java
deleted file mode 100644
index b741808..0000000
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jNodeIdFilePath.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Closure that generates file path adding node id to filename as a suffix.
- */
-class GridLog4jNodeIdFilePath implements IgniteClosure<String, String> {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Node id. */
-    private final UUID nodeId;
-
-    /**
-     * Creates new instance.
-     *
-     * @param id Node id.
-     */
-    GridLog4jNodeIdFilePath(UUID id) {
-        nodeId = id;
-    }
-
-    /** {@inheritDoc} */
-    @Override public String apply(String oldPath) {
-        if (!F.isEmpty(U.GRIDGAIN_LOG_DIR))
-            return U.nodeIdLogFileName(nodeId, new File(U.GRIDGAIN_LOG_DIR, "gridgain.log").getAbsolutePath());
-
-        if (oldPath != null) // fileName could be null if GRIDGAIN_HOME is not defined.
-            return U.nodeIdLogFileName(nodeId, oldPath);
-
-        String tmpDir = GridSystemProperties.getString("java.io.tmpdir");
-
-        if (tmpDir != null)
-            return U.nodeIdLogFileName(nodeId, new File(tmpDir, "gridgain.log").getAbsolutePath());
-
-        System.err.println("Failed to get tmp directory for log file.");
-
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jRollingFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jRollingFileAppender.java
deleted file mode 100644
index cb00de8..0000000
--- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/GridLog4jRollingFileAppender.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.logger.log4j;
-
-import org.apache.ignite.lang.*;
-import org.apache.log4j.*;
-import org.gridgain.grid.util.typedef.internal.*;
-
-import java.io.*;
-
-/**
- * Log4J {@link RollingFileAppender} with added support for grid node IDs.
- */
-public class GridLog4jRollingFileAppender extends RollingFileAppender implements GridLog4jFileAware {
-    /** Basic log file name. */
-    private String baseFileName;
-
-    /**
-     * Default constructor (does not do anything).
-     */
-    public GridLog4jRollingFileAppender() {
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @throws IOException If failed.
-     */
-    public GridLog4jRollingFileAppender(Layout layout, String filename) throws IOException {
-        super(layout, filename);
-
-        init();
-    }
-
-    /**
-     * Instantiate a FileAppender with given parameters.
-     *
-     * @param layout Layout.
-     * @param filename File name.
-     * @param append Append flag.
-     * @throws IOException If failed.
-     */
-    public GridLog4jRollingFileAppender(Layout layout, String filename, boolean append) throws IOException {
-        super(layout, filename, append);
-
-        init();
-    }
-
-    /**
-     * Initializes appender.
-     */
-    private void init() {
-        GridLog4jLogger.addAppender(this);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
-        A.notNull(filePathClos, "filePathClos");
-
-        if (baseFileName == null)
-            baseFileName = fileName;
-
-        fileName = filePathClos.apply(baseFileName);
-    }
-
-    /** {@inheritDoc} */
-    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
-        throws IOException {
-        if (baseFileName != null)
-            super.setFile(fileName, fileAppend, bufIO, bufSize);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jDailyRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jDailyRollingFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jDailyRollingFileAppender.java
new file mode 100644
index 0000000..6f689b2
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jDailyRollingFileAppender.java
@@ -0,0 +1,69 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.apache.log4j.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Log4J {@link DailyRollingFileAppender} with added support for grid node IDs.
+ */
+public class IgniteLog4jDailyRollingFileAppender extends DailyRollingFileAppender implements IgniteLog4jFileAware {
+    /** Basic log file name. */
+    private String baseFileName;
+
+    /**
+     * Default constructor (does not do anything).
+     */
+    public IgniteLog4jDailyRollingFileAppender() {
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @param datePtrn Date pattern.
+     * @throws IOException If failed.
+     */
+    public IgniteLog4jDailyRollingFileAppender(Layout layout, String filename, String datePtrn) throws IOException {
+        super(layout, filename, datePtrn);
+
+        init();
+    }
+
+    /**
+     *
+     */
+    private void init() {
+        IgniteLog4jLogger.addAppender(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        if (baseFileName == null)
+            baseFileName = fileName;
+
+        fileName = filePathClos.apply(baseFileName);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
+        throws IOException {
+        if (baseFileName != null)
+            super.setFile(fileName, fileAppend, bufIO, bufSize);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jExternallyRolledFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jExternallyRolledFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jExternallyRolledFileAppender.java
new file mode 100644
index 0000000..673cd7b
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jExternallyRolledFileAppender.java
@@ -0,0 +1,55 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.apache.log4j.varia.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Log4J {@link ExternallyRolledFileAppender} with added support for grid node IDs.
+ */
+public class IgniteLog4jExternallyRolledFileAppender extends ExternallyRolledFileAppender implements IgniteLog4jFileAware {
+    /** Basic log file name. */
+    private String baseFileName;
+
+    /**
+     * Default constructor (does not do anything).
+     */
+    public IgniteLog4jExternallyRolledFileAppender() {
+        init();
+    }
+
+    /**
+     *
+     */
+    private void init() {
+        IgniteLog4jLogger.addAppender(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        if (baseFileName == null)
+            baseFileName = fileName;
+
+        fileName = filePathClos.apply(baseFileName);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
+        throws IOException {
+        if (baseFileName != null)
+            super.setFile(fileName, fileAppend, bufIO, bufSize);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jFileAppender.java
new file mode 100644
index 0000000..2117667
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jFileAppender.java
@@ -0,0 +1,99 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.apache.log4j.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Log4J {@link FileAppender} with added support for grid node IDs.
+ */
+public class IgniteLog4jFileAppender extends FileAppender implements IgniteLog4jFileAware {
+    /** Basic log file name. */
+    private String baseFileName;
+
+    /**
+     * Default constructor (does not do anything).
+     */
+    public IgniteLog4jFileAppender() {
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @throws IOException If failed.
+     */
+    public IgniteLog4jFileAppender(Layout layout, String filename) throws IOException {
+        super(layout, filename);
+
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @param append Append flag.
+     * @throws IOException If failed.
+     */
+    public IgniteLog4jFileAppender(Layout layout, String filename, boolean append) throws IOException {
+        super(layout, filename, append);
+
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @param append Append flag.
+     * @param bufIO Buffered IO flag.
+     * @param bufSize Buffer size.
+     * @throws IOException If failed.
+     */
+    public IgniteLog4jFileAppender(Layout layout, String filename, boolean append, boolean bufIO, int bufSize)
+        throws IOException {
+        super(layout, filename, append, bufIO, bufSize);
+
+        init();
+    }
+
+    /**
+     *
+     */
+    private void init() {
+        IgniteLog4jLogger.addAppender(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
+        throws IOException {
+        if (baseFileName != null)
+            super.setFile(fileName, fileAppend, bufIO, bufSize);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        if (baseFileName == null)
+            baseFileName = fileName;
+
+        fileName = filePathClos.apply(baseFileName);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jFileAware.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jFileAware.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jFileAware.java
new file mode 100644
index 0000000..9b36701
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jFileAware.java
@@ -0,0 +1,24 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+
+/**
+ * Interface for those loggers and appenders that evaluate their file paths lazily.
+ */
+interface IgniteLog4jFileAware {
+    /**
+     * Sets closure that later evaluate file path.
+     *
+     * @param filePathClos Closure that generates actual file path.
+     */
+    void updateFilePath(IgniteClosure<String, String> filePathClos);
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
new file mode 100644
index 0000000..87502ab
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jLogger.java
@@ -0,0 +1,516 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.logger.*;
+import org.apache.log4j.*;
+import org.apache.log4j.varia.*;
+import org.apache.log4j.xml.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.lang.*;
+import org.gridgain.grid.util.tostring.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import static org.gridgain.grid.GridSystemProperties.*;
+
+/**
+ * Log4j-based implementation for logging. This logger should be used
+ * by loaders that have prefer <a target=_new href="http://logging.apache.org/log4j/docs/">log4j</a>-based logging.
+ * <p>
+ * Here is a typical example of configuring log4j logger in GridGain configuration file:
+ * <pre name="code" class="xml">
+ *      &lt;property name="gridLogger"&gt;
+ *          &lt;bean class="org.gridgain.grid.logger.log4j.GridLog4jLogger"&gt;
+ *              &lt;constructor-arg type="java.lang.String" value="config/gridgain-log4j.xml"/&gt;
+ *          &lt;/bean>
+ *      &lt;/property&gt;
+ * </pre>
+ * and from your code:
+ * <pre name="code" class="java">
+ *      GridConfiguration cfg = new GridConfiguration();
+ *      ...
+ *      URL xml = U.resolveGridGainUrl("config/custom-log4j.xml");
+ *      GridLogger log = new GridLog4jLogger(xml);
+ *      ...
+ *      cfg.setGridLogger(log);
+ * </pre>
+ *
+ * Please take a look at <a target=_new href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4j 1.2</a>
+ * for additional information.
+ * <p>
+ * It's recommended to use GridGain logger injection instead of using/instantiating
+ * logger in your task/job code. See {@link org.apache.ignite.resources.IgniteLoggerResource} annotation about logger
+ * injection.
+ */
+public class IgniteLog4jLogger extends GridMetadataAwareAdapter implements IgniteLogger, IgniteLoggerNodeIdAware,
+    IgniteLog4jFileAware {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Appenders. */
+    private static Collection<FileAppender> fileAppenders = new GridConcurrentHashSet<>();
+
+    /** */
+    private static volatile boolean inited;
+
+    /** */
+    private static volatile boolean quiet0;
+
+    /** */
+    private static final Object mux = new Object();
+
+    /** Logger implementation. */
+    @GridToStringExclude
+    @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
+    private Logger impl;
+
+    /** Path to configuration file. */
+    private final String path;
+
+    /** Quiet flag. */
+    private final boolean quiet;
+
+    /** Node ID. */
+    private UUID nodeId;
+
+    /**
+     * Creates new logger and automatically detects if root logger already
+     * has appenders configured. If it does not, the root logger will be
+     * configured with default appender (analogous to calling
+     * {@link #IgniteLog4jLogger(boolean) GridLog4jLogger(boolean)}
+     * with parameter {@code true}, otherwise, existing appenders will be used (analogous
+     * to calling {@link #IgniteLog4jLogger(boolean) GridLog4jLogger(boolean)}
+     * with parameter {@code false}).
+     */
+    public IgniteLog4jLogger() {
+        this(!isConfigured());
+    }
+
+    /**
+     * Creates new logger. If initialize parameter is {@code true} the Log4j
+     * logger will be initialized with default console appender and {@code INFO}
+     * log level.
+     *
+     * @param init If {@code true}, then a default console appender with
+     *      following pattern layout will be created: {@code %d{ABSOLUTE} %-5p [%c{1}] %m%n}.
+     *      If {@code false}, then no implicit initialization will take place,
+     *      and {@code Log4j} should be configured prior to calling this
+     *      constructor.
+     */
+    public IgniteLog4jLogger(boolean init) {
+        impl = Logger.getRootLogger();
+
+        if (init) {
+            // Implementation has already been inited, passing NULL.
+            addConsoleAppenderIfNeeded(Level.INFO, null);
+
+            quiet = quiet0;
+        }
+        else
+            quiet = true;
+
+        path = null;
+    }
+
+    /**
+     * Creates new logger with given implementation.
+     *
+     * @param impl Log4j implementation to use.
+     */
+    public IgniteLog4jLogger(final Logger impl) {
+        assert impl != null;
+
+        path = null;
+
+        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
+            @Override public Logger apply(Boolean init) {
+                return impl;
+            }
+        });
+
+        quiet = quiet0;
+    }
+
+    /**
+     * Creates new logger with given configuration {@code path}.
+     *
+     * @param path Path to log4j configuration XML file.
+     * @throws GridException Thrown in case logger can't be created.
+     */
+    public IgniteLog4jLogger(String path) throws GridException {
+        if (path == null)
+            throw new GridException("Configuration XML file for Log4j must be specified.");
+
+        this.path = path;
+
+        final URL cfgUrl = U.resolveGridGainUrl(path);
+
+        if (cfgUrl == null)
+            throw new GridException("Log4j configuration path was not found: " + path);
+
+        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
+            @Override public Logger apply(Boolean init) {
+                if (init)
+                    DOMConfigurator.configure(cfgUrl);
+
+                return Logger.getRootLogger();
+            }
+        });
+
+        quiet = quiet0;
+    }
+
+    /**
+     * Creates new logger with given configuration {@code cfgFile}.
+     *
+     * @param cfgFile Log4j configuration XML file.
+     * @throws GridException Thrown in case logger can't be created.
+     */
+    public IgniteLog4jLogger(File cfgFile) throws GridException {
+        if (cfgFile == null)
+            throw new GridException("Configuration XML file for Log4j must be specified.");
+
+        if (!cfgFile.exists() || cfgFile.isDirectory())
+            throw new GridException("Log4j configuration path was not found or is a directory: " + cfgFile);
+
+        path = cfgFile.getAbsolutePath();
+
+        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
+            @Override public Logger apply(Boolean init) {
+                if (init)
+                    DOMConfigurator.configure(path);
+
+                return Logger.getRootLogger();
+            }
+        });
+
+        quiet = quiet0;
+    }
+
+    /**
+     * Creates new logger with given configuration {@code cfgUrl}.
+     *
+     * @param cfgUrl URL for Log4j configuration XML file.
+     * @throws GridException Thrown in case logger can't be created.
+     */
+    public IgniteLog4jLogger(final URL cfgUrl) throws GridException {
+        if (cfgUrl == null)
+            throw new GridException("Configuration XML file for Log4j must be specified.");
+
+        path = null;
+
+        addConsoleAppenderIfNeeded(null, new C1<Boolean, Logger>() {
+            @Override public Logger apply(Boolean init) {
+                if (init)
+                    DOMConfigurator.configure(cfgUrl);
+
+                return Logger.getRootLogger();
+            }
+        });
+
+        quiet = quiet0;
+    }
+
+    /**
+     * Checks if Log4j is already configured within this VM or not.
+     *
+     * @return {@code True} if log4j was already configured, {@code false} otherwise.
+     */
+    public static boolean isConfigured() {
+        return Logger.getRootLogger().getAllAppenders().hasMoreElements();
+    }
+
+    /**
+     * Sets level for internal log4j implementation.
+     *
+     * @param level Log level to set.
+     */
+    public void setLevel(Level level) {
+        impl.setLevel(level);
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public String fileName() {
+        FileAppender fapp = F.first(fileAppenders);
+
+        return fapp != null ? fapp.getFile() : null;
+    }
+
+    /**
+     * Adds console appender when needed with some default logging settings.
+     *
+     * @param logLevel Optional log level.
+     * @param implInitC Optional log implementation init closure.
+     */
+    private void addConsoleAppenderIfNeeded(@Nullable Level logLevel,
+        @Nullable IgniteClosure<Boolean, Logger> implInitC) {
+        if (inited) {
+            if (implInitC != null)
+                // Do not init.
+                impl = implInitC.apply(false);
+
+            return;
+        }
+
+        synchronized (mux) {
+            if (inited) {
+                if (implInitC != null)
+                    // Do not init.
+                    impl = implInitC.apply(false);
+
+                return;
+            }
+
+            if (implInitC != null)
+                // Init logger impl.
+                impl = implInitC.apply(true);
+
+            boolean quiet = Boolean.valueOf(System.getProperty(GG_QUIET, "true"));
+
+            boolean consoleAppenderFound = false;
+            Category rootCategory = null;
+            ConsoleAppender errAppender = null;
+
+            for (Category l = impl; l != null; ) {
+                if (!consoleAppenderFound) {
+                    for (Enumeration appenders = l.getAllAppenders(); appenders.hasMoreElements(); ) {
+                        Appender appender = (Appender)appenders.nextElement();
+
+                        if (appender instanceof ConsoleAppender) {
+                            if ("CONSOLE_ERR".equals(appender.getName())) {
+                                // Treat CONSOLE_ERR appender as a system one and don't count it.
+                                errAppender = (ConsoleAppender)appender;
+
+                                continue;
+                            }
+
+                            consoleAppenderFound = true;
+
+                            break;
+                        }
+                    }
+                }
+
+                if (l.getParent() == null) {
+                    rootCategory = l;
+
+                    break;
+                }
+                else
+                    l = l.getParent();
+            }
+
+            if (consoleAppenderFound && quiet)
+                // User configured console appender, but log is quiet.
+                quiet = false;
+
+            if (!consoleAppenderFound && !quiet && Boolean.valueOf(System.getProperty(GG_CONSOLE_APPENDER, "true"))) {
+                // Console appender not found => we've looked through all categories up to root.
+                assert rootCategory != null;
+
+                // User launched gridgain in verbose mode and did not add console appender with INFO level
+                // to configuration and did not set GG_CONSOLE_APPENDER to false.
+                if (errAppender != null) {
+                    rootCategory.addAppender(createConsoleAppender(Level.INFO));
+
+                    if (errAppender.getThreshold() == Level.ERROR)
+                        errAppender.setThreshold(Level.WARN);
+                }
+                else
+                    // No error console appender => create console appender with no level limit.
+                    rootCategory.addAppender(createConsoleAppender(Level.OFF));
+
+                if (logLevel != null)
+                    impl.setLevel(logLevel);
+            }
+
+            quiet0 = quiet;
+            inited = true;
+        }
+    }
+
+    /**
+     * Creates console appender with some reasonable default logging settings.
+     *
+     * @param maxLevel Max logging level.
+     * @return New console appender.
+     */
+    private Appender createConsoleAppender(Level maxLevel) {
+        String fmt = "[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n";
+
+        // Configure output that should go to System.out
+        Appender app = new ConsoleAppender(new PatternLayout(fmt), ConsoleAppender.SYSTEM_OUT);
+
+        LevelRangeFilter lvlFilter = new LevelRangeFilter();
+
+        lvlFilter.setLevelMin(Level.TRACE);
+        lvlFilter.setLevelMax(maxLevel);
+
+        app.addFilter(lvlFilter);
+
+        return app;
+    }
+
+    /**
+     * Adds file appender.
+     *
+     * @param a Appender.
+     */
+    public static void addAppender(FileAppender a) {
+        A.notNull(a, "a");
+
+        fileAppenders.add(a);
+    }
+
+    /**
+     * Removes file appender.
+     *
+     * @param a Appender.
+     */
+    public static void removeAppender(FileAppender a) {
+        A.notNull(a, "a");
+
+        fileAppenders.remove(a);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void setNodeId(UUID nodeId) {
+        A.notNull(nodeId, "nodeId");
+
+        this.nodeId = nodeId;
+
+        updateFilePath(new IgniteLog4jNodeIdFilePath(nodeId));
+    }
+
+    /** {@inheritDoc} */
+    @Override public UUID getNodeId() {
+        return nodeId;
+    }
+
+    /**
+     * Gets files for all registered file appenders.
+     *
+     * @return List of files.
+     */
+    public static Collection<String> logFiles() {
+        Collection<String> res = new ArrayList<>(fileAppenders.size());
+
+        for (FileAppender a : fileAppenders)
+            res.add(a.getFile());
+
+        return res;
+    }
+
+    /**
+     * 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.apache.ignite.IgniteLogger} wrapper around log4j logger.
+     */
+    @Override public IgniteLog4jLogger getLogger(Object ctgr) {
+        return new IgniteLog4jLogger(ctgr == null ? Logger.getRootLogger() :
+            ctgr instanceof Class ? Logger.getLogger(((Class<?>)ctgr).getName()) :
+                Logger.getLogger(ctgr.toString()));
+    }
+
+    /** {@inheritDoc} */
+    @Override public void trace(String msg) {
+        if (!impl.isTraceEnabled())
+            warning("Logging at TRACE level without checking if TRACE level is enabled: " + msg);
+
+        impl.trace(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void debug(String msg) {
+        if (!impl.isDebugEnabled())
+            warning("Logging at DEBUG level without checking if DEBUG level is enabled: " + msg);
+
+        impl.debug(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void info(String msg) {
+        if (!impl.isInfoEnabled())
+            warning("Logging at INFO level without checking if INFO level is enabled: " + msg);
+
+        impl.info(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg) {
+        impl.warn(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void warning(String msg, @Nullable Throwable e) {
+        impl.warn(msg, e);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg) {
+        impl.error(msg);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void error(String msg, @Nullable Throwable e) {
+        impl.error(msg, e);
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isTraceEnabled() {
+        return impl.isTraceEnabled();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isDebugEnabled() {
+        return impl.isDebugEnabled();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isInfoEnabled() {
+        return impl.isInfoEnabled();
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean isQuiet() {
+        return quiet;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(IgniteLog4jLogger.class, this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        for (FileAppender a : fileAppenders) {
+            if (a instanceof IgniteLog4jFileAware) {
+                ((IgniteLog4jFileAware)a).updateFilePath(filePathClos);
+
+                a.activateOptions();
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
new file mode 100644
index 0000000..1b8afce
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java
@@ -0,0 +1,56 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.*;
+import org.gridgain.grid.util.typedef.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Closure that generates file path adding node id to filename as a suffix.
+ */
+class IgniteLog4jNodeIdFilePath implements IgniteClosure<String, String> {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Node id. */
+    private final UUID nodeId;
+
+    /**
+     * Creates new instance.
+     *
+     * @param id Node id.
+     */
+    IgniteLog4jNodeIdFilePath(UUID id) {
+        nodeId = id;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String apply(String oldPath) {
+        if (!F.isEmpty(U.GRIDGAIN_LOG_DIR))
+            return U.nodeIdLogFileName(nodeId, new File(U.GRIDGAIN_LOG_DIR, "gridgain.log").getAbsolutePath());
+
+        if (oldPath != null) // fileName could be null if GRIDGAIN_HOME is not defined.
+            return U.nodeIdLogFileName(nodeId, oldPath);
+
+        String tmpDir = GridSystemProperties.getString("java.io.tmpdir");
+
+        if (tmpDir != null)
+            return U.nodeIdLogFileName(nodeId, new File(tmpDir, "gridgain.log").getAbsolutePath());
+
+        System.err.println("Failed to get tmp directory for log file.");
+
+        return null;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jRollingFileAppender.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jRollingFileAppender.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jRollingFileAppender.java
new file mode 100644
index 0000000..f0db9d9
--- /dev/null
+++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jRollingFileAppender.java
@@ -0,0 +1,82 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.logger.log4j;
+
+import org.apache.ignite.lang.*;
+import org.apache.log4j.*;
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.io.*;
+
+/**
+ * Log4J {@link RollingFileAppender} with added support for grid node IDs.
+ */
+public class IgniteLog4jRollingFileAppender extends RollingFileAppender implements IgniteLog4jFileAware {
+    /** Basic log file name. */
+    private String baseFileName;
+
+    /**
+     * Default constructor (does not do anything).
+     */
+    public IgniteLog4jRollingFileAppender() {
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @throws IOException If failed.
+     */
+    public IgniteLog4jRollingFileAppender(Layout layout, String filename) throws IOException {
+        super(layout, filename);
+
+        init();
+    }
+
+    /**
+     * Instantiate a FileAppender with given parameters.
+     *
+     * @param layout Layout.
+     * @param filename File name.
+     * @param append Append flag.
+     * @throws IOException If failed.
+     */
+    public IgniteLog4jRollingFileAppender(Layout layout, String filename, boolean append) throws IOException {
+        super(layout, filename, append);
+
+        init();
+    }
+
+    /**
+     * Initializes appender.
+     */
+    private void init() {
+        IgniteLog4jLogger.addAppender(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void updateFilePath(IgniteClosure<String, String> filePathClos) {
+        A.notNull(filePathClos, "filePathClos");
+
+        if (baseFileName == null)
+            baseFileName = fileName;
+
+        fileName = filePathClos.apply(baseFileName);
+    }
+
+    /** {@inheritDoc} */
+    @Override public synchronized void setFile(String fileName, boolean fileAppend, boolean bufIO, int bufSize)
+        throws IOException {
+        if (baseFileName != null)
+            super.setFile(fileName, fileAppend, bufIO, bufSize);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java
index 83a5d3b..ed87cf0 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jCorrectFileNameTest.java
@@ -28,14 +28,14 @@ import java.util.*;
 @GridCommonTest(group = "Logger")
 public class GridLog4jCorrectFileNameTest extends TestCase {
     /** Appender */
-    private GridLog4jRollingFileAppender appender;
+    private IgniteLog4jRollingFileAppender appender;
 
     /** {@inheritDoc} */
     @Override protected void setUp() throws Exception {
         Logger root = Logger.getRootLogger();
 
         for (Enumeration appenders = root.getAllAppenders(); appenders.hasMoreElements(); ) {
-            if (appenders.nextElement() instanceof GridLog4jRollingFileAppender)
+            if (appenders.nextElement() instanceof IgniteLog4jRollingFileAppender)
                 return;
         }
 
@@ -47,9 +47,9 @@ public class GridLog4jCorrectFileNameTest extends TestCase {
     /** {@inheritDoc} */
     @Override public void tearDown() {
         if (appender != null) {
-            Logger.getRootLogger().removeAppender(GridLog4jRollingFileAppender.class.getSimpleName());
+            Logger.getRootLogger().removeAppender(IgniteLog4jRollingFileAppender.class.getSimpleName());
 
-            GridLog4jLogger.removeAppender(appender);
+            IgniteLog4jLogger.removeAppender(appender);
         }
     }
 
@@ -97,7 +97,7 @@ public class GridLog4jCorrectFileNameTest extends TestCase {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
         cfg.setGridName(gridName);
-        cfg.setGridLogger(new GridLog4jLogger());
+        cfg.setGridLogger(new IgniteLog4jLogger());
         cfg.setRestEnabled(false);
 
         return cfg;
@@ -109,12 +109,12 @@ public class GridLog4jCorrectFileNameTest extends TestCase {
      * @return GridLog4jRollingFileAppender.
      * @throws Exception If error occurred.
      */
-    private static GridLog4jRollingFileAppender createAppender() throws Exception {
-        GridLog4jRollingFileAppender appender = new GridLog4jRollingFileAppender();
+    private static IgniteLog4jRollingFileAppender createAppender() throws Exception {
+        IgniteLog4jRollingFileAppender appender = new IgniteLog4jRollingFileAppender();
 
         appender.setLayout(new PatternLayout("[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n"));
         appender.setFile("work/log/gridgain.log");
-        appender.setName(GridLog4jRollingFileAppender.class.getSimpleName());
+        appender.setName(IgniteLog4jRollingFileAppender.class.getSimpleName());
 
         LevelRangeFilter lvlFilter = new LevelRangeFilter();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/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 54ea5c1..0d24540 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
@@ -30,7 +30,7 @@ public class GridLog4jInitializedTest extends TestCase {
 
     /** */
     public void testLogInitialize() {
-        IgniteLogger log = new GridLog4jLogger();
+        IgniteLogger log = new IgniteLog4jLogger();
 
         assert log.isInfoEnabled() == true;
 
@@ -43,6 +43,6 @@ public class GridLog4jInitializedTest extends TestCase {
         log.error("This is 'error' message.");
         log.error("This is 'error' message.", new Exception("It's a test error exception"));
 
-        assert log.getLogger(GridLog4jInitializedTest.class.getName()) instanceof GridLog4jLogger;
+        assert log.getLogger(GridLog4jInitializedTest.class.getName()) instanceof IgniteLog4jLogger;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
index fa82eb1..ce6e04f 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingFileTest.java
@@ -31,7 +31,7 @@ public class GridLog4jLoggingFileTest extends TestCase {
         assert xml != null;
         assert xml.exists() == true;
 
-        log = new GridLog4jLogger(xml).getLogger(getClass());
+        log = new IgniteLog4jLogger(xml).getLogger(getClass());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
index 0457d54..1bb008f 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingPathTest.java
@@ -24,7 +24,7 @@ public class GridLog4jLoggingPathTest extends TestCase {
 
     /** {@inheritDoc} */
     @Override protected void setUp() throws Exception {
-        log = new GridLog4jLogger("modules/core/src/test/config/log4j-test.xml").getLogger(getClass());
+        log = new IgniteLog4jLogger("modules/core/src/test/config/log4j-test.xml").getLogger(getClass());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
index 951b920..bbbde8e 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jLoggingUrlTest.java
@@ -31,7 +31,7 @@ public class GridLog4jLoggingUrlTest extends TestCase {
         assert xml != null;
         assert xml.exists();
 
-        log = new GridLog4jLogger(xml.toURI().toURL()).getLogger(getClass());
+        log = new IgniteLog4jLogger(xml.toURI().toURL()).getLogger(getClass());
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ff14819b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
index 2b5a0a9..7ba4778 100644
--- a/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
+++ b/modules/log4j/src/test/java/org/gridgain/grid/logger/log4j/GridLog4jNotInitializedTest.java
@@ -21,7 +21,7 @@ import org.gridgain.testframework.junits.common.*;
 public class GridLog4jNotInitializedTest extends TestCase {
     /** */
     public void testLogInitialize() {
-        IgniteLogger log = new GridLog4jLogger().getLogger(GridLog4jNotInitializedTest.class);
+        IgniteLogger log = new IgniteLog4jLogger().getLogger(GridLog4jNotInitializedTest.class);
 
         if (log.isDebugEnabled())
             log.debug("This is 'debug' message.");


[11/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
index c935b36..203ddb7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
+++ b/modules/core/src/main/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshaller.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.marshaller.optimized;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/marshaller/package.html
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/marshaller/package.html b/modules/core/src/main/java/org/gridgain/grid/marshaller/package.html
deleted file mode 100644
index 0129583..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/marshaller/package.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--
-    @html.file.header
-    _________        _____ __________________        _____
-    __  ____/___________(_)______  /__  ____/______ ____(_)_______
-    _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
-    / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
-    \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
--->
-<html>
-<body>
-    <!-- Package description. -->
-    Contains various supported marshallers.
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
index 3af3d65..aa0359d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpi.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.spi.checkpoint.sharedfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
index 4e9174f..79f05a2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsTimeoutTask.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.spi.checkpoint.sharedfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.checkpoint.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
index d668ffc..13689f3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/checkpoint/sharedfs/GridSharedFsUtils.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.spi.checkpoint.sharedfs;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import java.io.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
index f184747..9617000 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/communication/tcp/GridTcpCommunicationSpi.java
@@ -13,10 +13,10 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.communication.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
index c5a7276..4bffc5e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpi.java
@@ -12,11 +12,11 @@ package org.gridgain.grid.spi.discovery.tcp;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.security.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
index 970d9d2..e8dd237 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/GridTcpDiscoverySpiAdapter.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.spi.discovery.tcp;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.product.*;
 import org.gridgain.grid.spi.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
index f525818..c0e460b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/multicast/GridTcpDiscoveryMulticastIpFinder.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
index 1a6c044..d8eb600 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/indexing/GridIndexingEntityAdapter.java
@@ -9,7 +9,6 @@
 
 package org.gridgain.grid.spi.indexing;
 
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;
 import org.jetbrains.annotations.*;
@@ -28,7 +27,7 @@ public class GridIndexingEntityAdapter<T> implements GridIndexingEntity<T> {
 
     /**
      * @param val Value.
-     * @param bytes Value marshalled by {@link GridMarshaller}.
+     * @param bytes Value marshalled by {@link org.apache.ignite.marshaller.GridMarshaller}.
      */
     public GridIndexingEntityAdapter(T val, @Nullable byte[] bytes) {
         this.val = val;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
index 4369071..4dc2c6d 100644
--- a/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
+++ b/modules/core/src/main/java/org/gridgain/grid/spi/swapspace/file/GridFileSwapSpaceSpi.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.spi.swapspace.file;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.swapspace.*;
 import org.gridgain.grid.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
index 58ddf28..1ddadfe 100644
--- a/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
+++ b/modules/core/src/main/java/org/gridgain/jdbc/util/GridJdbcUtils.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.jdbc.util;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.util.typedef.internal.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
index b7c4b7b..bfddb5a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridExternalizableAbstractTest.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.grid;
 
-import org.gridgain.grid.marshaller.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java b/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
index eaad31e..b84989c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
+++ b/modules/core/src/test/java/org/gridgain/grid/GridTestIoUtils.java
@@ -10,7 +10,7 @@
 package org.gridgain.grid;
 
 import org.apache.commons.io.*;
-import org.gridgain.grid.marshaller.*;
+import org.apache.ignite.marshaller.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
index 45939c9..2383d61 100644
--- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.ggfs;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
index 023de74..4d14c0e 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridJobMasterLeaveAwareSelfTest.java
@@ -14,12 +14,12 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;
 import org.gridgain.grid.kernal.managers.communication.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.communication.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
index 6fe2f1c..eb5b96b 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/GridTopicExternalizableSelfTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 
 import java.io.*;
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index f93cd11..490fbe6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -10,11 +10,11 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.marshaller.*;
 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/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
index b54e6f0..823e66a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccSelfTest.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.kernal.processors.cache;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.*;
 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/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
index 1dd80eb..65f724a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/dataload/GridDataLoaderImplSelfTest.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.dataload;
 
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.cache.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.portables.*;
 import org.gridgain.grid.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
index 11979e6..2d87f6f 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfoSelfTest.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.kernal.processors.ggfs;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;
 import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 7c70c2f..844b997 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
@@ -15,6 +15,7 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 9e7af1d..c138707 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
@@ -13,6 +13,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.logger.java.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.managers.loadbalancer.*;
 import org.gridgain.grid.marshaller.jdk.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
index 3e60ab7..9f93fc4 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/jdk/GridJdkMarshallerSelfTest.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.marshaller.jdk;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.testframework.junits.common.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
index 85ddeba..29132c6 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerSelfTest.java
@@ -1,6 +1,7 @@
 package org.gridgain.grid.marshaller.optimized;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
index e0af00c..72d9639 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedMarshallerTest.java
@@ -2,6 +2,7 @@ package org.gridgain.grid.marshaller.optimized;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
index 3219121..f37c2bc 100644
--- a/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/optimized/GridOptimizedObjectStreamSelfTest.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.grid.marshaller.optimized;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
index b9a6aaa..8dac019 100644
--- a/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/session/GridSessionCheckpointAbstractSelfTest.java
@@ -12,9 +12,9 @@ package org.gridgain.grid.session;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.checkpoint.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index cd1bbcd..0f66823 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -12,12 +12,12 @@ package org.gridgain.grid.spi.communication.tcp;
 import org.apache.ignite.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.spi.communication.*;
 import org.gridgain.grid.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 150dbb8..8f979a3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -12,6 +12,7 @@ package org.gridgain.grid.spi.communication.tcp;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -19,7 +20,6 @@ import org.gridgain.grid.cache.query.*;
 import org.gridgain.grid.kernal.*;
 import org.gridgain.grid.kernal.managers.communication.*;
 import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.marshaller.*;
 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/78736f3c/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
index 6123477..af38e80 100644
--- a/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/spi/discovery/GridAbstractDiscoverySelfTest.java
@@ -11,8 +11,8 @@ package org.gridgain.grid.spi.discovery;
 
 import mx4j.tools.adaptor.http.*;
 import org.apache.ignite.cluster.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.kernal.managers.security.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
index cdcf82c..367f150 100644
--- a/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/util/future/GridFinishedFutureSelfTest.java
@@ -10,9 +10,9 @@
 package org.gridgain.grid.util.future;
 
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.testframework.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 411e3b6..910d3c5 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
@@ -15,13 +15,13 @@ import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.log4j.*;
 import org.gridgain.grid.*;
 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.marshaller.*;
 import org.gridgain.grid.marshaller.jdk.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.spi.checkpoint.sharedfs.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 98b0bc8..2aefe07 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
@@ -10,10 +10,10 @@
 package org.gridgain.testframework.junits;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.resource.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 bfe5446..ae3a600 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
@@ -10,10 +10,10 @@
 package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 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.marshaller.*;
 import org.gridgain.grid.thread.*;
 import org.gridgain.grid.util.*;
 import org.gridgain.grid.util.ipc.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
index 636c05a..3c0080e 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopMarshallerFilter.java
@@ -9,9 +9,9 @@
 
 package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
 
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.processors.hadoop.message.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.nio.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 1526100..de90bb1 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
@@ -10,9 +10,9 @@
 package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communication;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.kernal.processors.hadoop.message.*;
 import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.marshaller.optimized.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.testframework.junits.common.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 0ae3b52..dd2f2bd 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
@@ -10,11 +10,11 @@
 package org.gridgain.grid.cache.store.hibernate;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.store.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.util.typedef.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.gridgain.grid.util.tostring.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 acb0004..411431f 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
@@ -10,10 +10,10 @@
 package org.gridgain.grid.spi.indexing.h2;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.indexing.*;
 import org.gridgain.grid.spi.indexing.h2.opt.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/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 4a4f38b..69e5fed 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
@@ -10,8 +10,8 @@
 package org.gridgain.grid.spi.indexing;
 
 import org.apache.ignite.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.indexing.h2.*;
 import org.gridgain.grid.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
index cdd68d4..0c42fe9 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridFactorySelfTest.java
@@ -14,9 +14,9 @@ import org.apache.ignite.compute.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.grid.spi.*;
 import org.gridgain.grid.spi.collision.*;
 import org.gridgain.grid.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
index 8e7ae7a..9454b25 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/GridSpringBeanSerializationSelfTest.java
@@ -10,8 +10,8 @@
 package org.gridgain.grid.kernal;
 
 import org.apache.ignite.configuration.*;
+import org.apache.ignite.marshaller.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 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/78736f3c/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
index 48d781e..d1c48c6 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceFieldInjectionSelfTest.java
@@ -12,9 +12,9 @@ package org.gridgain.grid.kernal.processors.resource;
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import org.springframework.beans.factory.support.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/78736f3c/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
index 3ba8d23..9166f28 100644
--- a/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/gridgain/grid/kernal/processors/resource/GridResourceMethodInjectionSelfTest.java
@@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.resource;
 
 import org.apache.ignite.*;
 import org.apache.ignite.compute.*;
+import org.apache.ignite.marshaller.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.marshaller.*;
 import org.gridgain.testframework.*;
 import org.gridgain.testframework.junits.common.*;
 import org.springframework.beans.factory.support.*;


[44/53] [abbrv] incubator-ignite git commit: # gg-9470-rename

Posted by sb...@apache.org.
# gg-9470-rename


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

Branch: refs/heads/master
Commit: e04165bbe46a93474acd1d132bfb4d2afe7012e8
Parents: 3dcb522
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 4 22:39:57 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 4 22:40:11 2014 +0300

----------------------------------------------------------------------
 .../client/GridClientPortableArgumentTask.java  |   2 +-
 .../gridgain/client/GridClientTestPortable.java |   2 +-
 .../GridClientTestPortableAffinityKeyTask.java  |   2 +-
 .../clients/src/test/resources/spring-cache.xml |   4 +-
 .../src/test/resources/spring-server-node.xml   |  10 +-
 .../test/resources/spring-server-ssl-node.xml   |   4 +-
 .../java/org/apache/ignite/IgnitePortables.java |  32 +--
 .../configuration/IgniteConfiguration.java      |   2 +-
 .../ignite/portables/GridPortableBuilder.java   | 129 +++++++++
 .../portables/GridPortableConfiguration.java    | 181 +++++++++++++
 .../ignite/portables/GridPortableException.java |  49 ++++
 .../ignite/portables/GridPortableIdMapper.java  |  47 ++++
 .../GridPortableInvalidClassException.java      |  50 ++++
 .../portables/GridPortableMarshalAware.java     |  40 +++
 .../ignite/portables/GridPortableMetadata.java  |  53 ++++
 .../ignite/portables/GridPortableObject.java    | 166 ++++++++++++
 .../ignite/portables/GridPortableRawReader.java | 214 +++++++++++++++
 .../ignite/portables/GridPortableRawWriter.java | 197 ++++++++++++++
 .../ignite/portables/GridPortableReader.java    | 263 +++++++++++++++++++
 .../portables/GridPortableSerializer.java       |  39 +++
 .../GridPortableTypeConfiguration.java          | 187 +++++++++++++
 .../ignite/portables/GridPortableWriter.java    | 242 +++++++++++++++++
 .../org/apache/ignite/portables/package.html    |  15 ++
 .../gridgain/client/GridClientCacheFlag.java    |   4 +-
 .../client/GridClientConfiguration.java         |   2 +-
 .../grid/cache/GridCacheConfiguration.java      |   3 +-
 .../grid/cache/GridCacheProjection.java         |   3 +-
 .../grid/cache/store/GridCacheStore.java        |   5 +-
 .../grid/dotnet/GridDotNetConfiguration.java    |   2 +-
 .../dotnet/GridDotNetPortableConfiguration.java |   2 +-
 .../GridDotNetPortableTypeConfiguration.java    |   2 +-
 .../gridgain/grid/kernal/GridPortablesImpl.java |   2 +-
 .../managers/indexing/GridIndexingManager.java  |   2 +-
 .../affinity/GridAffinityAssignmentCache.java   |   2 +-
 .../processors/cache/GridCacheAdapter.java      |   2 +-
 .../processors/cache/GridCacheContext.java      |   4 +-
 .../GridCacheDefaultAffinityKeyMapper.java      |   2 +-
 .../cache/GridCacheProjectionImpl.java          |   2 +-
 .../cache/GridCacheTxLocalAdapter.java          |   2 +-
 .../cache/affinity/GridCacheAffinityImpl.java   |   2 +-
 .../dht/GridPartitionedGetFuture.java           |   2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   2 +-
 .../distributed/near/GridNearGetFuture.java     |   2 +-
 .../portable/GridPortableProcessor.java         |   3 +-
 .../portable/os/GridOsPortableProcessor.java    |   2 +-
 .../message/GridClientAbstractMessage.java      |   3 +-
 .../GridClientAuthenticationRequest.java        |   2 +-
 .../message/GridClientCacheQueryRequest.java    |   2 +-
 .../client/message/GridClientCacheRequest.java  |   2 +-
 .../message/GridClientGetMetaDataRequest.java   |   2 +-
 .../client/message/GridClientLogRequest.java    |   2 +-
 .../message/GridClientMetaDataResponse.java     |   2 +-
 .../rest/client/message/GridClientNodeBean.java |   2 +-
 .../message/GridClientNodeMetricsBean.java      |   2 +-
 .../message/GridClientPortableMetaData.java     |   2 +-
 .../message/GridClientPutMetaDataRequest.java   |   2 +-
 .../rest/client/message/GridClientResponse.java |   2 +-
 .../client/message/GridClientTaskRequest.java   |   2 +-
 .../message/GridClientTaskResultBean.java       |   2 +-
 .../message/GridClientTopologyRequest.java      |   2 +-
 .../cache/GridCacheClientQueryResult.java       |   2 +-
 .../metadata/GridPortableMetadataHandler.java   |   2 +-
 .../handlers/task/GridTaskCommandHandler.java   |   2 +-
 .../VisorPortableMetadataCollectorTask.java     |   2 +-
 .../grid/portables/GridPortableBuilder.java     | 129 ---------
 .../portables/GridPortableConfiguration.java    | 181 -------------
 .../grid/portables/GridPortableException.java   |  49 ----
 .../grid/portables/GridPortableIdMapper.java    |  47 ----
 .../GridPortableInvalidClassException.java      |  50 ----
 .../portables/GridPortableMarshalAware.java     |  40 ---
 .../grid/portables/GridPortableMetadata.java    |  53 ----
 .../grid/portables/GridPortableObject.java      | 166 ------------
 .../grid/portables/GridPortableRawReader.java   | 214 ---------------
 .../grid/portables/GridPortableRawWriter.java   | 197 --------------
 .../grid/portables/GridPortableReader.java      | 263 -------------------
 .../grid/portables/GridPortableSerializer.java  |  39 ---
 .../GridPortableTypeConfiguration.java          | 187 -------------
 .../grid/portables/GridPortableWriter.java      | 242 -----------------
 .../org/gridgain/grid/portables/package.html    |  15 --
 .../grid/security/GridSecurityCredentials.java  |   2 +-
 .../java/org/gridgain/grid/util/GridUtils.java  |   2 +-
 .../util/portable/GridPortableRawReaderEx.java  |   4 +-
 .../util/portable/GridPortableRawWriterEx.java  |   4 +-
 .../GridCacheOffHeapTieredAbstractSelfTest.java |   2 +-
 ...heOffHeapTieredEvictionAbstractSelfTest.java |   2 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   2 +-
 .../dataload/GridDataLoaderImplSelfTest.java    |   2 +-
 88 files changed, 1955 insertions(+), 1962 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java
index de9ed22..051c52b 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridClientPortableArgumentTask.java
@@ -9,8 +9,8 @@
 
 package org.gridgain.client;
 
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.portables.*;
 
 import java.util.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortable.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortable.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortable.java
index c5f2f40..b9d948c 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortable.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortable.java
@@ -9,7 +9,7 @@
 
 package org.gridgain.client;
 
-import org.gridgain.grid.portables.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java
index 90ed8bd..f94481d 100644
--- a/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java
+++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTestPortableAffinityKeyTask.java
@@ -12,9 +12,9 @@ package org.gridgain.client;
 import org.apache.ignite.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
+import org.apache.ignite.portables.*;
 import org.apache.ignite.resources.*;
 import org.gridgain.grid.*;
-import org.gridgain.grid.portables.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index 79c10dc..ee34262 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -236,10 +236,10 @@
         </property>
 
         <property name="portableConfiguration">
-            <bean class="org.gridgain.grid.portables.GridPortableConfiguration">
+            <bean class="org.apache.ignite.portables.GridPortableConfiguration">
                 <property name="typeConfigurations">
                     <list>
-                        <bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration">
+                        <bean class="org.apache.ignite.portables.GridPortableTypeConfiguration">
                             <property name="className" value="org.gridgain.client.GridClientTestPortable"/>
                         </bean>
                     </list>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index c5d9e8a..2c4b58b 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -70,19 +70,19 @@
         </property>
 
         <property name="portableConfiguration">
-            <bean class="org.gridgain.grid.portables.GridPortableConfiguration">
+            <bean class="org.apache.ignite.portables.GridPortableConfiguration">
                 <property name="typeConfigurations">
                     <list>
-                        <bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration">
+                        <bean class="org.apache.ignite.portables.GridPortableTypeConfiguration">
                             <property name="className" value="org.gridgain.client.GridClientTestPortable"/>
                         </bean>
-                        <bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration">
+                        <bean class="org.apache.ignite.portables.GridPortableTypeConfiguration">
                             <property name="className" value="org.gridgain.client.model.GridPortablePerson"/>
                         </bean>
-                        <bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration">
+                        <bean class="org.apache.ignite.portables.GridPortableTypeConfiguration">
                             <property name="className" value="org.gridgain.client.model.GridImplicitPortablePerson"/>
                         </bean>
-                        <bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration">
+                        <bean class="org.apache.ignite.portables.GridPortableTypeConfiguration">
                             <property name="className" value="GridNoDefPortablePerson"/>
                         </bean>
                     </list>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index 27eb154..144bf45 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -318,10 +318,10 @@
         <property name="systemExecutorServiceShutdown" value="true"/>
 
         <property name="portableConfiguration">
-            <bean class="org.gridgain.grid.portables.GridPortableConfiguration">
+            <bean class="org.apache.ignite.portables.GridPortableConfiguration">
                 <property name="typeConfigurations">
                     <list>
-                        <bean class="org.gridgain.grid.portables.GridPortableTypeConfiguration">
+                        <bean class="org.apache.ignite.portables.GridPortableTypeConfiguration">
                             <property name="className" value="org.gridgain.client.GridClientTestPortable"/>
                         </bean>
                     </list>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
index 7e8a069..547daba 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgnitePortables.java
@@ -9,9 +9,9 @@
 
 package org.apache.ignite;
 
+import org.apache.ignite.portables.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.portables.*;
 import org.jetbrains.annotations.*;
 
 import java.sql.*;
@@ -28,7 +28,7 @@ import java.util.Date;
  * <li>Automatically convert collections and maps between Java, .NET, and C++.</li>
  * <li>
  *      Optionally avoid deserialization of objects on the server side
- *      (objects are stored in {@link org.gridgain.grid.portables.GridPortableObject} format).
+ *      (objects are stored in {@link org.apache.ignite.portables.GridPortableObject} format).
  * </li>
  * <li>Avoid need to have concrete class definitions on the server side.</li>
  * <li>Dynamically change structure of the classes without having to restart the cluster.</li>
@@ -74,7 +74,7 @@ import java.util.Date;
  * GridCacheProjection&lt;Integer.class, GridPortableObject.class&gt; prj = cache.keepPortable();
  * </pre>
  * <h1 class="header">Automatic Portable Types</h1>
- * Note that only portable classes are converted to {@link org.gridgain.grid.portables.GridPortableObject} format. Following
+ * Note that only portable classes are converted to {@link org.apache.ignite.portables.GridPortableObject} format. Following
  * classes are never converted (e.g., {@link #toPortable(Object)} method will return original
  * object, and instances of these classes will be stored in cache without changes):
  * <ul>
@@ -98,7 +98,7 @@ import java.util.Date;
  * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
  * in C#, etc.
  * <h1 class="header">Building Portable Objects</h1>
- * GridGain comes with {@link org.gridgain.grid.portables.GridPortableBuilder} which allows to build portable objects dynamically:
+ * GridGain comes with {@link org.apache.ignite.portables.GridPortableBuilder} which allows to build portable objects dynamically:
  * <pre name=code class=java>
  * GridPortableBuilder builder = GridGain.grid().portables().builder();
  *
@@ -138,7 +138,7 @@ import java.util.Date;
  * As the structure of a portable object changes, the new fields become available for SQL queries
  * automatically.
  * <h1 class="header">Configuration</h1>
- * To make any object portable, you have to specify it in {@link org.gridgain.grid.portables.GridPortableConfiguration}
+ * To make any object portable, you have to specify it in {@link org.apache.ignite.portables.GridPortableConfiguration}
  * at startup. The only requirement GridGain imposes is that your object has an empty
  * constructor. Note, that since server side does not have to know the class definition,
  * you only need to list portable objects in configuration on the client side. However, if you
@@ -174,7 +174,7 @@ import java.util.Date;
  *
  * gridCfg.setPortableConfiguration(portCfg);
  * </pre>
- * You can also specify class name for a portable object via {@link org.gridgain.grid.portables.GridPortableTypeConfiguration}.
+ * You can also specify class name for a portable object via {@link org.apache.ignite.portables.GridPortableTypeConfiguration}.
  * Do it in case if you need to override other configuration properties on per-type level, like
  * ID-mapper, or serializer.
  * <h1 class="header">Custom Affinity Keys</h1>
@@ -200,9 +200,9 @@ import java.util.Date;
  * &lt;/property&gt;
  * </pre>
  * <h1 class="header">Serialization</h1>
- * Once portable object is specified in {@link org.gridgain.grid.portables.GridPortableConfiguration}, GridGain will
+ * Once portable object is specified in {@link org.apache.ignite.portables.GridPortableConfiguration}, GridGain will
  * be able to serialize and deserialize it. However, you can provide your own custom
- * serialization logic by optionally implementing {@link org.gridgain.grid.portables.GridPortableMarshalAware} interface, like so:
+ * serialization logic by optionally implementing {@link org.apache.ignite.portables.GridPortableMarshalAware} interface, like so:
  * <pre name=code class=java>
  * public class Address implements GridPortableMarshalAware {
  *     private String street;
@@ -223,8 +223,8 @@ import java.util.Date;
  * }
  * </pre>
  * Alternatively, if you cannot change class definitions, you can provide custom serialization
- * logic in {@link org.gridgain.grid.portables.GridPortableSerializer} either globally in {@link org.gridgain.grid.portables.GridPortableConfiguration} or
- * for a specific type via {@link org.gridgain.grid.portables.GridPortableTypeConfiguration} instance.
+ * logic in {@link org.apache.ignite.portables.GridPortableSerializer} either globally in {@link org.apache.ignite.portables.GridPortableConfiguration} or
+ * for a specific type via {@link org.apache.ignite.portables.GridPortableTypeConfiguration} instance.
  * <p>
  * Similar to java serialization you can use {@code writeReplace()} and {@code readResolve()} methods.
  * <ul>
@@ -241,10 +241,10 @@ import java.util.Date;
  * <h1 class="header">Custom ID Mappers</h1>
  * GridGain implementation uses name hash codes to generate IDs for class names or field names
  * internally. However, in cases when you want to provide your own ID mapping schema,
- * you can provide your own {@link org.gridgain.grid.portables.GridPortableIdMapper} implementation.
+ * you can provide your own {@link org.apache.ignite.portables.GridPortableIdMapper} implementation.
  * <p>
- * ID-mapper may be provided either globally in {@link org.gridgain.grid.portables.GridPortableConfiguration},
- * or for a specific type via {@link org.gridgain.grid.portables.GridPortableTypeConfiguration} instance.
+ * ID-mapper may be provided either globally in {@link org.apache.ignite.portables.GridPortableConfiguration},
+ * or for a specific type via {@link org.apache.ignite.portables.GridPortableTypeConfiguration} instance.
  * <h1 class="header">Query Indexing</h1>
  * Portable objects can be indexed for querying by specifying index fields in
  * {@link GridCacheQueryTypeMetadata} inside of specific {@link GridCacheConfiguration} instance,
@@ -287,13 +287,13 @@ public interface IgnitePortables {
     public int typeId(String typeName);
 
     /**
-     * Converts provided object to instance of {@link org.gridgain.grid.portables.GridPortableObject}.
+     * Converts provided object to instance of {@link org.apache.ignite.portables.GridPortableObject}.
      * <p>
-     * Note that object's type needs to be configured in {@link org.gridgain.grid.portables.GridPortableConfiguration}.
+     * Note that object's type needs to be configured in {@link org.apache.ignite.portables.GridPortableConfiguration}.
      *
      * @param obj Object to convert.
      * @return Converted object.
-     * @throws org.gridgain.grid.portables.GridPortableException In case of error.
+     * @throws org.apache.ignite.portables.GridPortableException In case of error.
      */
     public <T> T toPortable(@Nullable Object obj) throws GridPortableException;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 85516d1..c8a7a52 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -16,6 +16,7 @@ import org.apache.ignite.lifecycle.*;
 import org.apache.ignite.managed.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.plugin.*;
+import org.apache.ignite.portables.*;
 import org.gridgain.client.ssl.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.cache.*;
@@ -25,7 +26,6 @@ import org.gridgain.grid.dr.hub.sender.*;
 import org.gridgain.grid.ggfs.*;
 import org.gridgain.grid.hadoop.*;
 import org.gridgain.grid.kernal.managers.eventstorage.*;
-import org.gridgain.grid.portables.*;
 import org.gridgain.grid.security.*;
 import org.gridgain.grid.segmentation.*;
 import org.gridgain.grid.spi.authentication.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableBuilder.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableBuilder.java
new file mode 100644
index 0000000..a400047
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableBuilder.java
@@ -0,0 +1,129 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Portable object builder. Provides ability to build portable objects dynamically
+ * without having class definitions.
+ * <p>
+ * Here is an example of how a portable object can be built dynamically:
+ * <pre name=code class=java>
+ * GridPortableBuilder builder = GridGain.grid().portables().builder("org.project.MyObject");
+ *
+ * builder.setField("fieldA", "A");
+ * builder.setField("fieldB", "B");
+ *
+ * GridPortableObject portableObj = builder.build();
+ * </pre>
+ *
+ * <p>
+ * Also builder can be initialized by existing portable object. This allows changing some fields without affecting
+ * other fields.
+ * <pre name=code class=java>
+ * GridPortableBuilder builder = GridGain.grid().portables().builder(person);
+ *
+ * builder.setField("name", "John");
+ *
+ * person = builder.build();
+ * </pre>
+ * </p>
+ *
+ * If you need to modify nested portable object you can get builder for nested object using
+ * {@link #getField(String)}, changes made on nested builder will affect parent object,
+ * for example:
+ *
+ * <pre name=code class=java>
+ * GridPortableBuilder personBuilder = grid.portables().createBuilder(personPortableObj);
+ * GridPortableBuilder addressBuilder = personBuilder.setField("address");
+ *
+ * addressBuilder.setField("city", "New York");
+ *
+ * personPortableObj = personBuilder.build();
+ *
+ * // Should be "New York".
+ * String city = personPortableObj.getField("address").getField("city");
+ * </pre>
+ *
+ * @see org.apache.ignite.IgnitePortables#builder(int)
+ * @see org.apache.ignite.IgnitePortables#builder(String)
+ * @see org.apache.ignite.IgnitePortables#builder(GridPortableObject)
+ */
+public interface GridPortableBuilder {
+    /**
+     * Returns value assigned to the specified field.
+     * If the value is a portable object instance of {@code GridPortableBuilder} will be returned,
+     * which can be modified.
+     * <p>
+     * Collections and maps returned from this method are modifiable.
+     *
+     * @param name Field name.
+     * @return Filed value.
+     */
+    public <T> T getField(String name);
+
+    /**
+     * Sets field value.
+     *
+     * @param name Field name.
+     * @param val Field value (cannot be {@code null}).
+     * @see GridPortableObject#metaData()
+     */
+    public GridPortableBuilder setField(String name, Object val);
+
+    /**
+     * Sets field value with value type specification.
+     * <p>
+     * Field type is needed for proper metadata update.
+     *
+     * @param name Field name.
+     * @param val Field value.
+     * @param type Field type.
+     * @see GridPortableObject#metaData()
+     */
+    public <T> GridPortableBuilder setField(String name, @Nullable T val, Class<? super T> type);
+
+    /**
+     * Sets field value.
+     * <p>
+     * This method should be used if field is portable object.
+     *
+     * @param name Field name.
+     * @param builder Builder for object field.
+     */
+    public GridPortableBuilder setField(String name, @Nullable GridPortableBuilder builder);
+
+    /**
+     * Removes field from this builder.
+     *
+     * @param fieldName Field name.
+     * @return {@code this} instance for chaining.
+     */
+    public GridPortableBuilder removeField(String fieldName);
+
+    /**
+     * Sets hash code for resulting portable object returned by {@link #build()} method.
+     * <p>
+     * If not set {@code 0} is used.
+     *
+     * @param hashCode Hash code.
+     * @return {@code this} instance for chaining.
+     */
+    public GridPortableBuilder hashCode(int hashCode);
+
+    /**
+     * Builds portable object.
+     *
+     * @return Portable object.
+     * @throws GridPortableException In case of error.
+     */
+    public GridPortableObject build() throws GridPortableException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableConfiguration.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableConfiguration.java
new file mode 100644
index 0000000..c1cfa0d
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableConfiguration.java
@@ -0,0 +1,181 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.sql.Timestamp;
+import java.util.*;
+
+/**
+ * Defines configuration for GridGain portable functionality. All configuration
+ * properties defined here can be overridden on per-type level in
+ * {@link GridPortableTypeConfiguration}. Type configurations are provided via
+ * {@link #getTypeConfigurations()} method.
+ */
+public class GridPortableConfiguration {
+    /** Class names. */
+    private Collection<String> clsNames;
+
+    /** ID mapper. */
+    private GridPortableIdMapper idMapper;
+
+    /** Serializer. */
+    private GridPortableSerializer serializer;
+
+    /** Types. */
+    private Collection<GridPortableTypeConfiguration> typeCfgs;
+
+    /** Use timestamp flag. */
+    private boolean useTs = true;
+
+    /** Meta data enabled flag. */
+    private boolean metaDataEnabled = true;
+
+    /** Keep deserialized flag. */
+    private boolean keepDeserialized = true;
+
+    /**
+     * Gets class names.
+     *
+     * @return Class names.
+     */
+    public Collection<String> getClassNames() {
+        return clsNames;
+    }
+
+    /**
+     * Sets class names.
+     *
+     * @param clsNames Class names.
+     */
+    public void setClassNames(Collection<String> clsNames) {
+        this.clsNames = clsNames;
+    }
+
+    /**
+     * Gets ID mapper.
+     *
+     * @return ID mapper.
+     */
+    public GridPortableIdMapper getIdMapper() {
+        return idMapper;
+    }
+
+    /**
+     * Sets ID mapper.
+     *
+     * @param idMapper ID mapper.
+     */
+    public void setIdMapper(GridPortableIdMapper idMapper) {
+        this.idMapper = idMapper;
+    }
+
+    /**
+     * Gets serializer.
+     *
+     * @return Serializer.
+     */
+    public GridPortableSerializer getSerializer() {
+        return serializer;
+    }
+
+    /**
+     * Sets serializer.
+     *
+     * @param serializer Serializer.
+     */
+    public void setSerializer(GridPortableSerializer serializer) {
+        this.serializer = serializer;
+    }
+
+    /**
+     * Gets types configuration.
+     *
+     * @return Types configuration.
+     */
+    public Collection<GridPortableTypeConfiguration> getTypeConfigurations() {
+        return typeCfgs;
+    }
+
+    /**
+     * Sets type configurations.
+     *
+     * @param typeCfgs Type configurations.
+     */
+    public void setTypeConfigurations(Collection<GridPortableTypeConfiguration> typeCfgs) {
+        this.typeCfgs = typeCfgs;
+    }
+
+    /**
+     * If {@code true} then date values converted to {@link Timestamp} on deserialization.
+     * <p>
+     * Default value is {@code true}.
+     *
+     * @return Flag indicating whether date values converted to {@link Timestamp} during unmarshalling.
+     */
+    public boolean isUseTimestamp() {
+        return useTs;
+    }
+
+    /**
+     * @param useTs Flag indicating whether date values converted to {@link Timestamp} during unmarshalling.
+     */
+    public void setUseTimestamp(boolean useTs) {
+        this.useTs = useTs;
+    }
+
+    /**
+     * If {@code true}, meta data will be collected or all types. If you need to override this behaviour for
+     * some specific type, use {@link GridPortableTypeConfiguration#setMetaDataEnabled(Boolean)} method.
+     * <p>
+     * Default value if {@code true}.
+     *
+     * @return Whether meta data is collected.
+     */
+    public boolean isMetaDataEnabled() {
+        return metaDataEnabled;
+    }
+
+    /**
+     * @param metaDataEnabled Whether meta data is collected.
+     */
+    public void setMetaDataEnabled(boolean metaDataEnabled) {
+        this.metaDataEnabled = metaDataEnabled;
+    }
+
+    /**
+     * If {@code true}, {@link GridPortableObject} will cache deserialized instance after
+     * {@link GridPortableObject#deserialize()} is called. All consequent calls of this
+     * method on the same instance of {@link GridPortableObject} will return that cached
+     * value without actually deserializing portable object. If you need to override this
+     * behaviour for some specific type, use {@link GridPortableTypeConfiguration#setKeepDeserialized(Boolean)}
+     * method.
+     * <p>
+     * Default value if {@code true}.
+     *
+     * @return Whether deserialized value is kept.
+     */
+    public boolean isKeepDeserialized() {
+        return keepDeserialized;
+    }
+
+    /**
+     * @param keepDeserialized Whether deserialized value is kept.
+     */
+    public void setKeepDeserialized(boolean keepDeserialized) {
+        this.keepDeserialized = keepDeserialized;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(GridPortableConfiguration.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableException.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableException.java
new file mode 100644
index 0000000..2a5e430
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableException.java
@@ -0,0 +1,49 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.gridgain.grid.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * Exception indicating portable object serialization error.
+ */
+public class GridPortableException extends GridRuntimeException {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * Creates portable exception with error message.
+     *
+     * @param msg Error message.
+     */
+    public GridPortableException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Creates portable exception with {@link Throwable} as a cause.
+     *
+     * @param cause Cause.
+     */
+    public GridPortableException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Creates portable exception with error message and {@link Throwable} as a cause.
+     *
+     * @param msg Error message.
+     * @param cause Cause.
+     */
+    public GridPortableException(String msg, @Nullable Throwable cause) {
+        super(msg, cause);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableIdMapper.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableIdMapper.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableIdMapper.java
new file mode 100644
index 0000000..b5cff6f
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableIdMapper.java
@@ -0,0 +1,47 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+/**
+ * Type and field ID mapper for portable objects. GridGain never writes full
+ * strings for field or type names. Instead, for performance reasons, GridGain
+ * writes integer hash codes for type and field names. It has been tested that
+ * hash code conflicts for the type names or the field names
+ * within the same type are virtually non-existent and, to gain performance, it is safe
+ * to work with hash codes. For the cases when hash codes for different types or fields
+ * actually do collide {@code GridPortableIdMapper} allows to override the automatically
+ * generated hash code IDs for the type and field names.
+ * <p>
+ * Portable ID mapper can be configured for all portable objects via
+ * {@link GridPortableConfiguration#getIdMapper()} method, or for a specific
+ * portable type via {@link GridPortableTypeConfiguration#getIdMapper()} method.
+ */
+public interface GridPortableIdMapper {
+    /**
+     * Gets type ID for provided class name.
+     * <p>
+     * If {@code 0} is returned, hash code of class simple name will be used.
+     *
+     * @param clsName Class name.
+     * @return Type ID.
+     */
+    public int typeId(String clsName);
+
+    /**
+     * Gets ID for provided field.
+     * <p>
+     * If {@code 0} is returned, hash code of field name will be used.
+     *
+     * @param typeId Type ID.
+     * @param fieldName Field name.
+     * @return Field ID.
+     */
+    public int fieldId(int typeId, String fieldName);
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableInvalidClassException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableInvalidClassException.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableInvalidClassException.java
new file mode 100644
index 0000000..24fabc5
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableInvalidClassException.java
@@ -0,0 +1,50 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * Exception indicating that class needed for deserialization of portable object does not exist.
+ * <p>
+ * Thrown from {@link GridPortableObject#deserialize()} method.
+ */
+public class GridPortableInvalidClassException extends GridPortableException {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * Creates invalid class exception with error message.
+     *
+     * @param msg Error message.
+     */
+    public GridPortableInvalidClassException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Creates invalid class exception with {@link Throwable} as a cause.
+     *
+     * @param cause Cause.
+     */
+    public GridPortableInvalidClassException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Creates invalid class exception with error message and {@link Throwable} as a cause.
+     *
+     * @param msg Error message.
+     * @param cause Cause.
+     */
+    public GridPortableInvalidClassException(String msg, @Nullable Throwable cause) {
+        super(msg, cause);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableMarshalAware.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableMarshalAware.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableMarshalAware.java
new file mode 100644
index 0000000..6dde0dc
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableMarshalAware.java
@@ -0,0 +1,40 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+/**
+ * Interface that allows to implement custom serialization
+ * logic for portable objects. Portable objects are not required
+ * to implement this interface, in which case GridGain will automatically
+ * serialize portable objects using reflection.
+ * <p>
+ * This interface, in a way, is analogous to {@link java.io.Externalizable}
+ * interface, which allows users to override default serialization logic,
+ * usually for performance reasons. The only difference here is that portable
+ * serialization is already very fast and implementing custom serialization
+ * logic for portables does not provide significant performance gains.
+ */
+public interface GridPortableMarshalAware {
+    /**
+     * Writes fields to provided writer.
+     *
+     * @param writer Portable object writer.
+     * @throws GridPortableException In case of error.
+     */
+    public void writePortable(GridPortableWriter writer) throws GridPortableException;
+
+    /**
+     * Reads fields from provided reader.
+     *
+     * @param reader Portable object reader.
+     * @throws GridPortableException In case of error.
+     */
+    public void readPortable(GridPortableReader reader) throws GridPortableException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableMetadata.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableMetadata.java
new file mode 100644
index 0000000..5ec0dea
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableMetadata.java
@@ -0,0 +1,53 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.jetbrains.annotations.*;
+
+import java.util.*;
+
+/**
+ * Portable type meta data. Metadata for portable types can be accessed from any of the
+ * {@link org.apache.ignite.IgnitePortables#metadata(String) GridPortables.metadata(...)} methods.
+ * Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
+ * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
+ */
+public interface GridPortableMetadata {
+    /**
+     * Gets portable type name.
+     *
+     * @return Portable type name.
+     */
+    public String typeName();
+
+    /**
+     * Gets collection of all field names for this portable type.
+     *
+     * @return Collection of all field names for this portable type.
+     */
+    public Collection<String> fields();
+
+    /**
+     * Gets name of the field type for a given field.
+     *
+     * @param fieldName Field name.
+     * @return Field type name.
+     */
+    @Nullable public String fieldTypeName(String fieldName);
+
+    /**
+     * Portable objects can optionally specify custom key-affinity mapping in the
+     * configuration. This method returns the name of the field which should be
+     * used for the key-affinity mapping.
+     *
+     * @return Affinity key field name.
+     */
+    @Nullable public String affinityKeyFieldName();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableObject.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableObject.java
new file mode 100644
index 0000000..12b6049
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableObject.java
@@ -0,0 +1,166 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.jetbrains.annotations.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Wrapper for portable object in portable binary format. Once an object is defined as portable,
+ * GridGain will always store it in memory in the portable (i.e. binary) format.
+ * User can choose to work either with the portable format or with the deserialized form
+ * (assuming that class definitions are present in the classpath).
+ * <p>
+ * <b>NOTE:</b> user does not need to (and should not) implement this interface directly.
+ * <p>
+ * To work with the portable format directly, user should create a cache projection
+ * over {@code GridPortableObject} class and then retrieve individual fields as needed:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;GridPortableObject.class, GridPortableObject.class&gt; prj =
+ *     cache.projection(GridPortableObject.class, GridPortableObject.class);
+ *
+ * // Convert instance of MyKey to portable format.
+ * // We could also use GridPortableBuilder to create
+ * // the key in portable format directly.
+ * GridPortableObject key = grid.portables().toPortable(new MyKey());
+ *
+ * GridPortableObject val = prj.get(key);
+ *
+ * String field = val.field("myFieldName");
+ * </pre>
+ * Alternatively, we could also choose a hybrid approach, where, for example,
+ * the keys are concrete deserialized objects and the values are returned in portable
+ * format, like so:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;MyKey.class, GridPortableObject.class&gt; prj =
+ *     cache.projection(MyKey.class, GridPortableObject.class);
+ *
+ * GridPortableObject val = prj.get(new MyKey());
+ *
+ * String field = val.field("myFieldName");
+ * </pre>
+ * We could also have the values as concrete deserialized objects and the keys in portable format,
+ * but such use case is a lot less common because cache keys are usually a lot smaller than values, and
+ * it may be very cheap to deserialize the keys, but not the values.
+ * <p>
+ * And finally, if we have class definitions in the classpath, we may choose to work with deserialized
+ * typed objects at all times. In this case we do incur the deserialization cost, however,
+ * GridGain will only deserialize on the first access and will cache the deserialized object,
+ * so it does not have to be deserialized again:
+ * <pre name=code class=java>
+ * GridCacheProjection&lt;MyKey.class, MyValue.class&gt; prj =
+ *     cache.projection(MyKey.class, MyValue.class);
+ *
+ * MyValue val = prj.get(new MyKey());
+ *
+ * // Normal java getter.
+ * String fieldVal = val.getMyFieldName();
+ * </pre>
+ * <h1 class="header">Working With Maps and Collections</h1>
+ * All maps and collections in the portable objects are serialized automatically. When working
+ * with different platforms, e.g. C++ or .NET, GridGain will automatically pick the most
+ * adequate collection or map in either language. For example, {@link ArrayList} in Java will become
+ * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap}
+ * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary}
+ * in C#, etc.
+ * <h1 class="header">Dynamic Structure Changes</h1>
+ * Since objects are always cached in the portable binary format, server does not need to
+ * be aware of the class definitions. Moreover, if class definitions are not present or not
+ * used on the server, then clients can continuously change the structure of the portable
+ * objects without having to restart the cluster. For example, if one client stores a
+ * certain class with fields A and B, and another client stores the same class with
+ * fields B and C, then the server-side portable object will have the fields A, B, and C.
+ * As the structure of a portable object changes, the new fields become available for SQL queries
+ * automatically.
+ * <h1 class="header">Building Portable Objects</h1>
+ * GridGain comes with {@link GridPortableBuilder} which allows to build portable objects dynamically:
+ * <pre name=code class=java>
+ * GridPortableBuilder builder = GridGain.grid().portables().builder("org.project.MyObject");
+ *
+ * builder.setField("fieldA", "A");
+ * builder.setField("fieldB", "B");
+ *
+ * GridPortableObject portableObj = builder.build();
+ * </pre>
+ * For the cases when class definition is present
+ * in the class path, it is also possible to populate a standard POJO and then
+ * convert it to portable format, like so:
+ * <pre name=code class=java>
+ * MyObject obj = new MyObject();
+ *
+ * obj.setFieldA("A");
+ * obj.setFieldB(123);
+ *
+ * GridPortableObject portableObj = GridGain.grid().portables().toPortable(obj);
+ * </pre>
+ * <h1 class="header">Portable Metadata</h1>
+ * Even though GridGain portable protocol only works with hash codes for type and field names
+ * to achieve better performance, GridGain provides metadata for all portable types which
+ * can be queried ar runtime via any of the {@link org.apache.ignite.IgnitePortables#metadata(Class) GridPortables.metadata(...)}
+ * methods. Having metadata also allows for proper formatting of {@code GridPortableObject.toString()} method,
+ * even when portable objects are kept in binary format only, which may be necessary for audit reasons.
+ */
+public interface GridPortableObject extends Serializable, Cloneable {
+    /**
+     * Gets portable object type ID.
+     *
+     * @return Type ID.
+     */
+    public int typeId();
+
+    /**
+     * Gets meta data for this portable object.
+     *
+     * @return Meta data.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public GridPortableMetadata metaData() throws GridPortableException;
+
+    /**
+     * Gets field value.
+     *
+     * @param fieldName Field name.
+     * @return Field value.
+     * @throws GridPortableException In case of any other error.
+     */
+    @Nullable public <F> F field(String fieldName) throws GridPortableException;
+
+    /**
+     * Gets fully deserialized instance of portable object.
+     *
+     * @return Fully deserialized instance of portable object.
+     * @throws GridPortableInvalidClassException If class doesn't exist.
+     * @throws GridPortableException In case of any other error.
+     */
+    @Nullable public <T> T deserialize() throws GridPortableException;
+
+    /**
+     * Creates a copy of this portable object and optionally changes field values
+     * if they are provided in map. If map is empty or {@code null}, clean copy
+     * is created.
+     *
+     * @param fields Fields to modify in copy.
+     * @return Copy of this portable object.
+     * @throws GridPortableException In case of error.
+     * @deprecated Use {@link GridPortableBuilder} instead.
+     * @see GridPortableBuilder
+     */
+    @Deprecated
+    public GridPortableObject copy(@Nullable Map<String, Object> fields) throws GridPortableException;
+
+    /**
+     * Copies this portable object.
+     *
+     * @return Copy of this portable object.
+     */
+    public GridPortableObject clone() throws CloneNotSupportedException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableRawReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableRawReader.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableRawReader.java
new file mode 100644
index 0000000..bd45f01
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableRawReader.java
@@ -0,0 +1,214 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.jetbrains.annotations.*;
+
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
+
+/**
+ * Raw reader for portable objects. Raw reader does not use field name hash codes, therefore,
+ * making the format even more compact. However, if the raw reader is used,
+ * dynamic structure changes to the portable objects are not supported.
+ */
+public interface GridPortableRawReader {
+    /**
+     * @return Byte value.
+     * @throws GridPortableException In case of error.
+     */
+    public byte readByte() throws GridPortableException;
+
+    /**
+     * @return Short value.
+     * @throws GridPortableException In case of error.
+     */
+    public short readShort() throws GridPortableException;
+
+    /**
+     * @return Integer value.
+     * @throws GridPortableException In case of error.
+     */
+    public int readInt() throws GridPortableException;
+
+    /**
+     * @return Long value.
+     * @throws GridPortableException In case of error.
+     */
+    public long readLong() throws GridPortableException;
+
+    /**
+     * @return Float value.
+     * @throws GridPortableException In case of error.
+     */
+    public float readFloat() throws GridPortableException;
+
+    /**
+     * @return Double value.
+     * @throws GridPortableException In case of error.
+     */
+    public double readDouble() throws GridPortableException;
+
+    /**
+     * @return Char value.
+     * @throws GridPortableException In case of error.
+     */
+    public char readChar() throws GridPortableException;
+
+    /**
+     * @return Boolean value.
+     * @throws GridPortableException In case of error.
+     */
+    public boolean readBoolean() throws GridPortableException;
+
+    /**
+     * @return String value.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public String readString() throws GridPortableException;
+
+    /**
+     * @return UUID.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public UUID readUuid() throws GridPortableException;
+
+    /**
+     * @return Date.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Date readDate() throws GridPortableException;
+
+    /**
+     * @return Timestamp.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Timestamp readTimestamp() throws GridPortableException;
+
+    /**
+     * @return Object.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Object readObject() throws GridPortableException;
+
+    /**
+     * @return Byte array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public byte[] readByteArray() throws GridPortableException;
+
+    /**
+     * @return Short array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public short[] readShortArray() throws GridPortableException;
+
+    /**
+     * @return Integer array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public int[] readIntArray() throws GridPortableException;
+
+    /**
+     * @return Long array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public long[] readLongArray() throws GridPortableException;
+
+    /**
+     * @return Float array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public float[] readFloatArray() throws GridPortableException;
+
+    /**
+     * @return Byte array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public double[] readDoubleArray() throws GridPortableException;
+
+    /**
+     * @return Char array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public char[] readCharArray() throws GridPortableException;
+
+    /**
+     * @return Boolean array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public boolean[] readBooleanArray() throws GridPortableException;
+
+    /**
+     * @return String array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public String[] readStringArray() throws GridPortableException;
+
+    /**
+     * @return UUID array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public UUID[] readUuidArray() throws GridPortableException;
+
+    /**
+     * @return Date array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Date[] readDateArray() throws GridPortableException;
+
+    /**
+     * @return Object array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Object[] readObjectArray() throws GridPortableException;
+
+    /**
+     * @return Collection.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T> Collection<T> readCollection() throws GridPortableException;
+
+    /**
+     * @param colCls Collection class.
+     * @return Collection.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T> Collection<T> readCollection(Class<? extends Collection<T>> colCls)
+        throws GridPortableException;
+
+    /**
+     * @return Map.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <K, V> Map<K, V> readMap() throws GridPortableException;
+
+    /**
+     * @param mapCls Map class.
+     * @return Map.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <K, V> Map<K, V> readMap(Class<? extends Map<K, V>> mapCls) throws GridPortableException;
+
+    /**
+     * @param enumCls Enum class.
+     * @return Value.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T extends Enum<?>> T readEnum(Class<T> enumCls) throws GridPortableException;
+
+    /**
+     * @param enumCls Enum class.
+     * @return Value.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T extends Enum<?>> T[] readEnumArray(Class<T> enumCls) throws GridPortableException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableRawWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableRawWriter.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableRawWriter.java
new file mode 100644
index 0000000..8127219
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableRawWriter.java
@@ -0,0 +1,197 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.jetbrains.annotations.*;
+
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
+
+/**
+ * Raw writer for portable object. Raw writer does not write field name hash codes, therefore,
+ * making the format even more compact. However, if the raw writer is used,
+ * dynamic structure changes to the portable objects are not supported.
+ */
+public interface GridPortableRawWriter {
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeByte(byte val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeShort(short val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeInt(int val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeLong(long val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeFloat(float val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeDouble(double val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeChar(char val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeBoolean(boolean val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeString(@Nullable String val) throws GridPortableException;
+
+    /**
+     * @param val UUID to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeUuid(@Nullable UUID val) throws GridPortableException;
+
+    /**
+     * @param val Date to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeDate(@Nullable Date val) throws GridPortableException;
+
+    /**
+     * @param val Timestamp to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeTimestamp(@Nullable Timestamp val) throws GridPortableException;
+
+    /**
+     * @param obj Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeObject(@Nullable Object obj) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeByteArray(@Nullable byte[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeShortArray(@Nullable short[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeIntArray(@Nullable int[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeLongArray(@Nullable long[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeFloatArray(@Nullable float[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeDoubleArray(@Nullable double[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeCharArray(@Nullable char[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeBooleanArray(@Nullable boolean[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeStringArray(@Nullable String[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeUuidArray(@Nullable UUID[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeDateArray(@Nullable Date[] val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public void writeObjectArray(@Nullable Object[] val) throws GridPortableException;
+
+    /**
+     * @param col Collection to write.
+     * @throws GridPortableException In case of error.
+     */
+    public <T> void writeCollection(@Nullable Collection<T> col) throws GridPortableException;
+
+    /**
+     * @param map Map to write.
+     * @throws GridPortableException In case of error.
+     */
+    public <K, V> void writeMap(@Nullable Map<K, V> map) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public <T extends Enum<?>> void writeEnum(T val) throws GridPortableException;
+
+    /**
+     * @param val Value to write.
+     * @throws GridPortableException In case of error.
+     */
+    public <T extends Enum<?>> void writeEnumArray(T[] val) throws GridPortableException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableReader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableReader.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableReader.java
new file mode 100644
index 0000000..eb2338d
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableReader.java
@@ -0,0 +1,263 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.jetbrains.annotations.*;
+
+import java.sql.*;
+import java.util.*;
+import java.util.Date;
+
+/**
+ * Reader for portable objects used in {@link GridPortableMarshalAware} implementations.
+ * Useful for the cases when user wants a fine-grained control over serialization.
+ * <p>
+ * Note that GridGain never writes full strings for field or type names. Instead,
+ * for performance reasons, GridGain writes integer hash codes for type and field names.
+ * It has been tested that hash code conflicts for the type names or the field names
+ * within the same type are virtually non-existent and, to gain performance, it is safe
+ * to work with hash codes. For the cases when hash codes for different types or fields
+ * actually do collide, GridGain provides {@link GridPortableIdMapper} which
+ * allows to override the automatically generated hash code IDs for the type and field names.
+ */
+public interface GridPortableReader {
+    /**
+     * @param fieldName Field name.
+     * @return Byte value.
+     * @throws GridPortableException In case of error.
+     */
+    public byte readByte(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Short value.
+     * @throws GridPortableException In case of error.
+     */
+    public short readShort(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Integer value.
+     * @throws GridPortableException In case of error.
+     */
+    public int readInt(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Long value.
+     * @throws GridPortableException In case of error.
+     */
+    public long readLong(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @throws GridPortableException In case of error.
+     * @return Float value.
+     */
+    public float readFloat(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Double value.
+     * @throws GridPortableException In case of error.
+     */
+    public double readDouble(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Char value.
+     * @throws GridPortableException In case of error.
+     */
+    public char readChar(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Boolean value.
+     * @throws GridPortableException In case of error.
+     */
+    public boolean readBoolean(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return String value.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public String readString(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return UUID.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public UUID readUuid(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Date.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Date readDate(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Timestamp.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Timestamp readTimestamp(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Object.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T> T readObject(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Byte array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public byte[] readByteArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Short array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public short[] readShortArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Integer array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public int[] readIntArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Long array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public long[] readLongArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Float array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public float[] readFloatArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Byte array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public double[] readDoubleArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Char array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public char[] readCharArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Boolean array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public boolean[] readBooleanArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return String array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public String[] readStringArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return UUID array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public UUID[] readUuidArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Date array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Date[] readDateArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Object array.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public Object[] readObjectArray(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Collection.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T> Collection<T> readCollection(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param colCls Collection class.
+     * @return Collection.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T> Collection<T> readCollection(String fieldName, Class<? extends Collection<T>> colCls)
+        throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @return Map.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <K, V> Map<K, V> readMap(String fieldName) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param mapCls Map class.
+     * @return Map.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <K, V> Map<K, V> readMap(String fieldName, Class<? extends Map<K, V>> mapCls)
+        throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param enumCls Enum class.
+     * @return Value.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T extends Enum<?>> T readEnum(String fieldName, Class<T> enumCls) throws GridPortableException;
+
+    /**
+     * @param fieldName Field name.
+     * @param enumCls Enum class.
+     * @return Value.
+     * @throws GridPortableException In case of error.
+     */
+    @Nullable public <T extends Enum<?>> T[] readEnumArray(String fieldName, Class<T> enumCls)
+        throws GridPortableException;
+
+    /**
+     * Gets raw reader. Raw reader does not use field name hash codes, therefore,
+     * making the format even more compact. However, if the raw reader is used,
+     * dynamic structure changes to the portable objects are not supported.
+     *
+     * @return Raw reader.
+     */
+    public GridPortableRawReader rawReader();
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableSerializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableSerializer.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableSerializer.java
new file mode 100644
index 0000000..1037b49
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableSerializer.java
@@ -0,0 +1,39 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+/**
+ * Interface that allows to implement custom serialization logic for portable objects.
+ * Can be used instead of {@link GridPortableMarshalAware} in case if the class
+ * cannot be changed directly.
+ * <p>
+ * Portable serializer can be configured for all portable objects via
+ * {@link GridPortableConfiguration#getSerializer()} method, or for a specific
+ * portable type via {@link GridPortableTypeConfiguration#getSerializer()} method.
+ */
+public interface GridPortableSerializer {
+    /**
+     * Writes fields to provided writer.
+     *
+     * @param obj Empty object.
+     * @param writer Portable object writer.
+     * @throws GridPortableException In case of error.
+     */
+    public void writePortable(Object obj, GridPortableWriter writer) throws GridPortableException;
+
+    /**
+     * Reads fields from provided reader.
+     *
+     * @param obj Empty object
+     * @param reader Portable object reader.
+     * @throws GridPortableException In case of error.
+     */
+    public void readPortable(Object obj, GridPortableReader reader) throws GridPortableException;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e04165bb/modules/core/src/main/java/org/apache/ignite/portables/GridPortableTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portables/GridPortableTypeConfiguration.java b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableTypeConfiguration.java
new file mode 100644
index 0000000..3a362fe
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/portables/GridPortableTypeConfiguration.java
@@ -0,0 +1,187 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.portables;
+
+import org.gridgain.grid.util.typedef.internal.*;
+
+import java.sql.*;
+
+/**
+ * Defines configuration properties for a specific portable type. Providing per-type
+ * configuration is optional, as it is generally enough to provide global
+ * portable configuration in {@link GridPortableConfiguration} instance. However,
+ * this class allows you to change configuration properties for a specific
+ * portable type without affecting configuration for other portable types.
+ * <p>
+ * Per-type portable configuration can be specified in
+ * {@link GridPortableConfiguration#getTypeConfigurations()} method.
+ */
+public class GridPortableTypeConfiguration {
+    /** Class name. */
+    private String clsName;
+
+    /** ID mapper. */
+    private GridPortableIdMapper idMapper;
+
+    /** Serializer. */
+    private GridPortableSerializer serializer;
+
+    /** Use timestamp flag. */
+    private Boolean useTs;
+
+    /** Meta data enabled flag. */
+    private Boolean metaDataEnabled;
+
+    /** Keep deserialized flag. */
+    private Boolean keepDeserialized;
+
+    /** Affinity key field name. */
+    private String affKeyFieldName;
+
+    /**
+     */
+    public GridPortableTypeConfiguration() {
+        // No-op.
+    }
+
+    /**
+     * @param clsName Class name.
+     */
+    public GridPortableTypeConfiguration(String clsName) {
+        this.clsName = clsName;
+    }
+
+    /**
+     * Gets type name.
+     *
+     * @return Type name.
+     */
+    public String getClassName() {
+        return clsName;
+    }
+
+    /**
+     * Sets type name.
+     *
+     * @param clsName Type name.
+     */
+    public void setClassName(String clsName) {
+        this.clsName = clsName;
+    }
+
+    /**
+     * Gets ID mapper.
+     *
+     * @return ID mapper.
+     */
+    public GridPortableIdMapper getIdMapper() {
+        return idMapper;
+    }
+
+    /**
+     * Sets ID mapper.
+     *
+     * @param idMapper ID mapper.
+     */
+    public void setIdMapper(GridPortableIdMapper idMapper) {
+        this.idMapper = idMapper;
+    }
+
+    /**
+     * Gets serializer.
+     *
+     * @return Serializer.
+     */
+    public GridPortableSerializer getSerializer() {
+        return serializer;
+    }
+
+    /**
+     * Sets serializer.
+     *
+     * @param serializer Serializer.
+     */
+    public void setSerializer(GridPortableSerializer serializer) {
+        this.serializer = serializer;
+    }
+
+    /**
+     * If {@code true} then date values converted to {@link Timestamp} during unmarshalling.
+     *
+     * @return Flag indicating whether date values converted to {@link Timestamp} during unmarshalling.
+     */
+    public Boolean isUseTimestamp() {
+        return useTs;
+    }
+
+    /**
+     * @param useTs Flag indicating whether date values converted to {@link Timestamp} during unmarshalling.
+     */
+    public void setUseTimestamp(Boolean useTs) {
+        this.useTs = useTs;
+    }
+
+    /**
+     * Defines whether meta data is collected for this type. If provided, this value will override
+     * {@link GridPortableConfiguration#isMetaDataEnabled()} property.
+     *
+     * @return Whether meta data is collected.
+     */
+    public Boolean isMetaDataEnabled() {
+        return metaDataEnabled;
+    }
+
+    /**
+     * @param metaDataEnabled Whether meta data is collected.
+     */
+    public void setMetaDataEnabled(Boolean metaDataEnabled) {
+        this.metaDataEnabled = metaDataEnabled;
+    }
+
+    /**
+     * Defines whether {@link GridPortableObject} should cache deserialized instance. If provided,
+     * this value will override {@link GridPortableConfiguration#isKeepDeserialized()} property.
+     *
+     * @return Whether deserialized value is kept.
+     */
+    public Boolean isKeepDeserialized() {
+        return keepDeserialized;
+    }
+
+    /**
+     * @param keepDeserialized Whether deserialized value is kept.
+     */
+    public void setKeepDeserialized(Boolean keepDeserialized) {
+        this.keepDeserialized = keepDeserialized;
+    }
+
+    /**
+     * Gets affinity key field name.
+     *
+     * @return Affinity key field name.
+     */
+    public String getAffinityKeyFieldName() {
+        return affKeyFieldName;
+    }
+
+    /**
+     * Sets affinity key field name.
+     *
+     * @param affKeyFieldName Affinity key field name.
+     */
+    public void setAffinityKeyFieldName(String affKeyFieldName) {
+        this.affKeyFieldName = affKeyFieldName;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(GridPortableTypeConfiguration.class, this, super.toString());
+    }
+}