Repository: incubator-ignite Updated Branches: refs/heads/ignite-63 [created] 550d60336
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/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 fa25ade..5603727 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 @@ -21,7 +21,7 @@ import org.apache.hadoop.conf.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.fs.*; import org.apache.ignite.spi.communication.tcp.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java index 0f66071..a3184a7 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopCommandLineTest.java @@ -20,7 +20,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import com.google.common.base.Joiner; import org.apache.ignite.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.kernal.processors.hadoop.counter.*; import org.gridgain.grid.kernal.processors.hadoop.jobtracker.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/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 f96b6c5..6d62f79 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 @@ -24,7 +24,7 @@ import org.apache.ignite.fs.mapreduce.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.ggfs.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopGroupingTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopGroupingTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopGroupingTest.java index 5ac811c..9f289f4 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopGroupingTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopGroupingTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.hadoop.io.*; import org.apache.hadoop.mapreduce.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java index de6a885..b2e8dae 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopJobTrackerSelfTest.java @@ -22,7 +22,7 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.FileSplit; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.ignite.lang.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java index cca842f..03f0c8d 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java @@ -27,7 +27,7 @@ import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.examples.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java index 75620f7..dca0f9e 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopMapReduceTest.java @@ -26,7 +26,7 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.counter.*; import org.gridgain.grid.kernal.processors.hadoop.examples.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSerializationWrapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSerializationWrapperSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSerializationWrapperSelfTest.java index 026b4b4..7294268 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSerializationWrapperSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSerializationWrapperSelfTest.java @@ -19,8 +19,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.hadoop.io.*; import org.apache.hadoop.io.serializer.*; -import org.apache.hadoop.io.serializer.avro.AvroReflectSerialization; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingExternalTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingExternalTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingExternalTest.java index 5cc739e..f9c2ff6 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingExternalTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingExternalTest.java @@ -17,7 +17,7 @@ package org.gridgain.grid.kernal.processors.hadoop; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; /** * External test for sorting. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingTest.java index bdc25a2..d573389 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSortingTest.java @@ -23,7 +23,7 @@ import org.apache.hadoop.io.serializer.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.mapreduce.lib.output.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.util.typedef.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java index 1b16981..be7933d 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopSplitWrapperSelfTest.java @@ -19,7 +19,6 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.hadoop.fs.*; import org.apache.hadoop.mapreduce.lib.input.*; -import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java index 7cc11a9..1dc1e26 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java @@ -26,9 +26,8 @@ import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.ggfs.hadoop.v1.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java index 6db9e56..8d5257a 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksAllVersionsTest.java @@ -21,8 +21,7 @@ import com.google.common.base.*; import org.apache.hadoop.io.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.examples.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV1Test.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV1Test.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV1Test.java index b31d197..e89c882 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV1Test.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV1Test.java @@ -18,7 +18,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.hadoop.mapred.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.examples.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV2Test.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV2Test.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV2Test.java index 783f79d..303b1cd 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV2Test.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTasksV2Test.java @@ -23,7 +23,7 @@ import org.apache.hadoop.io.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.mapreduce.lib.output.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.examples.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java index 95d3a2f..6acdefd 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestRoundRobinMrPlanner.java @@ -19,8 +19,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.ignite.*; import org.apache.ignite.cluster.*; -import org.gridgain.grid.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.planner.GridHadoopDefaultMapReducePlan; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java index 2360e14..ce30f94 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopTestTaskContext.java @@ -20,8 +20,7 @@ package org.gridgain.grid.kernal.processors.hadoop; import org.apache.hadoop.io.*; import org.apache.hadoop.mapred.*; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java index 978d317..97aabb4 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopV2JobSelfTest.java @@ -22,8 +22,7 @@ import org.apache.hadoop.io.*; import org.apache.hadoop.io.serializer.*; import org.apache.hadoop.mapred.*; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java index ea498d3..b51b3fe 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopAbstractMapTest.java @@ -20,8 +20,7 @@ package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections; import org.apache.commons.collections.comparators.*; import org.apache.hadoop.io.*; import org.apache.ignite.*; -import org.gridgain.grid.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.v2.*; import org.gridgain.testframework.junits.common.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java index f38f42d..cc27d5b 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopConcurrentHashMultimapSelftest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections; import com.google.common.collect.*; import org.apache.hadoop.io.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.io.*; import org.gridgain.grid.util.offheap.unsafe.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMapSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMapSelfTest.java index dc5a651..51c0608 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMapSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopHashMapSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections; import com.google.common.collect.*; import org.apache.hadoop.io.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.offheap.unsafe.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipListSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipListSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipListSelfTest.java index 8048b7d..91c0b13 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipListSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/collections/GridHadoopSkipListSelfTest.java @@ -19,7 +19,7 @@ package org.gridgain.grid.kernal.processors.hadoop.shuffle.collections; import com.google.common.collect.*; import org.apache.hadoop.io.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.io.*; import org.gridgain.grid.util.offheap.unsafe.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java index 57c6d20..d88dc8f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java @@ -26,8 +26,7 @@ import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java index a3045a8..b1700c3 100644 --- a/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java +++ b/modules/spring/src/main/java/org/gridgain/grid/GridSpringBean.java @@ -23,7 +23,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.plugin.*; import org.apache.ignite.product.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.hadoop.*; +import org.apache.ignite.hadoop.*; import org.apache.ignite.plugin.security.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afd94f76/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 083891b..adbef0c 100644 --- a/pom.xml +++ b/pom.xml @@ -637,7 +637,7 @@ </group> <group> <title>Hadoop Accelerator APIs</title> - <packages>org.gridgain.grid.ggfs:org.gridgain.grid.ggfs.hadoop:org.gridgain.grid.ggfs.hadoop.v1:org.gridgain.grid.ggfs.hadoop.v2:org.gridgain.grid.ggfs.mapreduce:org.gridgain.grid.ggfs.mapreduce.records:org.gridgain.grid.hadoop</packages> + <packages>org.gridgain.grid.ggfs:org.gridgain.grid.ggfs.hadoop:org.gridgain.grid.ggfs.hadoop.v1:org.gridgain.grid.ggfs.hadoop.v2:org.gridgain.grid.ggfs.mapreduce:org.gridgain.grid.ggfs.mapreduce.records:org.apache.ignite.hadoop</packages> </group> <group> <title>Streaming APIs</title> @@ -839,7 +839,7 @@ </group> <group> <title>Hadoop Accelerator APIs</title> - <packages>org.gridgain.grid.ggfs:org.gridgain.grid.ggfs.hadoop:org.gridgain.grid.ggfs.hadoop.v1:org.gridgain.grid.ggfs.hadoop.v2:org.gridgain.grid.ggfs.mapreduce:org.gridgain.grid.ggfs.mapreduce.records:org.gridgain.grid.hadoop</packages> + <packages>org.gridgain.grid.ggfs:org.gridgain.grid.ggfs.hadoop:org.gridgain.grid.ggfs.hadoop.v1:org.gridgain.grid.ggfs.hadoop.v2:org.gridgain.grid.ggfs.mapreduce:org.gridgain.grid.ggfs.mapreduce.records:org.apache.ignite.hadoop</packages> </group> <group> <title>Streaming APIs</title>