# Ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4a5a08ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4a5a08ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4a5a08ef Branch: refs/heads/ignite-41 Commit: 4a5a08efcb077544ae77b3df588801533ba6031e Parents: c3fbf9d Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 16 14:16:27 2014 +0400 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 16 14:16:27 2014 +0400 ---------------------------------------------------------------------- .../java/org/gridgain/grid/kernal/visor/VisorJob.java | 6 +++--- .../org/gridgain/visor/VisorRuntimeBaseSpec.scala | 1 - .../scala/org/gridgain/visor/VisorTextTableSpec.scala | 3 ++- .../org/gridgain/visor/commands/VisorArgListSpec.scala | 3 ++- .../visor/commands/VisorFileNameCompleterSpec.scala | 4 ++-- .../visor/commands/alert/VisorAlertCommandSpec.scala | 5 +++-- .../commands/cache/VisorCacheClearCommandSpec.scala | 9 +++++---- .../visor/commands/cache/VisorCacheCommandSpec.scala | 6 ++++-- .../commands/cache/VisorCacheCompactCommandSpec.scala | 9 +++++---- .../config/VisorConfigurationCommandSpec.scala | 6 ++---- .../commands/cswap/VisorCacheSwapCommandSpec.scala | 6 ++++-- .../visor/commands/deploy/VisorDeployCommandSpec.scala | 3 ++- .../commands/disco/VisorDiscoveryCommandSpec.scala | 2 +- .../visor/commands/events/VisorEventsCommandSpec.scala | 3 +-- .../visor/commands/gc/VisorGcCommandSpec.scala | 3 ++- .../visor/commands/help/VisorHelpCommandSpec.scala | 3 ++- .../visor/commands/kill/VisorKillCommandSpec.scala | 3 ++- .../visor/commands/log/VisorLogCommandSpec.scala | 3 ++- .../visor/commands/mem/VisorMemoryCommandSpec.scala | 3 ++- .../visor/commands/open/VisorOpenCommandSpec.scala | 1 + .../visor/commands/start/VisorStartCommandSpec.scala | 3 ++- .../visor/commands/tasks/VisorTasksCommandSpec.scala | 11 ++++++----- .../visor/commands/vvm/VisorVvmCommandSpec.scala | 3 ++- .../visor/testsuites/VisorConsoleSelfTestSuite.scala | 13 +++++++------ 24 files changed, 64 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java index f97ae59..dc093ca 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java @@ -23,13 +23,13 @@ import static org.gridgain.grid.kernal.visor.util.VisorTaskUtils.*; */ public abstract class VisorJob<A, R> extends ComputeJobAdapter { @IgniteInstanceResource - protected GridEx g; + protected transient GridEx g; /** Job start time. */ - protected long start; + protected transient long start; /** Debug flag. */ - protected boolean debug; + protected transient boolean debug; /** * Create job with specified argument. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/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 d321931..9a4c02f 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 @@ -12,7 +12,6 @@ package org.gridgain.visor import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration -import org.apache.ignite.{_} import org.scalatest._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/VisorTextTableSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/VisorTextTableSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/VisorTextTableSpec.scala index 4be5b97..fc3f061 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/VisorTextTableSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/VisorTextTableSpec.scala @@ -11,9 +11,10 @@ package org.gridgain.visor -import org.gridgain.visor.commands.VisorTextTable import org.scalatest._ +import org.gridgain.visor.commands.VisorTextTable + import scala.collection._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorArgListSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorArgListSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorArgListSpec.scala index 144b2d6..953ee60 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorArgListSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorArgListSpec.scala @@ -11,9 +11,10 @@ package org.gridgain.visor.commands -import org.gridgain.visor.visor._ import org.scalatest._ +import org.gridgain.visor.visor._ + /** * Test for visor's argument list parsing. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorFileNameCompleterSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorFileNameCompleterSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorFileNameCompleterSpec.scala index 49cbcc6..e7cf589 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorFileNameCompleterSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/VisorFileNameCompleterSpec.scala @@ -11,11 +11,11 @@ package org.gridgain.visor.commands +import org.scalatest._ + import java.io.File import java.util -import org.scalatest._ - /** * Test for visor's file name completer. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/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 a174eaa..92dd360 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 @@ -11,13 +11,14 @@ package org.gridgain.visor.commands.alert -import java.util.regex.Pattern - import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.spi.discovery.DiscoverySpi import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder + +import java.util.regex.Pattern + import org.gridgain.visor._ import org.gridgain.visor.commands.alert.VisorAlertCommand._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/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 3030679..0ae2e97 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,17 +11,18 @@ 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._ import org.gridgain.grid.cache._ + +import org.apache.ignite.Ignition +import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder -import org.apache.ignite.{_} +import org.jetbrains.annotations.Nullable + import org.gridgain.visor._ import org.gridgain.visor.commands.cache.VisorCacheCommand._ -import org.jetbrains.annotations.Nullable import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/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 6a901de..4ea3db3 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,11 +11,13 @@ package org.gridgain.visor.commands.cache -import org.apache.ignite.Ignition import org.gridgain.grid.cache.query.GridCacheQuerySqlField + +import org.apache.ignite.Ignition +import org.scalatest._ + import org.gridgain.visor._ import org.gridgain.visor.commands.cache.VisorCacheCommand._ -import org.scalatest._ /** * Unit test for 'events' command. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/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 296b1fd..0ec5cf5 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,16 +11,17 @@ 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._ + +import org.apache.ignite.Ignition +import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder -import org.apache.ignite.{_} +import org.jetbrains.annotations.Nullable + import org.gridgain.visor._ import org.gridgain.visor.commands.cache.VisorCacheCommand._ -import org.jetbrains.annotations.Nullable import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/config/VisorConfigurationCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/config/VisorConfigurationCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/config/VisorConfigurationCommandSpec.scala index 8c1764c..a41d4f0 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/config/VisorConfigurationCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/config/VisorConfigurationCommandSpec.scala @@ -12,10 +12,8 @@ package org.gridgain.visor.commands.config import org.apache.ignite.configuration.IgniteConfiguration -import org.apache.ignite.events.IgniteEventType -import org.apache.ignite._ -import org.gridgain.grid._ -import IgniteEventType._ +import org.apache.ignite.events.IgniteEventType._ + import org.gridgain.visor._ import org.gridgain.visor.commands.config.VisorConfigurationCommand._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/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 7cbc0a6..a97ec7d 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,14 +11,16 @@ package org.gridgain.visor.commands.cswap +import org.gridgain.grid.cache.{GridCacheConfiguration, GridCacheMode} + import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration -import org.gridgain.grid.cache.{GridCacheConfiguration, GridCacheMode} import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder +import org.jetbrains.annotations.Nullable + import org.gridgain.visor._ import org.gridgain.visor.commands.cache.VisorCacheCommand._ -import org.jetbrains.annotations.Nullable import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/deploy/VisorDeployCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/deploy/VisorDeployCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/deploy/VisorDeployCommandSpec.scala index cccc112..45e2aa5 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/deploy/VisorDeployCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/deploy/VisorDeployCommandSpec.scala @@ -11,9 +11,10 @@ package org.gridgain.visor.commands.deploy +import org.scalatest._ + import org.gridgain.visor._ import org.gridgain.visor.commands.deploy.VisorDeployCommand._ -import org.scalatest._ /** * Unit test for 'deploy' command. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/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 06af487..688230d 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 @@ -13,7 +13,7 @@ package org.gridgain.visor.commands.disco import org.apache.ignite.Ignition import org.apache.ignite.configuration.IgniteConfiguration -import org.apache.ignite.{_} + import org.gridgain.visor._ import org.gridgain.visor.commands.disco.VisorDiscoveryCommand._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/events/VisorEventsCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/events/VisorEventsCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/events/VisorEventsCommandSpec.scala index 11e448c..1dc5de4 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/events/VisorEventsCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/events/VisorEventsCommandSpec.scala @@ -12,8 +12,7 @@ package org.gridgain.visor.commands.events import org.apache.ignite.configuration.IgniteConfiguration -import org.apache.ignite._ -import org.gridgain.grid._ + import org.gridgain.visor._ import org.gridgain.visor.commands.events.VisorEventsCommand._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/gc/VisorGcCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/gc/VisorGcCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/gc/VisorGcCommandSpec.scala index 90b4b4d..bb95498 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/gc/VisorGcCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/gc/VisorGcCommandSpec.scala @@ -11,10 +11,11 @@ package org.gridgain.visor.commands.gc +import org.scalatest._ + import org.gridgain.visor._ import org.gridgain.visor.commands.gc.VisorGcCommand._ import org.gridgain.visor.commands.top.VisorTopologyCommand._ -import org.scalatest._ /** * Unit test for 'gc' command. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/help/VisorHelpCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/help/VisorHelpCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/help/VisorHelpCommandSpec.scala index 92a37d2..e002289 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/help/VisorHelpCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/help/VisorHelpCommandSpec.scala @@ -11,9 +11,10 @@ package org.gridgain.visor.commands.help -import org.gridgain.visor._ import org.scalatest._ +import org.gridgain.visor._ + /** * Unit test for 'help' command. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/kill/VisorKillCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/kill/VisorKillCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/kill/VisorKillCommandSpec.scala index de0d94d..67a0cfb 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/kill/VisorKillCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/kill/VisorKillCommandSpec.scala @@ -11,9 +11,10 @@ package org.gridgain.visor.commands.kill +import org.scalatest._ + import org.gridgain.visor._ import org.gridgain.visor.commands.kill.VisorKillCommand._ -import org.scalatest._ /** * Unit test for 'kill' command. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/log/VisorLogCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/log/VisorLogCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/log/VisorLogCommandSpec.scala index d247cd0..4460af4 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/log/VisorLogCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/log/VisorLogCommandSpec.scala @@ -11,9 +11,10 @@ package org.gridgain.visor.commands.log -import org.gridgain.visor._ import org.scalatest._ +import org.gridgain.visor._ + /** * Unit test for 'log' command. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/mem/VisorMemoryCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/mem/VisorMemoryCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/mem/VisorMemoryCommandSpec.scala index a748c56..27ab68a 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/mem/VisorMemoryCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/mem/VisorMemoryCommandSpec.scala @@ -11,9 +11,10 @@ package org.gridgain.visor.commands.mem -import org.gridgain.visor._ import org.scalatest._ +import org.gridgain.visor._ + /** * Unit test for memory commands. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/open/VisorOpenCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/open/VisorOpenCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/open/VisorOpenCommandSpec.scala index 8f80dc1..e165101 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/open/VisorOpenCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/open/VisorOpenCommandSpec.scala @@ -12,6 +12,7 @@ package org.gridgain.visor.commands.open import org.apache.ignite.IgniteCheckedException + import org.gridgain.visor._ /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/start/VisorStartCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/start/VisorStartCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/start/VisorStartCommandSpec.scala index a2266c7..aee74dd 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/start/VisorStartCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/start/VisorStartCommandSpec.scala @@ -11,10 +11,11 @@ package org.gridgain.visor.commands.start +import org.scalatest._ + import org.gridgain.visor._ import org.gridgain.visor.commands.start.VisorStartCommand._ import org.gridgain.visor.commands.top.VisorTopologyCommand._ -import org.scalatest._ /** * Unit test for 'start' command. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/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 3837253..076f18d 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 @@ -11,16 +11,17 @@ 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.compute.{ComputeJob, ComputeJobAdapter, ComputeJobResult, ComputeTaskSplitAdapter} import org.apache.ignite.configuration.IgniteConfiguration import org.apache.ignite.events.IgniteEventType -import IgniteEventType._ +import org.apache.ignite.events.IgniteEventType._ +import org.scalatest._ + +import java.util + import org.gridgain.visor._ import org.gridgain.visor.commands.tasks.VisorTasksCommand._ -import org.scalatest._ import scala.collection.JavaConversions._ import scala.collection._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/commands/vvm/VisorVvmCommandSpec.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/vvm/VisorVvmCommandSpec.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/vvm/VisorVvmCommandSpec.scala index e87d428..b34f9a3 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/commands/vvm/VisorVvmCommandSpec.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/commands/vvm/VisorVvmCommandSpec.scala @@ -11,9 +11,10 @@ package org.gridgain.visor.commands.vvm +import org.scalatest._ + import org.gridgain.visor._ import org.gridgain.visor.commands.vvm.VisorVvmCommand._ -import org.scalatest._ /** * Unit test for 'vvm' command. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a5a08ef/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala b/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala index bdde03c..0511af5 100644 --- a/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala +++ b/modules/visor-console/src/test/scala/org/gridgain/visor/testsuites/VisorConsoleSelfTestSuite.scala @@ -11,10 +11,15 @@ package org.gridgain.visor.testsuites +import org.apache.ignite.IgniteSystemProperties +import org.apache.ignite.IgniteSystemProperties._ +import org.junit.runner.RunWith +import org.scalatest.Suites +import org.scalatest.junit.JUnitRunner + import java.net.{InetAddress, UnknownHostException} -import org.apache.ignite.IgniteSystemProperties -import IgniteSystemProperties._ +import org.gridgain.visor.VisorTextTableSpec import org.gridgain.visor.commands.VisorArgListSpec import org.gridgain.visor.commands.ack.VisorAckCommandSpec import org.gridgain.visor.commands.alert.VisorAlertCommandSpec @@ -35,10 +40,6 @@ import org.gridgain.visor.commands.ping.VisorPingCommandSpec import org.gridgain.visor.commands.start.VisorStartCommandSpec import org.gridgain.visor.commands.tasks.VisorTasksCommandSpec import org.gridgain.visor.commands.top.VisorTopologyCommandSpec -import org.gridgain.visor.VisorTextTableSpec -import org.junit.runner.RunWith -import org.scalatest.Suites -import org.scalatest.junit.JUnitRunner /** *
