You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/12 10:30:00 UTC
[59/67] [abbrv] incubator-ignite git commit: Rename GridException to
IgniteCheckedException, GridRuntimeException to IgniteException.
Rename GridException to IgniteCheckedException, GridRuntimeException to IgniteException.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ef93ffcb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef93ffcb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef93ffcb
Branch: refs/heads/ignite-1
Commit: ef93ffcb1bdfb568d1d01ba955ae08a366417946
Parents: 9f09828
Author: sevdokimov <se...@gridgain.com>
Authored: Thu Dec 11 17:50:22 2014 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu Dec 11 17:50:22 2014 +0300
----------------------------------------------------------------------
.../org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala | 1 +
.../org/gridgain/scalar/examples/ScalarCacheAffinityExample2.scala | 1 +
.../org/gridgain/scalar/examples/ScalarCacheQueryExample.scala | 1 +
.../scala/org/gridgain/scalar/examples/ScalarClosureExample.scala | 1 +
.../src/main/java/org/gridgain/grid/kernal/visor/VisorJob.java | 2 +-
.../main/scala/org/gridgain/scalar/lang/ScalarAbsClosureX.scala | 1 +
.../main/scala/org/gridgain/scalar/lang/ScalarAbsPredicateX.scala | 1 +
.../src/main/scala/org/gridgain/scalar/lang/ScalarClosure2X.scala | 1 +
.../src/main/scala/org/gridgain/scalar/lang/ScalarClosure3X.scala | 1 +
.../src/main/scala/org/gridgain/scalar/lang/ScalarClosureX.scala | 1 +
.../main/scala/org/gridgain/scalar/lang/ScalarInClosure2X.scala | 1 +
.../main/scala/org/gridgain/scalar/lang/ScalarInClosure3X.scala | 1 +
.../src/main/scala/org/gridgain/scalar/lang/ScalarInClosureX.scala | 1 +
.../main/scala/org/gridgain/scalar/lang/ScalarOutClosureX.scala | 1 +
.../main/scala/org/gridgain/scalar/lang/ScalarPredicate2X.scala | 1 +
.../main/scala/org/gridgain/scalar/lang/ScalarPredicate3X.scala | 1 +
.../src/main/scala/org/gridgain/scalar/lang/ScalarPredicateX.scala | 1 +
.../org/gridgain/scalar/pimps/ScalarCacheProjectionPimp.scala | 1 +
.../src/main/scala/org/gridgain/scalar/pimps/ScalarGridPimp.scala | 1 +
.../scala/org/gridgain/scalar/pimps/ScalarProjectionPimp.scala | 1 +
.../scala/org/gridgain/scalar/pimps/ScalarTaskThreadContext.scala | 1 +
modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala | 1 +
.../scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala | 1 +
.../scala/org/gridgain/scalar/tests/ScalarProjectionSpec.scala | 1 +
.../scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala | 1 +
.../org/gridgain/visor/commands/alert/VisorAlertCommand.scala | 1 +
.../org/gridgain/visor/commands/cache/VisorCacheCommand.scala | 1 +
.../gridgain/visor/commands/cache/VisorCacheCompactCommand.scala | 1 +
.../org/gridgain/visor/commands/cache/VisorCacheSwapCommand.scala | 1 +
.../gridgain/visor/commands/config/VisorConfigurationCommand.scala | 1 +
.../org/gridgain/visor/commands/disco/VisorDiscoveryCommand.scala | 1 +
.../org/gridgain/visor/commands/events/VisorEventsCommand.scala | 1 +
.../main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala | 1 +
.../scala/org/gridgain/visor/commands/kill/VisorKillCommand.scala | 1 +
.../scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala | 1 +
.../scala/org/gridgain/visor/commands/ping/VisorPingCommand.scala | 1 +
.../org/gridgain/visor/commands/start/VisorStartCommand.scala | 1 +
.../org/gridgain/visor/commands/tasks/VisorTasksCommand.scala | 1 +
.../org/gridgain/visor/commands/top/VisorTopologyCommand.scala | 1 +
.../scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala | 1 +
.../visor-console/src/main/scala/org/gridgain/visor/visor.scala | 1 +
.../visor/commands/config/VisorConfigurationCommandSpec.scala | 1 +
.../gridgain/visor/commands/events/VisorEventsCommandSpec.scala | 1 +
43 files changed, 43 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
index ef7e899..d801082 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample1.scala
@@ -14,6 +14,7 @@ package org.gridgain.scalar.examples
import org.apache.ignite.Ignite
import org.gridgain.scalar.scalar
import scalar._
+import org.apache.ignite._
import org.gridgain.grid._
import cache.affinity.GridCacheAffinityKeyMapped
import cache.GridCacheName
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample2.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample2.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample2.scala
index be103ef..2790c8c 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample2.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheAffinityExample2.scala
@@ -14,6 +14,7 @@ package org.gridgain.scalar.examples
import org.apache.ignite.Ignite
import org.gridgain.scalar.scalar
import scalar._
+import org.apache.ignite._
import org.gridgain.grid._
import collection.JavaConversions._
import scala.util.control.Breaks._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
index ce438ab..b28bd7e 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCacheQueryExample.scala
@@ -14,6 +14,7 @@ package org.gridgain.scalar.examples
import org.apache.ignite.Ignite
import org.gridgain.scalar._
import scalar._
+import org.apache.ignite._
import org.gridgain.grid._
import cache._
import GridCacheMode._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/examples/src/main/scala/org/gridgain/scalar/examples/ScalarClosureExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarClosureExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarClosureExample.scala
index 284f20d..72693c8 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarClosureExample.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarClosureExample.scala
@@ -14,6 +14,7 @@ package org.gridgain.scalar.examples
import org.apache.ignite.cluster.ClusterNode
import org.gridgain.scalar.scalar
import scalar._
+import org.apache.ignite._
import org.gridgain.grid._
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 03fd2e4..f97ae59 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
@@ -9,9 +9,9 @@
package org.gridgain.grid.kernal.visor;
+import org.apache.ignite.*;
import org.apache.ignite.compute.*;
import org.apache.ignite.resources.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsClosureX.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsClosureX.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsClosureX.scala
index b4f0601..968aafe 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsClosureX.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/lang/ScalarAbsClosureX.scala
@@ -11,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.GridAbsClosureX
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 049b869..49c3746 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.GridAbsPredicateX
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 7a68e35..25ed45d 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.IgniteClosure2X
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 dffea73..e7f3cf3 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.GridClosure3X
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 cf597b3..d395459 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.IgniteClosureX
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 1514a1d..6740abe 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.IgniteInClosure2X
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 a045e88..2d4dc7c 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.GridInClosure3X
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 d48d33c..1858eb1 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.IgniteInClosureX
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 21daa9b..a7e1cb2 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
@@ -11,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.IgniteOutClosureX
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 6f64b7f..de5281c 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.IgnitePredicate2X
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 bd86c03..3363eeb 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.GridPredicate3X
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 afa9073..904fa4b 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,6 +11,7 @@
package org.gridgain.scalar.lang
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.lang.IgnitePredicateX
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 c53efb7..b338b03 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
@@ -17,6 +17,7 @@ import org.apache.ignite.lang.{IgnitePredicate, IgniteReducer, IgniteClosure, Ig
import collection._
import collection.JavaConversions._
import org.jetbrains.annotations.Nullable
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.cache._
import org.gridgain.grid.util.lang.{GridFunc => F}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarGridPimp.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarGridPimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarGridPimp.scala
index 68b1d6b..0197fd0 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarGridPimp.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarGridPimp.scala
@@ -13,6 +13,7 @@ package org.gridgain.scalar.pimps
import org.apache.ignite.scheduler.SchedulerFuture
import org.apache.ignite.{IgniteCluster, Ignite}
+import org.apache.ignite._
import org.gridgain.grid._
import org.jetbrains.annotations.Nullable
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 f7b208e..1a18012 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
@@ -13,6 +13,7 @@ package org.gridgain.scalar.pimps
import org.apache.ignite.cluster.{ClusterGroupEmptyException, ClusterGroup, ClusterNode}
import org.apache.ignite.lang.{IgniteFutureCancelledException, IgniteFuture, IgnitePredicate}
+import org.apache.ignite._
import org.gridgain.grid._
import org.jetbrains.annotations._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarTaskThreadContext.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarTaskThreadContext.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarTaskThreadContext.scala
index 6697a67..032fa71 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarTaskThreadContext.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarTaskThreadContext.scala
@@ -12,6 +12,7 @@
package org.gridgain.scalar.pimps
import org.apache.ignite.cluster.ClusterGroup
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.scalar._
import org.jetbrains.annotations._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala
index 378e3a1..19383d8 100644
--- a/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala
+++ b/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala
@@ -17,6 +17,7 @@ import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.configuration.IgniteConfiguration
import org.jetbrains.annotations.Nullable
import java.util.UUID
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.cache._
import org.gridgain.grid.cache.query._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala
index 198cdeb..32d33bf 100644
--- a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala
+++ b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarCacheQueriesSpec.scala
@@ -18,6 +18,7 @@ import org.scalatest.matchers._
import org.scalatest._
import junit.JUnitRunner
import org.gridgain.grid.cache._
+import org.apache.ignite._
import org.gridgain.grid._
import org.junit.runner.RunWith
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarProjectionSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarProjectionSpec.scala b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarProjectionSpec.scala
index 94328e8..d57f184 100644
--- a/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarProjectionSpec.scala
+++ b/modules/scalar/src/test/scala/org/gridgain/scalar/tests/ScalarProjectionSpec.scala
@@ -20,6 +20,7 @@ import scalar._
import org.scalatest.matchers._
import org.scalatest._
import junit.JUnitRunner
+import org.apache.ignite._
import org.gridgain.grid._
import collection.JavaConversions._
import java.util.UUID
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala
index fc4e62e..e306ee3 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ack/VisorAckCommand.scala
@@ -12,6 +12,7 @@
package org.gridgain.visor.commands.ack
import org.apache.ignite.cluster.ClusterGroupEmptyException
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.kernal.visor.misc.VisorAckTask
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 7305c83..f0f2d8c 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
@@ -14,6 +14,7 @@ package org.gridgain.visor.commands.alert
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.events.{IgniteEvent, IgniteDiscoveryEvent, IgniteEventType}
import org.apache.ignite.lang.IgnitePredicate
+import org.apache.ignite._
import org.gridgain.grid._
import IgniteEventType._
import org.gridgain.grid.util.lang.{GridFunc => F}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCommand.scala
index 702fb39..58cb4c1 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCommand.scala
@@ -13,6 +13,7 @@ package org.gridgain.visor.commands.cache
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.lang.IgniteBiTuple
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.kernal.visor.cache.{VisorCacheMetricsCollectorTask, VisorCacheMetrics2, VisorCacheAggregatedMetrics, VisorCacheConfiguration}
import org.gridgain.grid.kernal.visor.node.{VisorNodeConfigurationCollectorTask, VisorGridConfiguration}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommand.scala
index 231612f..fc92b4a 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheCompactCommand.scala
@@ -17,6 +17,7 @@ import org.gridgain.grid.kernal.visor.util.VisorTaskUtils._
import java.util.Collections
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.visor.commands.VisorTextTable
import org.gridgain.visor.visor._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheSwapCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheSwapCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheSwapCommand.scala
index c1f4de3..3867a31 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheSwapCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/cache/VisorCacheSwapCommand.scala
@@ -16,6 +16,7 @@ import org.gridgain.grid.kernal.visor.util.VisorTaskUtils._
import java.util.Collections
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.visor.commands.VisorTextTable
import org.gridgain.visor.visor._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/config/VisorConfigurationCommand.scala
index c74efba..e63c792 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/config/VisorConfigurationCommand.scala
@@ -17,6 +17,7 @@ import org.gridgain.grid.kernal.visor.node.VisorNodeConfigurationCollectorTask
import java.lang.System._
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.{GridUtils => U}
import org.gridgain.visor._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommand.scala
index d40c02c..a9aa696 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/disco/VisorDiscoveryCommand.scala
@@ -13,6 +13,7 @@ package org.gridgain.visor.commands.disco
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.events.IgniteEventType
+import org.apache.ignite._
import org.gridgain.grid._
import IgniteEventType._
import org.gridgain.grid.kernal.visor.event.VisorGridDiscoveryEvent
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/events/VisorEventsCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/events/VisorEventsCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/events/VisorEventsCommand.scala
index 14329ea..3cfe15a 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/events/VisorEventsCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/events/VisorEventsCommand.scala
@@ -17,6 +17,7 @@ import org.gridgain.grid.kernal.visor.node.VisorNodeEventsCollectorTask
import java.util.UUID
+import org.apache.ignite._
import org.gridgain.grid._
import IgniteEventType._
import VisorNodeEventsCollectorTask.VisorNodeEventsCollectorTaskArg
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala
index 0aeeef8..9e2c1a6 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/gc/VisorGcCommand.scala
@@ -17,6 +17,7 @@ import org.gridgain.grid.kernal.visor.node.VisorNodeGcTask
import java.lang.{Boolean => JavaBoolean}
import java.util.{UUID, HashSet => JavaHashSet}
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.visor._
import org.gridgain.visor.commands.{VisorConsoleCommand, VisorTextTable}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/kill/VisorKillCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/kill/VisorKillCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/kill/VisorKillCommand.scala
index 4071b60..58cdbd3 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/kill/VisorKillCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/kill/VisorKillCommand.scala
@@ -12,6 +12,7 @@
package org.gridgain.visor.commands.kill
import org.apache.ignite.cluster.ClusterNode
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.kernal.GridNodeAttributes._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala
index 67ce6c4..9c2cd3a 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/node/VisorNodeCommand.scala
@@ -14,6 +14,7 @@ package org.gridgain.visor.commands.node
import java.util.UUID
import org.apache.ignite.cluster.ClusterNode
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.kernal.GridNodeAttributes._
import org.gridgain.grid.util.typedef.X
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ping/VisorPingCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ping/VisorPingCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ping/VisorPingCommand.scala
index 3da0c22..22d4d8a 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ping/VisorPingCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/ping/VisorPingCommand.scala
@@ -12,6 +12,7 @@
package org.gridgain.visor.commands.ping
import org.apache.ignite.cluster.ClusterNode
+import org.apache.ignite._
import org.gridgain.grid._
import java.util.concurrent._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/start/VisorStartCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/start/VisorStartCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/start/VisorStartCommand.scala
index 73578c0..88adf02 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/start/VisorStartCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/start/VisorStartCommand.scala
@@ -11,6 +11,7 @@
package org.gridgain.visor.commands.start
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.util.{GridUtils => U}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/tasks/VisorTasksCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/tasks/VisorTasksCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/tasks/VisorTasksCommand.scala
index f7e2c23..f3c648d 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/tasks/VisorTasksCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/tasks/VisorTasksCommand.scala
@@ -13,6 +13,7 @@ package org.gridgain.visor.commands.tasks
import org.apache.ignite.events.IgniteEventType
import org.apache.ignite.lang.IgniteUuid
+import org.apache.ignite._
import org.gridgain.grid._
import IgniteEventType._
import org.gridgain.grid.kernal.visor.event.{VisorGridEvent, VisorGridJobEvent, VisorGridTaskEvent}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/top/VisorTopologyCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/top/VisorTopologyCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/top/VisorTopologyCommand.scala
index 4bcd283..f37be41 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/top/VisorTopologyCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/top/VisorTopologyCommand.scala
@@ -13,6 +13,7 @@ package org.gridgain.visor.commands.top
import org.apache.ignite.cluster.ClusterNode
import org.apache.ignite.lang.IgnitePredicate
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.kernal.GridNodeAttributes._
import org.gridgain.grid.util.{GridUtils => U}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
index ad1f547..d4927bf 100644
--- a/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
+++ b/modules/visor-console/src/main/scala/org/gridgain/visor/commands/vvm/VisorVvmCommand.scala
@@ -13,6 +13,7 @@ package org.gridgain.visor.commands.vvm
import org.apache.ignite.IgniteSystemProperties
import org.apache.ignite.cluster.ClusterNode
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.grid.kernal.GridNodeAttributes._
import org.gridgain.grid.util.{GridUtils => U}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 2678179..e1c24c0 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
@@ -38,6 +38,7 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi
import org.gridgain.grid.util.lang.{GridFunc => F}
import org.gridgain.grid.util.typedef._
import org.gridgain.grid.util.{GridConfigurationFinder, GridUtils => U}
+import org.apache.ignite._
import org.gridgain.grid._
import org.gridgain.visor.commands.{VisorConsoleCommand, VisorTextTable}
import org.jetbrains.annotations.Nullable
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 39304f8..8c1764c 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
@@ -13,6 +13,7 @@ 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.gridgain.visor._
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef93ffcb/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 1c47d4e..11e448c 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,6 +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._