http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java index 297414a..af22af2 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiResponse.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.dsi; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import java.io.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java index 7eea973..796999a 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/GridDsiSession.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.dsi; -import org.gridgain.grid.cache.affinity.*; +import org.apache.ignite.cache.affinity.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java index 938a176..ade5498 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/dsi/cacheget/GridBenchmarkCacheGetLoadTest.java @@ -18,7 +18,7 @@ package org.gridgain.loadtests.dsi.cacheget; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/mapper/TestObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/mapper/TestObject.java b/modules/core/src/test/java/org/gridgain/loadtests/mapper/TestObject.java index fc3891f..9325e8e 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/mapper/TestObject.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/mapper/TestObject.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.mapper; -import org.gridgain.grid.cache.query.*; +import org.apache.ignite.cache.query.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index 07bed1c..91a352d 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -17,9 +17,9 @@ package org.gridgain.loadtests.offheap; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.offheap.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java index 3335db1..c3e4980 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java @@ -17,7 +17,7 @@ package org.gridgain.loadtests.offheap.unsafe; -import org.gridgain.grid.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.gridgain.grid.util.offheap.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java index fb28eae..6de550f 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/swap/GridSwapEvictAllBenchmark.java @@ -19,11 +19,11 @@ package org.gridgain.loadtests.swap; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.eviction.fifo.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.eviction.fifo.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 742d6fb..f87d16a 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java @@ -19,12 +19,12 @@ package org.gridgain.testframework; import junit.framework.*; import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.cluster.*; import org.apache.ignite.lang.*; import org.apache.ignite.client.ssl.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 4ae3a9f..29c23da 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 @@ -51,10 +51,10 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Common abstract test for GridGain tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java index 33c3758..f89bea1 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java @@ -19,13 +19,13 @@ package org.gridgain.testframework.junits.common; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.colocated.*; @@ -41,8 +41,8 @@ import javax.net.ssl.*; import java.util.*; import static org.gridgain.grid.kernal.processors.cache.GridCacheUtils.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; /** * Super class for all common tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 7d18bd3..beebbec 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -114,7 +114,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> @@ -163,7 +163,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> @@ -210,7 +210,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> @@ -239,7 +239,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> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java index f795b63..2d89999 100644 --- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java +++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridCacheDeploymentTestTask1.java @@ -18,10 +18,10 @@ package org.gridgain.grid.tests.p2p; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java index e46732d..cc01a10 100644 --- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java +++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityFunction.java @@ -17,6 +17,7 @@ package org.gridgain.grid.tests.p2p; +import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java index c48827c..d621575 100644 --- a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java +++ b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalAffinityKeyMapper.java @@ -17,6 +17,7 @@ package org.gridgain.grid.tests.p2p; +import org.apache.ignite.cache.affinity.*; import org.gridgain.grid.cache.affinity.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java index c04bbc8..c08d15d 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/jobtracker/GridHadoopJobTracker.java @@ -18,10 +18,11 @@ package org.gridgain.grid.kernal.processors.hadoop.jobtracker; import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java index 773874a..6dcc384 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java @@ -23,10 +23,10 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.permission.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.communication.*; @@ -47,8 +47,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.fs.IgniteFsMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java index b5f864b..651ef6f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -38,8 +37,8 @@ import java.net.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*; import static org.gridgain.grid.kernal.processors.ggfs.GridGgfsAbstractSelfTest.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java index 0758d24..db4e9de 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java @@ -23,11 +23,11 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.permission.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.gridgain.grid.kernal.processors.ggfs.*; @@ -51,8 +51,8 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.fs.IgniteFsMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java index 4e57782..57d5c41 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java @@ -36,10 +36,10 @@ import java.lang.reflect.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -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.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java index 11f9f47..4285c8f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java @@ -37,10 +37,10 @@ import java.net.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -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.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.kernal.ggfs.hadoop.GridGgfsHadoopUtils.*; import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java index 5017998..d04986c 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java @@ -20,9 +20,9 @@ package org.gridgain.grid.ggfs; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.communication.tcp.*; @@ -38,8 +38,8 @@ import java.net.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java index 83332b8..6d7f204 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java @@ -21,9 +21,9 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.FileSystem; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.kernal.processors.ggfs.*; @@ -37,8 +37,8 @@ import java.net.*; import java.util.*; import java.nio.file.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java index ee0f886..86e4243 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -20,10 +20,10 @@ package org.gridgain.grid.ggfs; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.gridgain.grid.kernal.processors.ggfs.*; @@ -35,8 +35,8 @@ import org.gridgain.grid.util.typedef.internal.*; import java.net.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java index 93dba5c..241a0e6 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -37,9 +36,9 @@ import java.io.*; import java.net.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.events.IgniteEventType.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java index 5603727..a8f8d47 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopAbstractSelfTest.java @@ -28,9 +28,9 @@ import org.gridgain.testframework.junits.common.*; import java.io.*; -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.*; /** * Abstract class for Hadoop tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index 6d62f79..1880405 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -18,12 +18,12 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.fs.*; import org.apache.ignite.fs.mapreduce.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 f25e390..06b8e31 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 @@ -18,9 +18,8 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; 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/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateCollectionRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateCollectionRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateCollectionRegion.java index 47970f2..596659b 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateCollectionRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateCollectionRegion.java @@ -18,7 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.*; import org.hibernate.cache.spi.access.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateEntityRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateEntityRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateEntityRegion.java index 44bac3f..47a4dd1 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateEntityRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateEntityRegion.java @@ -18,7 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.*; import org.hibernate.cache.spi.access.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java index 46e4267..7e7c87b 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateGeneralDataRegion.java @@ -18,8 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNaturalIdRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNaturalIdRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNaturalIdRegion.java index 8247642..95dcabf 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNaturalIdRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNaturalIdRegion.java @@ -18,7 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.*; import org.hibernate.cache.spi.access.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java index 5dceab6..9420c85 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateNonStrictAccessStrategy.java @@ -18,8 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.hibernate.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateQueryResultsRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateQueryResultsRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateQueryResultsRegion.java index dd437ca..5b803ac 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateQueryResultsRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateQueryResultsRegion.java @@ -18,7 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.*; import org.hibernate.cache.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java index e959dee..b74de83 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadOnlyAccessStrategy.java @@ -18,8 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.access.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java index 93277cb..d995f3a 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateReadWriteAccessStrategy.java @@ -18,8 +18,8 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.util.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.access.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegion.java index 9f614e2..e958f8d 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateRegion.java @@ -18,7 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 30e198c..e1df7d0 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 @@ -18,7 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.util.typedef.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.*; @@ -46,8 +46,8 @@ import static org.hibernate.cache.spi.access.AccessType.*; * <pre name="code" class="brush: xml; gutter: false;"> * org.gridgain.hibernate.grid_name=<grid name> * </pre> - * Each Hibernate cache region must be associated with some {@link GridCache}, by default it is assumed that - * for each cache region there is a {@link GridCache} with the same name. Also it is possible to define + * Each Hibernate cache region must be associated with some {@link org.apache.ignite.cache.GridCache}, by default it is assumed that + * for each cache region there is a {@link org.apache.ignite.cache.GridCache} with the same name. Also it is possible to define * region to cache mapping using properties with prefix {@code org.gridgain.hibernate.region_cache}. * For example if for region with name "region1" cache with name "cache1" should be used then following * Hibernate property should be specified: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTimestampsRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTimestampsRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTimestampsRegion.java index 609cc0e..736ae35 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTimestampsRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTimestampsRegion.java @@ -18,7 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.spi.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalAccessStrategy.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalAccessStrategy.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalAccessStrategy.java index 3d0526f..12d94d0 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalAccessStrategy.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalAccessStrategy.java @@ -18,8 +18,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.access.*; import org.jetbrains.annotations.*; @@ -28,7 +27,7 @@ import org.jetbrains.annotations.*; * Implementation of {@link AccessType#TRANSACTIONAL} cache access strategy. * <p> * It is supposed that this strategy is used in JTA environment and Hibernate and - * {@link GridCache} corresponding to the L2 cache region are configured to use the same transaction manager. + * {@link org.apache.ignite.cache.GridCache} corresponding to the L2 cache region are configured to use the same transaction manager. * <p> * Configuration of L2 cache and per-entity cache access strategy can be set in the * Hibernate configuration file: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalDataRegion.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalDataRegion.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalDataRegion.java index 4213c63..b8d916d 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalDataRegion.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/hibernate/GridHibernateTransactionalDataRegion.java @@ -18,12 +18,12 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.hibernate.cache.*; import org.hibernate.cache.spi.*; import org.hibernate.cache.spi.access.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; /** * Implementation of {@link TransactionalDataRegion} (transactional means that http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java index ffdd2ec..7572ced 100644 --- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java +++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java @@ -18,8 +18,8 @@ package org.gridgain.grid.cache.hibernate; 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 org.gridgain.testframework.junits.common.*; @@ -33,8 +33,8 @@ import javax.persistence.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; import static org.gridgain.grid.cache.hibernate.GridHibernateRegionFactory.*; import static org.hibernate.cfg.AvailableSettings.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java index 7725e30..54958f6 100644 --- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java +++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheSelfTest.java @@ -18,9 +18,8 @@ package org.gridgain.grid.cache.hibernate; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.consistenthash.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.consistenthash.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -40,9 +39,9 @@ import javax.persistence.*; import java.util.*; import java.util.concurrent.*; -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.*; import static org.gridgain.grid.cache.hibernate.GridHibernateRegionFactory.*; import static org.hibernate.cfg.Environment.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java index b064393..9ebe081 100644 --- a/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java +++ b/modules/hibernate/src/test/java/org/gridgain/grid/cache/hibernate/GridHibernateL2CacheTransactionalSelfTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.cache.hibernate; import org.apache.commons.dbcp.managed.*; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; import org.gridgain.grid.cache.jta.*; import org.h2.jdbcx.*; import org.hibernate.cache.spi.access.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java index d64ab49..077e117 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java @@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.processors.query.h2; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; @@ -26,7 +27,6 @@ import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.indexing.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.query.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java index 6652d73..f9aa46c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.spi.communication.tcp; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -27,7 +28,6 @@ import org.apache.ignite.resources.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -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.*; @@ -40,8 +40,8 @@ import java.util.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 929feb3..781042a 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 @@ -19,6 +19,9 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; @@ -26,9 +29,6 @@ import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -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.kernal.processors.query.*; import org.gridgain.grid.util.typedef.*; @@ -38,9 +38,9 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; /** * Tests for fields queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 5a20372..bfe45c4 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 @@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -28,8 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.file.*; -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.util.tostring.*; @@ -49,12 +48,11 @@ import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; -import static org.gridgain.grid.cache.query.GridCacheQueryType.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.junit.Assert.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 db8b674..070ffb3 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 @@ -19,21 +19,21 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.testframework.junits.common.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; /** * Tests cross cache queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 313ab6d..f16e832 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -19,6 +19,8 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -26,8 +28,6 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.file.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.distributed.near.*; import org.gridgain.grid.util.lang.*; @@ -39,10 +39,10 @@ import java.util.concurrent.atomic.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePeekMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePeekMode.*; /** * Tests off heap storage when both offheaped and swapped entries exists. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java index 8e6322f..2d9aa68 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryLoadSelfTest.java @@ -19,14 +19,14 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -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.util.typedef.*; @@ -38,8 +38,8 @@ import javax.cache.*; import javax.cache.configuration.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Test that entries are indexed on load/reload methods. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java index 1b33634..31c0dea 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryMetricsSelfTest.java @@ -18,18 +18,17 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.testframework.junits.common.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Tests for cache query metrics. @@ -88,7 +87,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest { public void testAccumulativeMetrics() throws Exception { GridCache<String, Integer> cache = cache(0); - GridCacheQuery <Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") + GridCacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0") .projection(grid(0)); // Execute query. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 92e37d3..6160eac 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 @@ -19,6 +19,9 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.eviction.lru.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; @@ -26,9 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.file.*; -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.kernal.processors.query.*; @@ -41,8 +41,8 @@ import java.io.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Multi-threaded tests for cache queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryTestValue.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryTestValue.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryTestValue.java index 6ee2422..e12cb50 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryTestValue.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryTestValue.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.processors.cache; -import org.gridgain.grid.cache.query.*; +import org.apache.ignite.cache.query.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java index 995ab27..91b9ed2 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheQueryUserResourceSelfTest.java @@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; @@ -26,14 +27,13 @@ import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Test runs cache queries with injected user resource. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 0a1604f..8a3b380 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 @@ -18,19 +18,18 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.cache.*; +import org.apache.ignite.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.util.typedef.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Multithreaded reduce query tests with lots of data. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java index 6e9e604..9ecc782 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java @@ -18,12 +18,12 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; @@ -31,9 +31,9 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/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 25e83f7..276842a 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 @@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; @@ -28,8 +29,6 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.*; import org.apache.ignite.spi.swapspace.noop.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; @@ -40,9 +39,9 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePeekMode.*; -import static org.gridgain.grid.cache.GridCacheWriteSynchronizationMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePeekMode.*; +import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; /** * Test for cache swap. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java index 0536667..7ace880 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridIndexingWithNoopSwapSelfTest.java @@ -19,22 +19,22 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.eviction.fifo.*; +import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.swapspace.noop.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.eviction.fifo.*; -import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.processors.cache.GridCacheAbstractQuerySelfTest.*; import org.gridgain.testframework.junits.common.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePreloadMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePreloadMode.*; /** * GG-4368 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java index 9d559d9..36ed3a6 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java @@ -18,14 +18,14 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.query.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; import org.gridgain.grid.util.typedef.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * Tests for fields queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java index a6b9e68..1997f8f 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledFieldsQuerySelfTest.java @@ -17,9 +17,9 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * Tests for atomic cache with near cache enabled. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java index 820a5df..8f91e14 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicNearEnabledQuerySelfTest.java @@ -17,10 +17,10 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * Tests for atomic cache with near cache enabled. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java index 744293f..7d8c8f0 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheAtomicQuerySelfTest.java @@ -17,10 +17,10 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; -import org.gridgain.grid.cache.*; +import org.apache.ignite.cache.*; -import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** * Tests for partitioned cache queries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7b1a738d/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java index 17cf11d..81e0752 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java @@ -18,16 +18,16 @@ package org.gridgain.grid.kernal.processors.cache.distributed.near; import org.apache.ignite.cache.*; -import org.gridgain.grid.cache.*; -import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.cache.query.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.query.*; import org.gridgain.grid.kernal.processors.cache.*; import org.jetbrains.annotations.*; import java.util.*; -import static org.gridgain.grid.cache.GridCacheDistributionMode.*; -import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; /** * Tests for fields queries.
