http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java index bf6f008..24504e2 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2CleanupTask.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.mapred.JobContextImpl; import org.apache.hadoop.mapreduce.*; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.apache.ignite.hadoop.*; import java.io.*; @@ -65,7 +64,7 @@ public class GridHadoopV2CleanupTask extends GridHadoopV2Task { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } }
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java index 7aaf7ba..7fbd0e3 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2MapTask.java @@ -24,7 +24,6 @@ import org.apache.hadoop.mapreduce.lib.map.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.apache.ignite.hadoop.*; /** @@ -90,7 +89,7 @@ public class GridHadoopV2MapTask extends GridHadoopV2Task { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } catch (Exception e) { err = e; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java index 064ff56..6d7717a 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2ReduceTask.java @@ -22,7 +22,6 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.reduce.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.apache.ignite.hadoop.*; /** @@ -72,7 +71,7 @@ public class GridHadoopV2ReduceTask extends GridHadoopV2Task { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } catch (Exception e) { err = e; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java index 4cd5f1f..8934ab1 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2SetupTask.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.processors.hadoop.v2; import org.apache.hadoop.mapred.JobContextImpl; import org.apache.hadoop.mapreduce.*; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.apache.ignite.hadoop.*; import java.io.*; @@ -59,7 +58,7 @@ public class GridHadoopV2SetupTask extends GridHadoopV2Task { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java index 3df3833..dad000f 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2Splitter.java @@ -21,7 +21,6 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.util.*; import org.apache.ignite.*; -import org.gridgain.grid.*; import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.*; import org.jetbrains.annotations.*; @@ -73,7 +72,7 @@ public class GridHadoopV2Splitter { catch (InterruptedException e) { Thread.currentThread().interrupt(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java index da4c0dc..179ce43 100644 --- a/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java +++ b/modules/hibernate/src/main/java/org/gridgain/grid/cache/store/hibernate/GridCacheHibernateBlobStore.java @@ -22,7 +22,6 @@ import org.apache.ignite.cache.store.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.apache.ignite.transactions.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; @@ -512,7 +511,7 @@ public class GridCacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { try { U.await(initLatch); } - catch (GridInterruptedException e) { + catch (IgniteInterruptedException e) { throw new IgniteException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java index 077e117..fe8503b 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/GridH2Indexing.java @@ -26,7 +26,6 @@ import org.apache.ignite.marshaller.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.indexing.*; -import org.gridgain.grid.cache.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.query.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java index bfe45c4..437fe39 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractQuerySelfTest.java @@ -20,6 +20,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; +import org.apache.ignite.cache.query.GridCacheQueryType; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -47,6 +48,7 @@ import java.util.*; import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; +import static org.apache.ignite.cache.query.GridCacheQueryType.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.GridCacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java index 17311cb..941dcfe 100644 --- a/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java +++ b/modules/indexing/src/test/java/org/gridgain/grid/kernal/processors/query/h2/GridH2IndexRebuildTest.java @@ -17,6 +17,7 @@ package org.gridgain.grid.kernal.processors.query.h2; +import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; @@ -65,7 +66,7 @@ public class GridH2IndexRebuildTest extends GridCacheAbstractSelfTest { try { U.sleep(Long.MAX_VALUE); } - catch (GridInterruptedException ignored) { + catch (IgniteInterruptedException ignored) { interrupted = true; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java b/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java index 56bedf5..607b605 100644 --- a/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java +++ b/modules/jta/src/main/java/org/gridgain/grid/cache/jta/GridCacheTmLookup.java @@ -18,8 +18,6 @@ package org.gridgain.grid.cache.jta; import org.apache.ignite.*; -import org.gridgain.grid.cache.jta.jndi.*; -import org.gridgain.grid.cache.jta.reflect.*; import org.jetbrains.annotations.*; import javax.transaction.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/jta/src/main/java/org/gridgain/grid/cache/jta/jndi/GridCacheJndiTmLookup.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/gridgain/grid/cache/jta/jndi/GridCacheJndiTmLookup.java b/modules/jta/src/main/java/org/gridgain/grid/cache/jta/jndi/GridCacheJndiTmLookup.java index ebf2289..8b63dfc 100644 --- a/modules/jta/src/main/java/org/gridgain/grid/cache/jta/jndi/GridCacheJndiTmLookup.java +++ b/modules/jta/src/main/java/org/gridgain/grid/cache/jta/jndi/GridCacheJndiTmLookup.java @@ -34,7 +34,7 @@ public class GridCacheJndiTmLookup implements GridCacheTmLookup { /** * Gets a list of JNDI names. - * + * * @return List of JNDI names that is used to find TM. */ public List<String> getJndiNames() { @@ -43,7 +43,7 @@ public class GridCacheJndiTmLookup implements GridCacheTmLookup { /** * Sets a list of JNDI names used by this TM. - * + * * @param jndiNames List of JNDI names that is used to find TM. */ public void setJndiNames(List<String> jndiNames) { @@ -71,4 +71,4 @@ public class GridCacheJndiTmLookup implements GridCacheTmLookup { return null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/jta/src/main/java/org/gridgain/grid/cache/jta/reflect/GridCacheReflectionTmLookup.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/main/java/org/gridgain/grid/cache/jta/reflect/GridCacheReflectionTmLookup.java b/modules/jta/src/main/java/org/gridgain/grid/cache/jta/reflect/GridCacheReflectionTmLookup.java index 626ade1..6ff270a 100644 --- a/modules/jta/src/main/java/org/gridgain/grid/cache/jta/reflect/GridCacheReflectionTmLookup.java +++ b/modules/jta/src/main/java/org/gridgain/grid/cache/jta/reflect/GridCacheReflectionTmLookup.java @@ -112,4 +112,4 @@ public class GridCacheReflectionTmLookup implements GridCacheTmLookup { throw new IgniteCheckedException("Failed to invoke method: " + mtd, e); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java index 2001117..b065b89 100644 --- a/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java +++ b/modules/jta/src/test/java/org/gridgain/grid/kernal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.gridgain.grid.cache.jta.GridCacheTmLookup; +import org.gridgain.grid.cache.jta.*; import org.gridgain.grid.kernal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala index 06031fb..4bc7f20 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/ScalarConversions.scala @@ -22,7 +22,6 @@ import org.apache.ignite.cache.{GridCacheEntry, GridCache, GridCacheProjection} import org.apache.ignite.cluster.ClusterGroup import org.apache.ignite.compute.ComputeJob import org.apache.ignite.lang._ -import org.gridgain.grid.cache._ import org.gridgain.scalar.lang._ import org.gridgain.scalar.pimps._ import org.jetbrains.annotations._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala ---------------------------------------------------------------------- diff --git a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala index a6c5b38..c5a60f5 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/pimps/ScalarCachePimp.scala @@ -18,7 +18,6 @@ package org.gridgain.scalar.pimps import org.apache.ignite.cache.GridCache -import org.gridgain.grid.cache._ /** * ==Overview== http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/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 ee18ef5..a14d36a 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 @@ -26,7 +26,6 @@ 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} import org.gridgain.grid.util.scala.impl import org.gridgain.scalar._ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/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 cc03e7f..21db933 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 @@ -600,7 +600,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * 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 `IgniteCheckedException` thrown if the wait was interrupted. + * @throws IgniteInterruptedException 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) { @@ -645,7 +645,7 @@ class ScalarProjectionPimp[A <: ClusterGroup] extends PimpedType[A] with Iterabl * 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 `IgniteCheckedException` thrown if the wait was interrupted. + * @throws IgniteInterruptedException 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, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/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 b8fb9d1..bfb21fb 100644 --- a/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala +++ b/modules/scalar/src/main/scala/org/gridgain/scalar/scalar.scala @@ -25,10 +25,6 @@ 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._ import annotation.meta.field import org.gridgain.grid.kernal.GridProductImpl http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java ---------------------------------------------------------------------- diff --git a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java index 5e023b2..1c47407 100644 --- a/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java +++ b/modules/schedule/src/main/java/org/gridgain/grid/kernal/processors/schedule/ScheduleFutureImpl.java @@ -21,7 +21,6 @@ import it.sauronsoftware.cron4j.*; import org.apache.ignite.*; import org.apache.ignite.lang.*; import org.apache.ignite.scheduler.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.timeout.*; import org.gridgain.grid.util.typedef.*; @@ -724,7 +723,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule if (isDone()) return last(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } @@ -757,7 +756,7 @@ class ScheduleFutureImpl<R> extends GridMetadataAwareAdapter implements Schedule if (isDone()) return last(); - throw new GridInterruptedException(e); + throw new IgniteInterruptedException(e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java ---------------------------------------------------------------------- diff --git a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java index a3964c9..26a91dc 100644 --- a/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java +++ b/modules/ssh/src/main/java/org/gridgain/grid/util/nodestart/GridNodeCallableImpl.java @@ -20,7 +20,6 @@ package org.gridgain.grid.util.nodestart; import com.jcraft.jsch.*; import org.apache.ignite.*; import org.apache.ignite.resources.*; -import org.gridgain.grid.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -197,7 +196,7 @@ public class GridNodeCallableImpl implements GridNodeCallable { return new GridTuple3<>(spec.host(), true, null); } - catch (GridInterruptedException e) { + catch (IgniteInterruptedException e) { return new GridTuple3<>(spec.host(), false, e.getMessage()); } catch (Exception e) { @@ -216,9 +215,9 @@ public class GridNodeCallableImpl implements GridNodeCallable { * @param cmd Command. * @throws JSchException In case of SSH error. * @throws IOException If IO error occurs. - * @throws GridInterruptedException If thread was interrupted while waiting. + * @throws org.apache.ignite.IgniteInterruptedException If thread was interrupted while waiting. */ - private void shell(Session ses, String cmd) throws JSchException, IOException, GridInterruptedException { + private void shell(Session ses, String cmd) throws JSchException, IOException, IgniteInterruptedException { ChannelShell ch = null; try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java index 20d5257..19591ea 100644 --- a/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java +++ b/modules/urideploy/src/main/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentSpi.java @@ -22,7 +22,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; -import org.gridgain.grid.*; import org.apache.ignite.spi.deployment.*; import org.apache.ignite.spi.deployment.uri.scanners.*; import org.apache.ignite.spi.deployment.uri.scanners.file.*; @@ -542,7 +541,7 @@ public class GridUriDeploymentSpi extends IgniteSpiAdapter implements Deployment try { U.sleep(10000); } - catch (GridInterruptedException ignored) { + catch (IgniteInterruptedException ignored) { // No-op } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/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 5893d03..b9e2c4b 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 @@ -122,7 +122,7 @@ trait VisorTag * * Just type:<ex>help</ex> in Visor console to get help and get started. */ -@GridNotPeerDeployable +@IgniteNotPeerDeployable object visor extends VisorTag { /** Argument type. */ type Arg = (String, String) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/550d6033/modules/web/src/main/java/org/gridgain/grid/startup/servlet/GridServletContextListenerStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/gridgain/grid/startup/servlet/GridServletContextListenerStartup.java b/modules/web/src/main/java/org/gridgain/grid/startup/servlet/GridServletContextListenerStartup.java index 94d6e77..cb96c71 100644 --- a/modules/web/src/main/java/org/gridgain/grid/startup/servlet/GridServletContextListenerStartup.java +++ b/modules/web/src/main/java/org/gridgain/grid/startup/servlet/GridServletContextListenerStartup.java @@ -20,7 +20,6 @@ package org.gridgain.grid.startup.servlet; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.resource.*; import org.gridgain.grid.util.typedef.*; @@ -149,7 +148,7 @@ public class GridServletContextListenerStartup implements ServletContextListener try { ignite = G.ignite(cfg.getGridName()); } - catch (GridIllegalStateException ignored) { + catch (IgniteIllegalStateException ignored) { ignite = GridGainEx.start(new IgniteConfiguration(cfg), rsrcCtx); } }
