ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [58/67] [abbrv] incubator-ignite git commit: Rename GridException to IgniteCheckedException, GridRuntimeException to IgniteException.
Date Fri, 12 Dec 2014 09:29:59 GMT
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/9f098280
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f098280
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f098280

Branch: refs/heads/ignite-1
Commit: 9f098280dc374033ce15687514850ec0349fab05
Parents: 6f535d6
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Thu Dec 11 17:17:11 2014 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Thu Dec 11 17:17:59 2014 +0300

----------------------------------------------------------------------
 .../examples/ScalarCachePopularNumbersExample.scala |  6 +++---
 ...grid_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp |  2 +-
 .../gridgain/scalar/lang/ScalarAbsClosureX.scala    |  2 +-
 .../gridgain/scalar/lang/ScalarAbsPredicateX.scala  |  2 +-
 .../org/gridgain/scalar/lang/ScalarClosure2X.scala  |  2 +-
 .../org/gridgain/scalar/lang/ScalarClosure3X.scala  |  2 +-
 .../org/gridgain/scalar/lang/ScalarClosureX.scala   |  2 +-
 .../gridgain/scalar/lang/ScalarInClosure2X.scala    |  2 +-
 .../gridgain/scalar/lang/ScalarInClosure3X.scala    |  2 +-
 .../org/gridgain/scalar/lang/ScalarInClosureX.scala |  2 +-
 .../gridgain/scalar/lang/ScalarOutClosureX.scala    |  2 +-
 .../gridgain/scalar/lang/ScalarPredicate2X.scala    |  2 +-
 .../gridgain/scalar/lang/ScalarPredicate3X.scala    |  2 +-
 .../org/gridgain/scalar/lang/ScalarPredicateX.scala |  2 +-
 .../scalar/pimps/ScalarCacheProjectionPimp.scala    |  2 +-
 .../scalar/pimps/ScalarProjectionPimp.scala         | 12 ++++++------
 .../visor/commands/alert/VisorAlertCommand.scala    |  6 +++---
 .../visor/commands/cache/VisorCacheCommand.scala    |  4 ++--
 .../commands/config/VisorConfigurationCommand.scala |  2 +-
 .../visor/commands/events/VisorEventsCommand.scala  |  2 +-
 .../gridgain/visor/commands/gc/VisorGcCommand.scala |  2 +-
 .../visor/commands/kill/VisorKillCommand.scala      |  4 ++--
 .../visor/commands/start/VisorStartCommand.scala    |  4 ++--
 .../visor/commands/tasks/VisorTasksCommand.scala    | 10 +++++-----
 .../visor/commands/top/VisorTopologyCommand.scala   |  4 ++--
 .../src/main/scala/org/gridgain/visor/visor.scala   | 16 ++++++++--------
 .../org/gridgain/visor/VisorRuntimeBaseSpec.scala   |  2 +-
 .../commands/cache/VisorCacheClearCommandSpec.scala |  2 +-
 .../cache/VisorCacheCompactCommandSpec.scala        |  2 +-
 .../commands/disco/VisorDiscoveryCommandSpec.scala  |  2 +-
 .../visor/commands/open/VisorOpenCommandSpec.scala  |  4 ++--
 31 files changed, 56 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala
b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala
index 4628134..8546ab8 100644
--- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala
+++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala
@@ -12,7 +12,7 @@
 package org.gridgain.scalar.examples
 
 import org.apache.ignite.dataload.IgniteDataLoadCacheUpdater
-import org.gridgain.grid.GridException
+import org.apache.ignite.IgniteCheckedException
 import org.gridgain.grid.cache.GridCache
 
 import java.util
