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";

Reply via email to