# ignite-63

examples/config/example-cache.xml

@@ -144,7 +144,7 @@
 
         <!-- Allow to index primitive values. -->
         <property name="queryConfiguration">
-            <bean class="org.gridgain.grid.cache.query.GridCacheQueryConfiguration">
+            <bean class="org.apache.ignite.cache.query.GridCacheQueryConfiguration">
                 <!-- Index primitives. -->
                 <property name="indexPrimitiveKey" value="true"/>
             </bean>

examples/src/main/java/org/gridgain/examples/datagrid/CacheAffinityExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/CacheApiExample.java

@@ -18,8 +18,8 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.cache.*;
 
 import javax.cache.processor.*;
 import java.util.concurrent.*;

examples/src/main/java/org/gridgain/examples/datagrid/CacheContinuousQueryExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/CacheEventsExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.events.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/CachePopularNumbersExample.java

@@ -18,10 +18,10 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.dataload.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
 
 import javax.cache.processor.*;
 import java.util.*;

examples/src/main/java/org/gridgain/examples/datagrid/CachePutGetExample.java

@@ -18,8 +18,7 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
+import org.apache.ignite.cache.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/CacheQueryExample.java

@@ -18,11 +18,11 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.*;
+import org.apache.ignite.cache.query.*;
 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.query.*;
 
 import java.io.*;
 import java.util.*;
@@ -48,7 +48,7 @@
  *     </li>
  *     <li>
  *         Joins will work correctly only if joined objects are stored in
- *         collocated mode. Refer to {@link GridCacheAffinityKey} javadoc for more details.
+ *         collocated mode. Refer to {@link org.apache.ignite.cache.affinity.GridCacheAffinityKey} javadoc for more details.
  *     </li>
  *     <li>
  *         Note that if you created query on to replicated cache, all data will

examples/src/main/java/org/gridgain/examples/datagrid/CacheTransactionExample.java

@@ -18,12 +18,12 @@
 package org.gridgain.examples.datagrid;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.*;
 
 import java.io.*;
 
-import static org.gridgain.grid.cache.GridCacheFlag.*;
+import static org.apache.ignite.cache.GridCacheFlag.*;
 import static org.apache.ignite.transactions.IgniteTxConcurrency.*;
 import static org.apache.ignite.transactions.IgniteTxIsolation.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicLongExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicReferenceExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicSequenceExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheAtomicStampedExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheCountDownLatchExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheQueueExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/datastructures/CacheSetExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.datastructures;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.datastructures.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.datastructures.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java

@@ -19,16 +19,16 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
 
 import java.util.*;
 
