Repository: incubator-ignite Updated Branches: refs/heads/master 2b1619cbc -> 984373dc3
Ignite - fixed compilation Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/984373dc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/984373dc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/984373dc Branch: refs/heads/master Commit: 984373dc308b79f374112d66ada1f79daf91de1f Parents: 2b1619c Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon Dec 8 14:57:59 2014 +0300 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon Dec 8 14:57:59 2014 +0300 ---------------------------------------------------------------------- .../integration/GridClientAbstractMultiNodeSelfTest.java | 11 +++++------ .../kernal/processors/rest/GridRestProcessorTest.java | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/984373dc/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java index 0cca292..259ee3a 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java @@ -16,6 +16,10 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.communication.tcp.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.client.*; import org.gridgain.client.balancer.*; import org.gridgain.client.ssl.*; @@ -25,11 +29,6 @@ import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; -import org.gridgain.grid.spi.*; -import org.apache.ignite.spi.communication.tcp.*; -import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.direct.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; @@ -779,7 +778,7 @@ public abstract class GridClientAbstractMultiNodeSelfTest extends GridCommonAbst if (!(o instanceof GridDistributedLockRequest)) return; - GridKernal g = (GridKernal)G.grid(nodeId); + GridKernal g = (GridKernal)G.ignite(nodeId); GridCacheContext<Object, Object> cacheCtx = g.internalCache(REPLICATED_ASYNC_CACHE_NAME).context(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/984373dc/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java index 09c2fb6..dc2af51 100644 --- a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java +++ b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java @@ -127,7 +127,7 @@ public class GridRestProcessorTest extends GridCommonAbstractTest { * @throws GridException If failed. */ private void populateCache() throws GridException { - GridCache<String, Object> cache = G.grid().cache(null); + GridCache<String, Object> cache = G.ignite().cache(null); cache.put("int", intValue()); cache.put("string", "cacheString"); @@ -147,8 +147,8 @@ public class GridRestProcessorTest extends GridCommonAbstractTest { * @throws GridException If failed. */ private void deployTasks() throws GridException { - G.grid().compute().localDeployTask(TestTask1.class, TestTask1.class.getClassLoader()); - G.grid().compute().localDeployTask(TestTask2.class, TestTask2.class.getClassLoader()); + G.ignite().compute().localDeployTask(TestTask1.class, TestTask1.class.getClassLoader()); + G.ignite().compute().localDeployTask(TestTask2.class, TestTask2.class.getClassLoader()); } /**
