http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java index 9bf93e0..38f7007 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/task/GridTaskWorker.java @@ -13,11 +13,11 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.job.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java index 9d537de..2bd761b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfs.java @@ -10,8 +10,8 @@ package org.gridgain.grid.kernal.visor.ggfs; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsMetrics.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsMetrics.java index 67ff249..cd93fa5 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsMetrics.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsMetrics.java @@ -9,13 +9,13 @@ package org.gridgain.grid.kernal.visor.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; /** - * Data transfer object for {@link org.gridgain.grid.ggfs.IgniteFsMetrics}. + * Data transfer object for {@link org.apache.ignite.fs.IgniteFsMetrics}. */ public class VisorGgfsMetrics implements Serializable { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfiler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfiler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfiler.java index e1c8c14..34467c2 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfiler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfiler.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.visor.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerEntry.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerEntry.java index b027627..84de0be 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerEntry.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.visor.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java index c82ebd9..d47ea5b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/ggfs/VisorGgfsProfilerTask.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.visor.ggfs; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.kernal.visor.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java index 2c75301..14f4182 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.visor.node; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java index b6989c3..db87151 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/util/VisorTaskUtils.java @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.*; import static java.lang.System.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; +import static org.apache.ignite.fs.IgniteFsConfiguration.*; /** * Contains utility methods for Visor tasks and jobs. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/config/ggfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml index a6b911d..5cd4588 100644 --- a/modules/core/src/test/config/ggfs-loopback.xml +++ b/modules/core/src/test/config/ggfs-loopback.xml @@ -74,7 +74,7 @@ <property name="ggfsConfiguration"> <list> - <bean class="org.gridgain.grid.ggfs.IgniteFsConfiguration"> + <bean class="org.apache.ignite.fs.IgniteFsConfiguration"> <property name="name" value="ggfs"/> <property name="metaCacheName" value="ggfs-meta"/> <property name="dataCacheName" value="ggfs-data"/> @@ -109,7 +109,7 @@ <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> <property name="affinityMapper"> - <bean class="org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper"> + <bean class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper"> <!-- Haw many blocks in row will be stored on the same node. --> <constructor-arg value="512"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/config/ggfs-no-endpoint.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml index cd4fa1e..56d8155 100644 --- a/modules/core/src/test/config/ggfs-no-endpoint.xml +++ b/modules/core/src/test/config/ggfs-no-endpoint.xml @@ -75,7 +75,7 @@ <property name="ggfsConfiguration"> <list> - <bean class="org.gridgain.grid.ggfs.IgniteFsConfiguration"> + <bean class="org.apache.ignite.fs.IgniteFsConfiguration"> <property name="name" value="ggfs"/> <property name="metaCacheName" value="ggfs-meta"/> <property name="dataCacheName" value="ggfs-data"/> @@ -109,7 +109,7 @@ <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> <property name="affinityMapper"> - <bean class="org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper"> + <bean class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper"> <!-- Haw many blocks in row will be stored on the same node. --> <constructor-arg value="512"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 84d1f72..f2d4d5e 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -74,7 +74,7 @@ <property name="ggfsConfiguration"> <list> - <bean class="org.gridgain.grid.ggfs.IgniteFsConfiguration"> + <bean class="org.apache.ignite.fs.IgniteFsConfiguration"> <property name="name" value="ggfs"/> <property name="metaCacheName" value="ggfs-meta"/> <property name="dataCacheName" value="ggfs-data"/> @@ -109,7 +109,7 @@ <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> <property name="affinityMapper"> - <bean class="org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper"> + <bean class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper"> <!-- Haw many blocks in row will be stored on the same node. --> <constructor-arg value="512"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java index 44df918..0317c11 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java @@ -12,6 +12,7 @@ package org.gridgain.grid.ggfs; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java index 94cfd3c..f97a416 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java @@ -10,6 +10,7 @@ package org.gridgain.grid.ggfs; 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.processors.ggfs.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java index dfb99d6..4f6bac1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java @@ -10,6 +10,7 @@ package org.gridgain.grid.ggfs; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.ggfs.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerTopologySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerTopologySelfTest.java index 4d99ac8..324258d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerTopologySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerTopologySelfTest.java @@ -10,6 +10,7 @@ package org.gridgain.grid.ggfs; import org.apache.ignite.*; +import org.apache.ignite.fs.*; /** * Tests coordinator transfer from one node to other. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java index 94168d6..8e25e29 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsPathSelfTest.java @@ -9,6 +9,7 @@ package org.gridgain.grid.ggfs; +import org.apache.ignite.fs.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.optimized.*; import org.gridgain.grid.*; @@ -23,7 +24,7 @@ import java.util.*; import java.util.concurrent.*; /** - * {@link IgniteFsPath} self test. + * {@link org.apache.ignite.fs.IgniteFsPath} self test. */ public class GridGgfsPathSelfTest extends GridCommonAbstractTest { /** Marshaller to test {@link Externalizable} interface. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index f0f4965..a21eaff 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.ggfs.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; @@ -28,7 +28,7 @@ import java.util.concurrent.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for GGFS per-block LR eviction policy. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java index e64b9b3..6f7ece0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java @@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; 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.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; @@ -34,7 +34,7 @@ import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMemoryMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.apache.ignite.IgniteFs.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Test fo regular GGFs operations. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributesSelfTest.java index 35cabd4..f66ffb4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributesSelfTest.java @@ -9,13 +9,13 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import java.io.*; import java.lang.reflect.*; import java.util.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * {@link GridGgfsAttributes} test case. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java index 71945ee..5629c86 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java @@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java index 605b1c0..414e566 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java @@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.cluster.*; 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.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java index 99feec6..8873f48 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.GridCache; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.lang.*; import org.gridgain.testframework.GridTestUtils; @@ -21,7 +21,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.IgniteFs.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for GGFS working in mode when remote file system exists: DUAL_SYNC, DUAL_ASYNC. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAsyncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAsyncSelfTest.java index 01bc9f2..cb22ac8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAsyncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAsyncSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for DUAL_ASYNC mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualSyncSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualSyncSelfTest.java index c9d5e64..15070e0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualSyncSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualSyncSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for DUAL_SYNC mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java index e1140b4..0ec24ed 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java @@ -9,14 +9,14 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; import java.util.concurrent.*; /** - * Tests for {@link org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper} hash. + * Tests for {@link org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper} hash. */ public class GridGgfsGroupDataBlockKeyMapperHashSelfTest extends GridGgfsCommonAbstractTest { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java index 2d3fa9c..38b9155 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; 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.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java index 42d4cb8..2ebab9e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java @@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; @@ -24,7 +24,7 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Test for GGFS metrics. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolverSelfTest.java index 1bc63d3..e4481b5 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolverSelfTest.java @@ -10,12 +10,12 @@ package org.gridgain.grid.kernal.processors.ggfs; import junit.framework.*; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.*; import java.util.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java index bbb9f2c..679bac1 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java @@ -10,10 +10,10 @@ package org.gridgain.grid.kernal.processors.ggfs; 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.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; @@ -25,7 +25,7 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * GGFS modes self test. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java index 302dc4a..b7ee626 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapTieredSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.cache.GridCacheMemoryMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java index 86faae8..86b0606 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimaryOffheapValuesSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.cache.GridCacheMemoryMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java index f39fe7b..672d407 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPrimarySelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for PRIMARY mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java index d13a1c6..057dd6c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java @@ -12,10 +12,10 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.commons.io.*; import org.apache.ignite.*; 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.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java index a1991c5..221b593 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; @@ -24,13 +24,13 @@ import java.util.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for node validation logic in {@link GridGgfsProcessor}. * <p> * Tests starting with "testLocal" are checking - * {@link GridGgfsProcessor#validateLocalGgfsConfigurations(org.gridgain.grid.ggfs.IgniteFsConfiguration[])}. + * {@link GridGgfsProcessor#validateLocalGgfsConfigurations(org.apache.ignite.fs.IgniteFsConfiguration[])}. * <p> * Tests starting with "testRemote" are checking {@link GridGgfsProcessor#checkGgfsOnRemoteNode(org.apache.ignite.cluster.ClusterNode)}. */ @@ -474,7 +474,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT } /** - * @param grpSize Group size to use in {@link org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper}. + * @param grpSize Group size to use in {@link org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper}. * @param cacheNames 2 Optional caches names. * @return 2 preconfigured data caches. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index 73a5556..84be991 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.port.*; import org.gridgain.grid.spi.discovery.tcp.*; @@ -29,7 +29,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; -import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; +import static org.apache.ignite.fs.IgniteFsConfiguration.*; /** * Base test class for {@link GridGgfsServer} checking IPC endpoint registrations. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java index 2b3291d..5295857 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.java @@ -12,7 +12,7 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.configuration.*; import org.gridgain.grid.util.typedef.*; -import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; +import static org.apache.ignite.fs.IgniteFsConfiguration.*; /** * Tests for {@link GridGgfsServer} that checks all IPC endpoint registration types http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java index 9dce0df..1ccdc99 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java @@ -13,9 +13,9 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java index b79dca0..31736c2 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java @@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; 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.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java index d962109..02aa9ef 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java @@ -12,11 +12,11 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.ggfs.mapreduce.records.*; import org.gridgain.grid.spi.discovery.tcp.*; @@ -32,7 +32,7 @@ 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.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for {@link org.gridgain.grid.ggfs.mapreduce.IgniteFsTask}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java index afa008d..7347f0f 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java @@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.processors.ggfs.split; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; @@ -26,7 +26,7 @@ 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.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Base class for all split resolvers http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java index 0c20431..b9f6b8d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs.split; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.ggfs.mapreduce.records.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java index 98b0abc..e9d3357 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs.split; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.ggfs.mapreduce.records.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java index 4d3aae2..b1efc24 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs.split; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.ggfs.mapreduce.records.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java index 51dbf5f..bea2eff 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs.split; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.ggfs.mapreduce.records.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java index 96fd35b..fd465ce 100644 --- a/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java +++ b/modules/core/src/test/java/org/gridgain/grid/util/ipc/shmem/GridIpcSharedMemoryNodeStartup.java @@ -11,8 +11,8 @@ package org.gridgain.grid.util.ipc.shmem; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java index bbd2d49..fa51cbc 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/GridGgfsHadoopParameters.java @@ -16,7 +16,7 @@ package org.gridgain.grid.ggfs.hadoop; * <ul> * <li> * {@code fs.ggfs.[name].open.sequential_reads_before_prefetch} - this parameter overrides - * the one specified in {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getSequentialReadsBeforePrefetch()} + * the one specified in {@link org.apache.ignite.fs.IgniteFsConfiguration#getSequentialReadsBeforePrefetch()} * GGFS data node configuration property. * </li> * <li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java index df55bb3..aeb9267 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java @@ -16,8 +16,8 @@ import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.hdfs.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.util.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.gridgain.grid.kernal.processors.ggfs.*; @@ -31,8 +31,8 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteFs.*; -import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsConfiguration.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*; import static org.gridgain.grid.kernal.ggfs.hadoop.GridGgfsHadoopUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java index 31e4ced..0a8e7f7 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java @@ -16,8 +16,8 @@ import org.apache.hadoop.fs.Options; import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.util.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.gridgain.grid.kernal.processors.ggfs.*; @@ -31,8 +31,8 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteFs.*; -import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsConfiguration.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*; import static org.gridgain.grid.kernal.ggfs.hadoop.GridGgfsHadoopUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java index 3b35a95..642efbf 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.ggfs.hadoop; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java index c17d26f..dc22086 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopEndpoint.java @@ -19,7 +19,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.net.*; -import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; +import static org.apache.ignite.fs.IgniteFsConfiguration.*; /** * GGFS endpoint abstraction. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java index ca08ca1..7f6f540 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java @@ -13,8 +13,8 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.ipc.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import java.io.*; import java.net.*; @@ -26,7 +26,7 @@ import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; /** - * Adapter to use any Hadoop file system {@link org.apache.hadoop.fs.FileSystem} as {@link org.gridgain.grid.ggfs.IgniteFsFileSystem}. + * Adapter to use any Hadoop file system {@link org.apache.hadoop.fs.FileSystem} as {@link org.apache.ignite.fs.IgniteFsFileSystem}. */ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, AutoCloseable { /** Property name for path to Hadoop configuration. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java index b77c49a..0729023 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java @@ -10,8 +10,8 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.commons.logging.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.util.lang.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java index c32616c..60b1db1 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java @@ -10,8 +10,8 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.commons.logging.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopReader.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopReader.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopReader.java index 4a73fcf..1fedab2 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopReader.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopReader.java @@ -10,7 +10,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.hadoop.fs.*; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java index 17442fd..e81b17d 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java @@ -11,8 +11,8 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java index cd34dd2..7f2b91a 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java @@ -12,8 +12,8 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.commons.logging.*; import org.apache.hadoop.conf.*; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java index e39153a..171f5ea 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/fs/GridHadoopDistributedFileSystem.java @@ -17,7 +17,7 @@ import org.apache.hadoop.mapreduce.*; import java.io.*; import java.net.*; -import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; +import static org.apache.ignite.fs.IgniteFsConfiguration.*; /** * Wrapper of HDFS for support of separated working directory. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java index 74e73a8..2d9358c 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java @@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.hadoop.planner; import org.apache.ignite.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.fs.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java index 49c4ad9..0576dbb 100644 --- a/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java @@ -17,7 +17,7 @@ import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.hadoop.mapreduce.protocol.*; import org.apache.ignite.*; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.kernal.processors.hadoop.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java index b6655ad..78c214f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsTestSuite.java @@ -12,6 +12,7 @@ package org.gridgain.grid.ggfs; import junit.framework.*; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.*; @@ -20,7 +21,7 @@ import org.gridgain.grid.util.ipc.shmem.*; import org.gridgain.testframework.*; import org.jetbrains.annotations.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Test suite for GGFS event tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 53fa471..bb683db 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 @@ -15,6 +15,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.permission.*; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; @@ -41,7 +42,7 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Hadoop 2.x compliant file system. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java index 8040ae2..7da86b0 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemLoopbackPrimarySelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java index 8b4d071..922702f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemShmemPrimarySelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 4952fe7..0a18c5e 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 @@ -13,6 +13,7 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.ignite.*; 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.*; @@ -29,7 +30,7 @@ import java.util.concurrent.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +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/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java index 88e2977..de224db 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAsyncSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for DUAL_ASYNC mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java index ede366f..1284a29 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualSyncSelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Tests for DUAL_SYNC mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 d0d7188..4dd3bd3 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 @@ -15,6 +15,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.permission.*; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; @@ -44,7 +45,7 @@ import java.util.concurrent.atomic.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Test hadoop file system implementation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 bfb0310..df69163 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 @@ -11,6 +11,7 @@ package org.gridgain.grid.ggfs; import org.apache.commons.logging.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 ce54dfb..981225e 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 @@ -14,6 +14,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.*; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.spi.communication.tcp.*; @@ -31,7 +32,7 @@ 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.gridgain.grid.ggfs.IgniteFsMode.*; +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/81e01957/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 a1a0606..4819bb3 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 @@ -12,6 +12,7 @@ package org.gridgain.grid.ggfs; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; 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.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java index 182dc49..0467d22 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java @@ -9,6 +9,7 @@ package org.gridgain.grid.ggfs; +import org.apache.ignite.fs.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; @@ -16,7 +17,7 @@ import org.gridgain.grid.util.typedef.internal.*; import java.io.*; import java.util.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.kernal.ggfs.common.GridGgfsLogger.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 dabfca9..372150a 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 @@ -13,6 +13,7 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.FileSystem; import org.apache.ignite.*; 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.*; @@ -29,7 +30,7 @@ import java.nio.file.*; import static org.gridgain.grid.cache.GridCacheAtomicityMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +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/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java index 83cd2b9..17f3fcc 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackAbstractSelfTest.java @@ -9,6 +9,8 @@ package org.gridgain.grid.ggfs; +import org.apache.ignite.fs.*; + import static org.gridgain.grid.util.ipc.shmem.GridIpcSharedMemoryServerEndpoint.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java index 2450d73..87d47fd 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java @@ -7,7 +7,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * GGFS Hadoop file system IPC loopback self test in DUAL_ASYNC mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java index 76da390..1681ad9 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java @@ -7,7 +7,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * GGFS Hadoop file system IPC loopback self test in DUAL_SYNC mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java index 4675501..3bd489f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * GGFS Hadoop file system IPC loopback self test in PRIMARY mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java index e914278..cf05e96 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * GGFS Hadoop file system IPC loopback self test in SECONDARY mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java index eab8491..eaddfe7 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java @@ -7,7 +7,7 @@ package org.gridgain.grid.ggfs; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * GGFS Hadoop file system IPC loopback self test in DUAL_ASYNC mode.