-import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-import static org.gridgain.grid.cache.GridCacheMode.*;
-import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.GridCacheAtomicityMode.*;
+import static org.apache.ignite.cache.GridCacheMode.*;
+import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
 
 /**
  * Starts up an empty node with example cache configuration.

examples/src/main/java/org/gridgain/examples/datagrid/starschema/CacheStarSchemaExample.java

@@ -18,10 +18,9 @@
 package org.gridgain.examples.datagrid.starschema;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.gridgain.examples.datagrid.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
 
 import java.util.*;
 import java.util.concurrent.*;

examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimProduct.java

@@ -17,12 +17,11 @@
 
 package org.gridgain.examples.datagrid.starschema;
 
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
+import org.apache.ignite.cache.query.*;
 
 /**
  * Represents a product available for purchase. In our {@code snowflake} schema a {@code product}
- * is a {@code 'dimension'} and will be cached in {@link GridCacheMode#REPLICATED}
+ * is a {@code 'dimension'} and will be cached in {@link org.apache.ignite.cache.GridCacheMode#REPLICATED}
  * cache.
  */
 public class DimProduct {

examples/src/main/java/org/gridgain/examples/datagrid/starschema/DimStore.java

@@ -17,12 +17,11 @@
 
 package org.gridgain.examples.datagrid.starschema;
 
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
+import org.apache.ignite.cache.query.*;
 
 /**
  * Represents a physical store location. In our {@code snowflake} schema a {@code store}
- * is a {@code 'dimension'} and will be cached in {@link GridCacheMode#REPLICATED}
+ * is a {@code 'dimension'} and will be cached in {@link org.apache.ignite.cache.GridCacheMode#REPLICATED}
  * cache.
  */
 public class DimStore {

examples/src/main/java/org/gridgain/examples/datagrid/starschema/FactPurchase.java

@@ -17,12 +17,11 @@
 
 package org.gridgain.examples.datagrid.starschema;
 
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
+import org.apache.ignite.cache.query.*;
 
 /**
  * Represents a purchase record. In our {@code snowflake} schema purchase
- * is a {@code 'fact'} and will be cached in larger {@link GridCacheMode#PARTITIONED}
+ * is a {@code 'fact'} and will be cached in larger {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED}
  * cache.
  */
 public class FactPurchase {

examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java

@@ -29,7 +29,7 @@
 import javax.cache.configuration.*;
 import java.util.*;
 
-import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
+import static org.apache.ignite.cache.GridCacheAtomicityMode.*;
 
 /**
  * Starts up an empty node with example cache configuration.

examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreExample.java

@@ -18,9 +18,9 @@
 package org.gridgain.examples.datagrid.store;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.transactions.*;
-import org.gridgain.grid.cache.*;
 
 import java.util.*;
 

examples/src/main/java/org/gridgain/examples/datagrid/store/CacheStoreLoadDataExample.java

@@ -18,14 +18,13 @@
 package org.gridgain.examples.datagrid.store;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.examples.*;
-import org.gridgain.grid.*;
-import org.gridgain.grid.cache.*;
 
 /**
  * Loads data from persistent store at cache startup by calling
- * {@link GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method on
+ * {@link org.apache.ignite.cache.GridCache#loadCache(org.apache.ignite.lang.IgniteBiPredicate, long, Object...)} method on
  * all nodes.
  * <p>
  * Remote nodes should always be started using {@link CacheNodeWithStoreStartup}.

examples/src/main/java/org/gridgain/examples/datagrid/store/dummy/CacheDummyPersonStore.java

@@ -18,12 +18,12 @@
 package org.gridgain.examples.datagrid.store.dummy;
 
 import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
 import org.apache.ignite.cache.store.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.resources.*;
 import org.apache.ignite.transactions.*;
 import org.gridgain.examples.datagrid.store.*;
-import org.gridgain.grid.cache.*;
 import org.jetbrains.annotations.*;
 
 import javax.cache.*;

examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExample.java

@@ -19,8 +19,8 @@
 
 import net.spy.memcached.*;
 import org.apache.ignite.*;
-import org.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.datastructures.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.datastructures.*;
 
 import java.io.*;
 import java.net.*;

examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java

@@ -19,18 +19,18 @@
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.marshaller.optimized.*;
 import org.apache.ignite.spi.discovery.tcp.*;
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.cache.query.*;
 
 import java.util.*;
 
 import static org.apache.ignite.configuration.IgniteDeploymentMode.*;
-import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-import static org.gridgain.grid.cache.GridCachePreloadMode.*;
-import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*;
+import static org.apache.ignite.cache.GridCacheAtomicityMode.*;
+import static org.apache.ignite.cache.GridCachePreloadMode.*;
+import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*;
 
 /**
  * Starts up an empty node with cache configuration that contains default cache.

examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala

@@ -17,13 +17,13 @@
 
 package org.gridgain.scalar.examples
 
+import org.apache.ignite.cache.GridCacheName
+import org.apache.ignite.cache.affinity.GridCacheAffinityKeyMapped
 import org.gridgain.scalar.scalar
 import scalar._
 import org.apache.ignite._
 import org.jetbrains.annotations.Nullable
 import java.util.concurrent.Callable
-import org.gridgain.grid.cache.affinity.GridCacheAffinityKeyMapped
-import org.gridgain.grid.cache.GridCacheName
 
 /**
  * Example of how to collocate computations and data in GridGain using

examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinitySimpleExample.scala

@@ -17,9 +17,9 @@
 
 package org.gridgain.scalar.examples
 
+import org.apache.ignite.cache.GridCache
 import org.gridgain.scalar.scalar
 import scalar._
-import org.gridgain.grid.cache.GridCache
 
 /**
  * This example demonstrates the simplest code that populates the distributed cache