You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/02/02 11:29:10 UTC
[34/50] [abbrv] incubator-ignite git commit: GridEx -> IgniteEx
GridKernal -> IgniteKernal
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index fda2751..0e83e66 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -71,10 +71,10 @@ public class IgniteComputeGridTestSuite {
suite.addTestSuite(GridDeploymentSelfTest.class);
suite.addTestSuite(GridDeploymentMultiThreadedSelfTest.class);
suite.addTestSuite(GridMultipleVersionsDeploymentSelfTest.class);
- suite.addTestSuite(GridExplicitImplicitDeploymentSelfTest.class);
+ suite.addTestSuite(IgniteExplicitImplicitDeploymentSelfTest.class);
suite.addTestSuite(GridEventStorageCheckAllEventsSelfTest.class);
suite.addTestSuite(GridCommunicationManagerListenersSelfTest.class);
- suite.addTestSuite(GridExecutorServiceTest.class);
+ suite.addTestSuite(IgniteExecutorServiceTest.class);
suite.addTestSuite(GridTaskInstantiationSelfTest.class);
suite.addTestSuite(GridManagementJobSelfTest.class);
suite.addTestSuite(GridMultipleJobsSelfTest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
index 651ed02..d98d8f4 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java
@@ -158,7 +158,7 @@ public class GridHadoopDefaultMapReducePlanner implements GridHadoopMapReducePla
GridGgfsEx ggfs = null;
if (F.eq(ignite.name(), endpoint.grid()))
- ggfs = (GridGgfsEx)((GridEx)ignite).ggfsx(endpoint.ggfs());
+ ggfs = (GridGgfsEx)((IgniteEx)ignite).ggfsx(endpoint.ggfs());
if (ggfs != null && !ggfs.isProxy(split0.file())) {
Collection<IgniteFsBlockLocation> blocks = ggfs.affinity(new IgniteFsPath(split0.file()),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
index 13618fc..8f66dae 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java
@@ -164,7 +164,7 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra
*/
@SuppressWarnings("ConstantConditions")
private void switchHandlerErrorFlag(boolean flag) throws Exception {
- IgniteFsProcessorAdapter ggfsProc = ((GridKernal)grid(0)).context().ggfs();
+ IgniteFsProcessorAdapter ggfsProc = ((IgniteKernal)grid(0)).context().ggfs();
Map<String, GridGgfsContext> ggfsMap = getField(ggfsProc, "ggfsCache");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 5688500..65b8ba2 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -70,7 +70,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
private static final String INVALID_HOST_3 = "invalid_host3";
/** Mocked Grid. */
- private static final MockGrid GRID = new MockGrid();
+ private static final MockIgnite GRID = new MockIgnite();
/** Mocked GGFS. */
private static final IgniteFs GGFS = new MockGgfs();
@@ -930,7 +930,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
* Mocked Grid.
*/
@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
- private static class MockGrid extends IgniteSpringBean implements GridEx {
+ private static class MockIgnite extends IgniteSpringBean implements IgniteEx {
/** {@inheritDoc} */
@Override public IgniteFs ggfsx(String name) {
assert F.eq("ggfs", name);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
index 85f55d8..b735263 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopJobTrackerSelfTest.java
@@ -216,7 +216,7 @@ public class GridHadoopJobTrackerSelfTest extends GridHadoopAbstractSelfTest {
*/
private void checkStatus(GridHadoopJobId jobId, boolean complete) throws Exception {
for (int i = 0; i < gridCount(); i++) {
- GridKernal kernal = (GridKernal)grid(i);
+ IgniteKernal kernal = (IgniteKernal)grid(i);
GridHadoop hadoop = kernal.hadoop();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 53b9607..61d0237 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -647,8 +647,8 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
cache.putx(key, val);
cache1.putx(key, val);
- GridCacheQueryManager<Object, Object> qryMgr = ((GridKernal) ignite).internalCache().context().queries();
- GridCacheQueryManager<Object, Object> qryMgr1 = ((GridKernal) ignite).internalCache("c1").context().queries();
+ GridCacheQueryManager<Object, Object> qryMgr = ((IgniteKernal) ignite).internalCache().context().queries();
+ GridCacheQueryManager<Object, Object> qryMgr1 = ((IgniteKernal) ignite).internalCache("c1").context().queries();
assert hasIndexTable(ObjectValue.class, qryMgr);
assert hasIndexTable(ObjectValue.class, qryMgr1);
@@ -883,7 +883,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
for (int i = 0; i < gridCount(); i++) {
GridCacheQueryManager<Object, Object> qryMgr =
- ((GridKernal)grid(i)).internalCache().context().queries();
+ ((IgniteKernal)grid(i)).internalCache().context().queries();
assert !hasIndexTable(EmptyObject.class, qryMgr);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
index d490b79..b529279 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
@@ -285,7 +285,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
public void testPartitionIterators() throws Exception {
populate();
- GridCacheAdapter<Long, Object> cacheAdapter = ((GridKernal)grid(0)).internalCache();
+ GridCacheAdapter<Long, Object> cacheAdapter = ((IgniteKernal)grid(0)).internalCache();
GridNearCacheAdapter<Long, Object> cache = (GridNearCacheAdapter<Long, Object>)cacheAdapter;
Map<Integer, Collection<Long>> grouped = new HashMap<>();
@@ -566,6 +566,6 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
// Runs iterator queue cleanup in GridCacheSwapManager.read method.
cache.get(1L + ENTRY_CNT);
- assertEquals(0, ((GridKernal)grid(0)).internalCache().context().swap().iteratorSetSize());
+ assertEquals(0, ((IgniteKernal)grid(0)).internalCache().context().swap().iteratorSetSize());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
index 7c93844..1e50a92 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
@@ -101,7 +101,7 @@ public class GridCacheQueryLoadSelfTest extends GridCommonAbstractTest {
* @throws IgniteCheckedException If failed.
*/
private long size(Class<?> cls) throws IgniteCheckedException {
- GridCacheQueryManager<Object, Object> qryMgr = ((GridKernal)grid()).internalCache().context().queries();
+ GridCacheQueryManager<Object, Object> qryMgr = ((IgniteKernal)grid()).internalCache().context().queries();
assert qryMgr != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
index 6f28208..b7bace1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
@@ -603,7 +603,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
if (cnt.incrementAndGet() % logMod == 0) {
GridCacheQueryManager<Object, Object> qryMgr =
- ((GridKernal)g).internalCache().context().queries();
+ ((IgniteKernal)g).internalCache().context().queries();
assert qryMgr != null;
@@ -668,7 +668,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
if (cnt.incrementAndGet() % logMod == 0) {
GridCacheQueryManager<Object, Object> qryMgr =
- ((GridKernal)g).internalCache().context().queries();
+ ((IgniteKernal)g).internalCache().context().queries();
assert qryMgr != null;
@@ -757,7 +757,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
if (cnt.incrementAndGet() % logMod == 0) {
GridCacheQueryManager<Object, Object> qryMgr =
- ((GridKernal)g).internalCache().context().queries();
+ ((IgniteKernal)g).internalCache().context().queries();
assert qryMgr != null;
@@ -817,7 +817,7 @@ public class GridCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTest
if (cnt.incrementAndGet() % logMod == 0) {
GridCacheQueryManager<Object, Object> qryMgr =
- ((GridKernal)g).internalCache().context().queries();
+ ((IgniteKernal)g).internalCache().context().queries();
assert qryMgr != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
index ab02b26..b21dee0 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
@@ -59,7 +59,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie
try {
final Map<UUID, Map<Long, GridFutureAdapter<GridQueryFieldsResult>>> map =
- U.field(((GridKernal)grid(0)).internalCache().context().queries(), "fieldsQryRes");
+ U.field(((IgniteKernal)grid(0)).internalCache().context().queries(), "fieldsQryRes");
// Ensure that iterators map empty.
map.clear();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
index 6eda993..4d480b3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
@@ -285,7 +285,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
private ConcurrentMap<UUID,
Map<Long, GridFutureAdapter<GridCloseableIterator<IgniteBiTuple<CacheKey, CacheValue>>>>>
distributedQueryManagerQueryItersMap(Ignite g) {
- GridCacheContext ctx = ((GridKernal)g).internalCache().context();
+ GridCacheContext ctx = ((IgniteKernal)g).internalCache().context();
Field qryItersField = ReflectionUtils.findField(ctx.queries().getClass(), "qryIters");
@@ -442,7 +442,7 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
final ConcurrentMap<UUID, Map<Long, GridFutureAdapter<GridCloseableIterator<
IgniteBiTuple<Integer, Integer>>>>> map =
- U.field(((GridKernal)grid(0)).internalCache().context().queries(), "qryIters");
+ U.field(((IgniteKernal)grid(0)).internalCache().context().queries(), "qryIters");
// fut.nextX() does not guarantee the request has completed on remote node
// (we could receive page from local one), so we need to wait.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 96d46cb..4bac005 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -194,7 +194,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
*
*/
private JdbcConnection connection() throws Exception {
- GridKernalContext ctx = ((GridKernal)ignite).context();
+ GridKernalContext ctx = ((IgniteKernal)ignite).context();
GridQueryProcessor qryProcessor = ctx.query();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 47f5b70..7f95f34 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -134,7 +134,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
assertTrue(U.await(finishLatch, 5000, MILLISECONDS));
- Map map = U.field(((GridKernal)grid(0)).context().io(), "msgSetMap");
+ Map map = U.field(((IgniteKernal)grid(0)).context().io(), "msgSetMap");
info("Map: " + map);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
index e7d9d60..30cdd61 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridTmLookupLifecycleAwareSelfTest.java
@@ -84,7 +84,7 @@ public class GridTmLookupLifecycleAwareSelfTest extends GridAbstractLifecycleAwa
/** {@inheritDoc} */
@Override protected void afterGridStart(Ignite ignite) {
TestTxLookup tmLookup =
- (TestTxLookup)((GridKernal) ignite).context().cache().internalCache(CACHE_NAME).context().jta().tmLookup();
+ (TestTxLookup)((IgniteKernal) ignite).context().cache().internalCache(CACHE_NAME).context().jta().tmLookup();
assertNotNull(tmLookup);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java
index c37fe8f..ba088e3 100644
--- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java
+++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringDynamicCacheManager.java
@@ -103,7 +103,7 @@ public class SpringDynamicCacheManager extends SpringCacheManager {
@Override public void afterPropertiesSet() throws Exception {
super.afterPropertiesSet();
- metaCache = ((GridEx)grid).utilityCache(MetaKey.class, org.springframework.cache.Cache.class);
+ metaCache = ((IgniteEx)grid).utilityCache(MetaKey.class, org.springframework.cache.Cache.class);
dataCache = grid.cache(dataCacheName);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c323a8e7/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index d56ab3b..cb7ce1b 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -37,7 +37,7 @@ import org.apache.ignite.internal.util.{GridConfigurationFinder, GridUtils}
import org.apache.ignite.internal.visor.VisorTaskArgument
import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask
import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask.VisorNodeEventsCollectorTaskArg
-import org.apache.ignite.internal.{GridEx, GridProductImpl}
+import org.apache.ignite.internal.{IgniteEx, GridProductImpl}
import org.apache.ignite.lang.{IgniteNotPeerDeployable, IgnitePredicate}
import org.apache.ignite.lifecycle.IgniteListener
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi
@@ -228,7 +228,7 @@ object visor extends VisorTag {
@volatile var cfgPath: String = null
/** */
- @volatile var grid: GridEx = null
+ @volatile var grid: IgniteEx = null
/**
* Get grid node for specified ID.
@@ -1603,7 +1603,7 @@ object visor extends VisorTag {
grid =
try
- Ignition.ignite(startedGridName).asInstanceOf[GridEx]
+ Ignition.ignite(startedGridName).asInstanceOf[IgniteEx]
catch {
case _: IllegalStateException =>
this.cfgPath = null