# gg-9470-rename
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f997c33b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f997c33b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f997c33b Branch: refs/heads/master Commit: f997c33bd6578111731ef0476cfaf46e5310bd05 Parents: 40cf54f Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 4 22:11:47 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 4 22:11:47 2014 +0300 ---------------------------------------------------------------------- .../scala/org/gridgain/scalar/ScalarConversions.scala | 2 -- .../org/gridgain/scalar/lang/ScalarAbsPredicateX.scala | 1 - .../scala/org/gridgain/scalar/lang/ScalarClosure2X.scala | 1 - .../scala/org/gridgain/scalar/lang/ScalarClosure3X.scala | 1 - .../scala/org/gridgain/scalar/lang/ScalarClosureX.scala | 1 - .../org/gridgain/scalar/lang/ScalarInClosure2X.scala | 1 - .../org/gridgain/scalar/lang/ScalarInClosure3X.scala | 1 - .../scala/org/gridgain/scalar/lang/ScalarInClosureX.scala | 1 - .../org/gridgain/scalar/lang/ScalarOutClosureX.scala | 1 - .../org/gridgain/scalar/lang/ScalarPredicate2X.scala | 1 - .../org/gridgain/scalar/lang/ScalarPredicate3X.scala | 1 - .../scala/org/gridgain/scalar/lang/ScalarPredicateX.scala | 1 - .../gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala | 1 - .../org/gridgain/scalar/pimps/ScalarProjectionPimp.scala | 1 - .../scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala | 1 - .../org/gridgain/scalar/tests/ScalarConversionsSpec.scala | 1 - .../gridgain/visor/commands/alert/VisorAlertCommand.scala | 1 - .../src/main/scala/org/gridgain/visor/visor.scala | 10 +++++----- .../scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala | 1 + .../visor/commands/alert/VisorAlertCommandSpec.scala | 1 + .../visor/commands/cache/VisorCacheClearCommandSpec.scala | 1 + .../visor/commands/cache/VisorCacheCommandSpec.scala | 1 + .../commands/cache/VisorCacheCompactCommandSpec.scala | 1 + .../visor/commands/cswap/VisorCacheSwapCommandSpec.scala | 1 + .../visor/commands/disco/VisorDiscoveryCommandSpec.scala | 1 + .../visor/commands/tasks/VisorTasksCommandSpec.scala | 2 +- 26 files changed, 13 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala index 377a4e5..edb5093 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala @@ -15,9 +15,7 @@ import org.apache.ignite.Ignite import org.apache.ignite.cluster.ClusterGroup import org.apache.ignite.compute.ComputeJob import org.apache.ignite.lang._ -import org.gridgain.grid.lang._ import org.gridgain.grid.cache._ -import org.gridgain.grid._ import org.gridgain.scalar.lang._ import org.gridgain.scalar.pimps._ import org.jetbrains.annotations._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala index 3e3147a..a161249 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.GridAbsPredicateX http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala index 53dc324..6702e61 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.IgniteClosure2X http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala index 3bbbb94..15e4745 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.GridClosure3X http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala index 9e994f7..e1cf7c5 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.IgniteClosureX http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala index 14ea4c2..481d358 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.IgniteInClosure2X http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala index 2c8a6f8..f70d09b 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.GridInClosure3X http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala index b593298..7ac6a69 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.IgniteInClosureX http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala index 09a6eee..f036e24 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala @@ -12,7 +12,6 @@ package org.gridgain.scalar.lang import org.gridgain.grid._ -import lang._ import org.gridgain.grid.util.lang.IgniteOutClosureX /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala index b482912..b24190e 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.IgnitePredicate2X http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala index 3a1ab65..21db9ac 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.GridPredicate3X http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala index 7b9cebe..e0fffff 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala @@ -11,7 +11,6 @@ package org.gridgain.scalar.lang -import org.gridgain.grid.lang._ import org.gridgain.grid._ import org.gridgain.grid.util.lang.IgnitePredicateX http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala index f77b306..fbd2190 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala @@ -19,7 +19,6 @@ import collection.JavaConversions._ import org.jetbrains.annotations.Nullable import org.gridgain.grid._ import org.gridgain.grid.cache._ -import org.gridgain.grid.lang._ import org.gridgain.grid.util.lang.{GridFunc => F} import org.gridgain.grid.util.scala.impl import org.gridgain.scalar._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala index 98df863..325e63a 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala @@ -14,7 +14,6 @@ package org.gridgain.scalar.pimps import org.apache.ignite.cluster.{ClusterGroup, ClusterNode} import org.apache.ignite.lang.{IgniteFutureCancelledException, IgniteFuture, IgnitePredicate} import org.gridgain.grid._ -import org.gridgain.grid.lang._ import org.jetbrains.annotations._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala index 4b727cd..85c6860 100644 --- a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala +++ b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheSpec.scala @@ -18,7 +18,6 @@ import scalar._ import org.scalatest.matchers._ import org.scalatest._ import junit.JUnitRunner -import org.gridgain.grid.events.GridEventType import IgniteEventType._ import collection.JavaConversions._ import org.junit.runner.RunWith http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala index 032d02d..1156ad6 100644 --- a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala +++ b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarConversionsSpec.scala @@ -16,7 +16,6 @@ import org.scalatest.FlatSpec import org.scalatest.matchers.ShouldMatchers import org.gridgain.scalar._ import scalar._ -import org.gridgain.grid.lang._ import java.util.concurrent.atomic._ import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala index af0e607..18b9b40 100644 --- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala +++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/alert/VisorAlertCommand.scala @@ -15,7 +15,6 @@ import org.apache.ignite.cluster.ClusterNode import org.apache.ignite.events.{IgniteEvent, IgniteDiscoveryEvent, IgniteEventType} import org.apache.ignite.lang.IgnitePredicate import org.gridgain.grid._ -import org.gridgain.grid.events._ import IgniteEventType._ import org.gridgain.grid.util.lang.{GridFunc => F} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala index be44cae..32d25d5 100644 --- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala @@ -11,6 +11,7 @@ package org.gridgain.visor +import org.apache.ignite.{IgniteState, Ignition} import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode} import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.events.{IgniteEvent, IgniteDiscoveryEvent, IgniteEventType} @@ -26,7 +27,6 @@ import java.util.{HashSet => JHashSet, _} import org.gridgain.grid.GridSystemProperties._ import IgniteEventType._ -import org.gridgain.grid.events._ import org.gridgain.grid.kernal.GridComponentType._ import org.gridgain.grid.kernal.GridNodeAttributes._ import org.gridgain.grid.kernal.processors.spring.GridSpringProcessor @@ -37,7 +37,7 @@ import org.gridgain.grid.thread._ import org.gridgain.grid.util.lang.{GridFunc => F} import org.gridgain.grid.util.typedef._ import org.gridgain.grid.util.{GridConfigurationFinder, GridUtils => U} -import org.gridgain.grid.GridException +import org.gridgain.grid._ import org.gridgain.visor.commands.{VisorConsoleCommand, VisorTextTable} import org.jetbrains.annotations.Nullable @@ -1701,8 +1701,8 @@ object visor extends VisorTag { grid.events().localListen(nodeSegLsnr, EVT_NODE_SEGMENTED) nodeStopLsnr = new GridGainListener { - def onStateChange(name: String, state: GridGainState) { - if (name == grid.name && state == GridGainState.STOPPED) { + def onStateChange(name: String, state: IgniteState) { + if (name == grid.name && state == IgniteState.STOPPED) { warn("Closing Visor console due to stopping of host grid instance.") nl() @@ -2155,7 +2155,7 @@ object visor extends VisorTag { // Call all close callbacks. cbs foreach(_.apply()) - if (grid != null && Ignition.state(grid.name) == GridGainState.STARTED) { + if (grid != null && Ignition.state(grid.name) == IgniteState.STARTED) { if (nodeJoinLsnr != null) grid.events().stopLocalListen(nodeJoinLsnr) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala index 7a0f68e..6ce7a87 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/VisorRuntimeBaseSpec.scala @@ -10,6 +10,7 @@ */ package org.gridgain.visor +import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.gridgain.grid.{_} import org.scalatest._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala index 7fea730..5e5559b 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/alert/VisorAlertCommandSpec.scala @@ -13,6 +13,7 @@ package org.gridgain.visor.commands.alert import java.util.regex.Pattern +import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.gridgain.grid.spi.discovery.GridDiscoverySpi import org.gridgain.grid.spi.discovery.tcp.GridTcpDiscoverySpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala index a558aef..a2e0035 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheClearCommandSpec.scala @@ -11,6 +11,7 @@ package org.gridgain.visor.commands.cache +import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.gridgain.grid.cache.GridCacheAtomicityMode._ import org.gridgain.grid.cache.GridCacheMode._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala index 1c83196..f837959 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCommandSpec.scala @@ -11,6 +11,7 @@ package org.gridgain.visor.commands.cache +import org.apache.ignite.Ignition import org.gridgain.grid.cache.query.GridCacheQuerySqlField import org.gridgain.visor._ import org.gridgain.visor.commands.cache.VisorCacheCommand._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala index 7a24808..6758cef 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommandSpec.scala @@ -11,6 +11,7 @@ package org.gridgain.visor.commands.cache +import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.gridgain.grid.cache.GridCacheMode._ import org.gridgain.grid.cache._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala index 6c81932..cf5a8a3 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/cswap/VisorCacheSwapCommandSpec.scala @@ -11,6 +11,7 @@ package org.gridgain.visor.commands.cswap +import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.gridgain.grid.cache.{GridCacheConfiguration, GridCacheMode} import org.gridgain.grid.spi.discovery.tcp.GridTcpDiscoverySpi http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala index 8844a28..d6d04e0 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommandSpec.scala @@ -11,6 +11,7 @@ package org.gridgain.visor.commands.disco +import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.gridgain.grid.{_} import org.gridgain.visor._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f997c33b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala index 75b4d24..3837253 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/tasks/VisorTasksCommandSpec.scala @@ -13,10 +13,10 @@ package org.gridgain.visor.commands.tasks import java.util +import org.apache.ignite.Ignition import org.apache.ignite.compute.{ComputeJobAdapter, ComputeTaskSplitAdapter, ComputeJob, ComputeJobResult} import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.events.IgniteEventType -import org.gridgain.grid.compute.GridComputeJobAdapter import IgniteEventType._ import org.gridgain.visor._ import org.gridgain.visor.commands.tasks.VisorTasksCommand._