@@ -80,9 +80,9 @@ object ScalarCachePopularNumbersExample extends App {
 
     /**
      * Populates cache in real time with numbers and keeps count for every number.
-     * @throws GridException If failed.
+     * @throws IgniteCheckedException If failed.
      */
-    @throws[GridException]
+    @throws[IgniteCheckedException]
     def streamData() {
         // Set larger per-node buffer size since our state is relatively small.
         // Reduce parallel operations since we running the whole grid locally under heavy
load.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/ipc/shmem/ggshmem/org_gridgain_grid_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp
----------------------------------------------------------------------
diff --git a/ipc/shmem/ggshmem/org_gridgain_grid_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp
b/ipc/shmem/ggshmem/org_gridgain_grid_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp
index f62e8ff..728867d 100644
--- a/ipc/shmem/ggshmem/org_gridgain_grid_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp
+++ b/ipc/shmem/ggshmem/org_gridgain_grid_util_ipc_shmem_GridIpcSharedMemoryUtils.cpp
@@ -27,7 +27,7 @@
 
 using namespace std;
 
-/** GridException JNI class name. */
+/** IgniteCheckedException JNI class name. */
 const char* GRID_EXCEPTION = "org/apache/ignite/IgniteCheckedException";
 
 /** GridIpcSharedMemoryOperationTimedoutException JNI class name. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 b604c72..b4f0601 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
@@ -23,7 +23,7 @@ class ScalarAbsClosureX(private val f: () => Unit) extends GridAbsClosureX
{
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx() {
         f()
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 a161249..049b869 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
@@ -23,7 +23,7 @@ class ScalarAbsPredicateX(private val f: () => Boolean) extends GridAbsPredicate
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(): Boolean = {
         f()
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 6702e61..7a68e35 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
@@ -23,7 +23,7 @@ class ScalarClosure2X[E1, E2, R](private val f: (E1, E2) => R) extends
IgniteClo
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(e1: E1, e2: E2): R = {
         f(e1, e2)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 15e4745..dffea73 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
@@ -23,7 +23,7 @@ class ScalarClosure3X[E1, E2, E3, R](private val f: (E1, E2, E3) => R)
extends G
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(e1: E1, e2: E2, e3: E3): R = {
         f(e1, e2, e3)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 e1cf7c5..cf597b3 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
@@ -23,7 +23,7 @@ class ScalarClosureX[E, R](private val f: E => R) extends IgniteClosureX[E,
R] {
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(e: E): R = {
         f(e)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 481d358..1514a1d 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
@@ -23,7 +23,7 @@ class ScalarInClosure2X[T1, T2](private val f: (T1, T2) => Unit) extends
IgniteI
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(t1: T1, t2: T2) {
         f(t1, t2)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 f70d09b..a045e88 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
@@ -23,7 +23,7 @@ class ScalarInClosure3X[T1, T2, T3](private val f: (T1, T2, T3) => Unit)
extends
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(t1: T1, t2: T2, t3: T3) {
         f(t1, t2, t3)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 7ac6a69..d48d33c 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
@@ -23,7 +23,7 @@ class ScalarInClosureX[T](private val f: T => Unit) extends IgniteInClosureX[T]
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(t: T) {
         f(t)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 f036e24..21daa9b 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
@@ -23,7 +23,7 @@ class ScalarOutClosureX[R](private val f: () => R) extends IgniteOutClosureX[R]
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(): R = {
         f()
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 b24190e..6f64b7f 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
@@ -23,7 +23,7 @@ class ScalarPredicate2X[T1, T2](private val p: (T1, T2) => Boolean) extends
Igni
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(e1: T1, e2: T2): Boolean = {
         p(e1, e2)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 21db9ac..bd86c03 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
@@ -23,7 +23,7 @@ class ScalarPredicate3X[T1, T2, T3](private val p: (T1, T2, T3) => Boolean)
exte
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(e1: T1, e2: T2, e3: T3): Boolean = {
         p(e1, e2, e3)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 e0fffff..afa9073 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
@@ -23,7 +23,7 @@ class ScalarPredicateX[T](private val p: T => Boolean) extends IgnitePredicateX[
     /**
      * Delegates to passed in function.
      */
-    @throws(classOf[GridException])
+    @throws(classOf[IgniteCheckedException])
     def applyx(e: T): Boolean = {
         p(e)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 fbd2190..c53efb7 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
@@ -247,7 +247,7 @@ class ScalarCacheProjectionPimp[@specialized K, @specialized V] extends
PimpedTy
         else if (c == classOf[Byte])
             classOf[java.lang.Byte]
         else if (c == classOf[Symbol])
-            throw new GridException("Cache type projeciton on 'scala.Symbol' are not supported.")
+            throw new IgniteCheckedException("Cache type projeciton on 'scala.Symbol' are
not supported.")
         else
             c
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 e385f6b..f7b208e 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
@@ -588,13 +588,13 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param r Closure to affinity co-located on the node with given affinity key and execute.
      *      If `null` - this method is no-op.
      * @param p Optional filtering predicate. If `null` provided - all nodes in this projection
will be used for topology.
-     * @throws GridException Thrown in case of any error.
+     * @throws IgniteCheckedException Thrown in case of any error.
      * @throws ClusterGroupEmptyException Thrown in case when this projection is empty.
      *      Note that in case of dynamic projection this method will take a snapshot of all
the
      *      nodes at the time of this call, apply all filtering predicates, if any, and if
the
      *      resulting collection of nodes is empty - the exception will be thrown.
-     * @throws GridInterruptedException Subclass of `GridException` thrown if the wait was
interrupted.
-     * @throws IgniteFutureCancelledException Subclass of `GridException` thrown if computation
was cancelled.
+     * @throws GridInterruptedException Subclass of `IgniteCheckedException` thrown if the
wait was interrupted.
+     * @throws IgniteFutureCancelledException Subclass of `IgniteCheckedException` thrown
if computation was cancelled.
      */
     def affinityRun$(cacheName: String, @Nullable affKey: Any, @Nullable r: Run, @Nullable
p: NF) {
         affinityRunAsync$(cacheName, affKey, r, p).get
@@ -632,14 +632,14 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A]
with Iterabl
      * @param r Closure to affinity co-located on the node with given affinity key and execute.
      *      If `null` - this method is no-op.
      * @param p Optional filtering predicate. If `null` provided - all nodes in this projection
will be used for topology.
-     * @throws GridException Thrown in case of any error.
+     * @throws IgniteCheckedException Thrown in case of any error.
      * @throws ClusterGroupEmptyException Thrown in case when this projection is empty.
      *      Note that in case of dynamic projection this method will take a snapshot of all
the
      *      nodes at the time of this call, apply all filtering predicates, if any, and if
the
      *      resulting collection of nodes is empty - the exception will be thrown.
      * @return Non-cancellable future of this execution.
-     * @throws GridInterruptedException Subclass of `GridException` thrown if the wait was
interrupted.
-     * @throws IgniteFutureCancelledException Subclass of `GridException` thrown if computation
was cancelled.
+     * @throws GridInterruptedException Subclass of `IgniteCheckedException` thrown if the
wait was interrupted.
+     * @throws IgniteFutureCancelledException Subclass of `IgniteCheckedException` thrown
if computation was cancelled.
      */
     def affinityRunAsync$(cacheName: String, @Nullable affKey: Any, @Nullable r: Run,
         @Nullable p: NF): IgniteFuture[_] = {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 18b9b40..7305c83 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
@@ -216,7 +216,7 @@ class VisorAlertCommand {
         if (expr.isDefined)
             (n: ClusterNode) => f(n) && expr.get.apply(value(n))
         else
-            throw new GridException("Invalid expression: " + exprStr)
+            throw new IgniteCheckedException("Invalid expression: " + exprStr)
     }
 
     /**
@@ -235,7 +235,7 @@ class VisorAlertCommand {
         if (expr.isDefined)
             () => f() && expr.get.apply(value())
         else
-            throw new GridException("Invalid expression: " + exprStr)
+            throw new IgniteCheckedException("Invalid expression: " + exprStr)
     }
 
     /**
@@ -291,7 +291,7 @@ class VisorAlertCommand {
                             // Other tags.
                             case "t" if v != null => freq = v.toLong
                             case "r" => () // Skipping.
-                            case _ => throw new GridException("Invalid argument: " + makeArg(arg))
+                            case _ => throw new IgniteCheckedException("Invalid argument:
" + makeArg(arg))
                         }
                     })
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 934690b..702fb39 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
@@ -473,7 +473,7 @@ class VisorCacheCommand {
                 new IgniteBiTuple(new JavaBoolean(name.isEmpty), name.orNull))).toList
         }
         catch {
-            case e: GridException => Nil
+            case e: IgniteCheckedException => Nil
         }
     }
 
@@ -488,7 +488,7 @@ class VisorCacheCommand {
             grid.compute(grid.forNode(node)).withNoFailover()
                 .execute(classOf[VisorNodeConfigurationCollectorTask], emptyTaskArgument(node.id()))
         catch {
-            case e: GridException =>
+            case e: IgniteCheckedException =>
                 scold(e.getMessage)
 
                 null

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 fd6c94f..c74efba 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
@@ -205,7 +205,7 @@ class VisorConfigurationCommand {
                     .withNoFailover()
                     .execute(classOf[VisorNodeConfigurationCollectorTask], emptyTaskArgument(node.id()))
             catch {
-                case e: GridException =>
+                case e: IgniteCheckedException =>
                     scold(e.getMessage)
 
                     break()

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 46e2d31..14329ea 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
@@ -290,7 +290,7 @@ class VisorEventsCommand {
                 grid.compute(grid.forNode(node)).execute(classOf[VisorNodeEventsCollectorTask],
                     toTaskArgument(nid, VisorNodeEventsCollectorTaskArg.createEventsArg(tpFilter,
tmFilter)))
             catch {
-                case e: GridException =>
+                case e: IgniteCheckedException =>
                     scold(e.getMessage)
 
                     return

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 4458b67..0aeeef8 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
@@ -160,7 +160,7 @@ class VisorGcCommand {
             }
             catch {
                 case e: ClusterGroupEmptyException => scold("Topology is empty.")
-                case e: GridException => scold(e.getMessage)
+                case e: IgniteCheckedException => scold(e.getMessage)
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 26cdf15..4071b60 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
@@ -171,7 +171,7 @@ class VisorKillCommand {
                     if (restart && node != null && node.attribute[String](ATTR_RESTART_ENABLED)
!= "true")
                         scold("Node doesn't support restart: " + nid8(node)).^^
                 catch {
-                    case e: GridException => scold("Failed to restart the node. " + e.getMessage).^^
+                    case e: IgniteCheckedException => scold("Failed to restart the node.
" + e.getMessage).^^
                 }
 
                 val op = if (restart) "restart" else "kill"
@@ -179,7 +179,7 @@ class VisorKillCommand {
                 try
                     killOrRestart(if (node == null) grid.nodes().map(_.id()) else Collections.singleton(node.id()),
restart)
                 catch {
-                    case _: GridException => scold("Failed to " + op + " due to system
error.").^^
+                    case _: IgniteCheckedException => scold("Failed to " + op + " due
to system error.").^^
                 }
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 fc2cf9e..73578c0 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
@@ -226,7 +226,7 @@ class VisorStartCommand {
                         Result(t.get1, t.get2, t.get3)
                     }).toSeq
                 catch {
-                    case e: GridException => scold(e.getMessage).^^
+                    case e: IgniteCheckedException => scold(e.getMessage).^^
                     case _: RejectedExecutionException => scold("Failed due to system
error.").^^
                 }
             }
@@ -281,7 +281,7 @@ class VisorStartCommand {
                     res = grid.startNodes(asJavaCollection(Seq(params)), null, restart, timeout,
maxConn).
                         map(t => Result(t.get1, t.get2, t.get3)).toSeq
                 catch {
-                    case e: GridException => scold(e.getMessage).^^
+                    case e: IgniteCheckedException => scold(e.getMessage).^^
                     case _: RejectedExecutionException => scold("Failed due to system
error.").^^
                 }
             }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 6d132f3..f7e2c23 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
@@ -777,7 +777,7 @@ class VisorTasksCommand {
                 taskFootnote()
             }
             catch {
-                case e: GridException =>
+                case e: IgniteCheckedException =>
                     scold(e.getMessage)
 
                     break()
@@ -970,7 +970,7 @@ class VisorTasksCommand {
                 }
             }
             catch {
-                case e: GridException =>
+                case e: IgniteCheckedException =>
                     scold(e.getMessage)
 
                     break()
@@ -1102,7 +1102,7 @@ class VisorTasksCommand {
                 evtsT.render()
             }
             catch {
-                case e: GridException =>
+                case e: IgniteCheckedException =>
                     scold(e.getMessage)
 
                     break()
@@ -1214,7 +1214,7 @@ class VisorTasksCommand {
                 taskFootnote()
             }
             catch {
-                case e: GridException =>
+                case e: IgniteCheckedException =>
                     scold(e.getMessage)
 
                     break()
@@ -1330,7 +1330,7 @@ class VisorTasksCommand {
                 taskFootnote()
             }
             catch {
-                case e: GridException =>
+                case e: IgniteCheckedException =>
                     scold(e.getMessage)
 
                     break()

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 e843ab7..4bcd283 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
@@ -184,7 +184,7 @@ class VisorTopologyCommand {
             }
             catch {
                 case e: NumberFormatException => scold(e.getMessage)
-                case e: GridException => scold(e.getMessage)
+                case e: IgniteCheckedException => scold(e.getMessage)
             }
         }
     }
@@ -205,7 +205,7 @@ class VisorTopologyCommand {
         if (expr.isDefined)
             (n: ClusterNode) => f(n) && expr.get.apply(v(n))
         else
-            throw new GridException("Invalid expression: " + exprStr)
+            throw new IgniteCheckedException("Invalid expression: " + exprStr)
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 f380464..2678179 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
@@ -230,18 +230,18 @@ object visor extends VisorTag {
      *
      * @param nid Node ID.
      * @return GridNode instance.
-     * @throws GridException if Visor is disconnected or node not found.
+     * @throws IgniteCheckedException if Visor is disconnected or node not found.
      */
     def node(nid: UUID): ClusterNode = {
         val g = grid
 
         if (g == null)
-            throw new GridException("Visor disconnected")
+            throw new IgniteCheckedException("Visor disconnected")
         else {
             val node = g.node(nid)
 
             if (node == null)
-                throw new GridException("Node is gone: " + nid)
+                throw new IgniteCheckedException("Node is gone: " + nid)
 
             node
         }
@@ -1473,7 +1473,7 @@ object visor extends VisorTag {
                             val url = U.resolveGridGainUrl(path)
 
                             if (url == null)
-                                throw new GridException("GridGain configuration path is invalid:
" + path, e)
+                                throw new IgniteCheckedException("GridGain configuration
path is invalid: " + path, e)
 
                             url
                     }
@@ -1498,10 +1498,10 @@ object visor extends VisorTag {
                     }
 
                 if (cfgs == null || cfgs.isEmpty)
-                    throw new GridException("Can't find grid configuration in: " + url)
+                    throw new IgniteCheckedException("Can't find grid configuration in: "
+ url)
 
                 if (cfgs.size > 1)
-                    throw new GridException("More than one grid configuration found in: "
+ url)
+                    throw new IgniteCheckedException("More than one grid configuration found
in: " + url)
 
                 val cfg = cfgs.iterator().next()
 
@@ -1560,7 +1560,7 @@ object visor extends VisorTag {
             open(cfg, cfgPath)
         }
         catch {
-            case e: GridException =>
+            case e: IgniteCheckedException =>
                 warn(e.getMessage)
                 warn("Type 'help open' to see how to use this command.")
 
@@ -1603,7 +1603,7 @@ object visor extends VisorTag {
                 case _: IllegalStateException =>
                     this.cfgPath = null
 
-                    throw new GridException("Named grid unavailable: " + startedGridName)
+                    throw new IgniteCheckedException("Named grid unavailable: " + startedGridName)
             }
 
         assert(cfgPath != null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 6ce7a87..d321931 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,7 @@ package org.gridgain.visor
 
 import org.apache.ignite.Ignition
 import org.apache.ignite.configuration.IgniteConfiguration
-import org.gridgain.grid.{_}
+import org.apache.ignite.{_}
 import org.scalatest._
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 9e6b052..3030679 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
@@ -18,7 +18,7 @@ import org.gridgain.grid.cache.GridCacheMode._
 import org.gridgain.grid.cache._
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder
-import org.gridgain.grid.{_}
+import org.apache.ignite.{_}
 import org.gridgain.visor._
 import org.gridgain.visor.commands.cache.VisorCacheCommand._
 import org.jetbrains.annotations.Nullable

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 eb8e529..296b1fd 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
@@ -17,7 +17,7 @@ import org.gridgain.grid.cache.GridCacheMode._
 import org.gridgain.grid.cache._
 import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi
 import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder
-import org.gridgain.grid.{_}
+import org.apache.ignite.{_}
 import org.gridgain.visor._
 import org.gridgain.visor.commands.cache.VisorCacheCommand._
 import org.jetbrains.annotations.Nullable

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f098280/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 d6d04e0..06af487 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.gridgain.grid.{_}
+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/9f098280/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 2f993be..8f80dc1 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
@@ -11,7 +11,7 @@
 
 package org.gridgain.visor.commands.open
 
-import org.gridgain.grid.GridException
+import org.apache.ignite.IgniteCheckedException
 import org.gridgain.visor._
 
 /**
@@ -28,7 +28,7 @@ class VisorOpenCommandSpec extends VisorRuntimeBaseSpec(3) {
         try
             openVisor()
         catch {
-            case ignored: GridException =>
+            case ignored: IgniteCheckedException =>
         }
     }
 }


Mime
View raw message