http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 35b34f0..0e60832 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4430,7 +4430,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, try { IgniteBiTuple<String, String> t = stash.get(); - return GridGainEx.gridx(t.get1()).cachex(t.get2()); + return IgnitionEx.gridx(t.get1()).cachex(t.get2()); } catch (IllegalStateException e) { throw U.withCause(new InvalidObjectException(e.getMessage()), e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 0f5b06d..1f624f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -1888,7 +1888,7 @@ public class GridCacheContext<K, V> implements Externalizable { try { IgniteBiTuple<String, String> t = stash.get(); - IgniteKernal grid = GridGainEx.gridx(t.get1()); + IgniteKernal grid = IgnitionEx.gridx(t.get1()); GridCacheAdapter<K, V> cache = grid.internalCache(t.get2()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java index f5db642..369837e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridSpringResourceContext.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.*; /** * Interface was introduced to avoid compile-time dependency on spring framework. Spring resource context * provides optional spring resource injectors, it can be passed to factory method - * starting GridGain {@link GridGainEx#start(GridSpringResourceContext)}. + * starting GridGain {@link IgnitionEx#start(GridSpringResourceContext)}. */ public interface GridSpringResourceContext { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java index a72b151..c96ad41 100644 --- a/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/fs/GridGgfsEventsAbstractSelfTest.java @@ -111,7 +111,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT * @throws Exception If failed. */ protected IgniteConfiguration getConfiguration(String gridName, IgniteFsConfiguration ggfsCfg) throws Exception { - IgniteConfiguration cfg = GridGainEx.loadConfiguration("config/hadoop/default-config.xml").get1(); + IgniteConfiguration cfg = IgnitionEx.loadConfiguration("config/hadoop/default-config.xml").get1(); assert cfg != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java index e11963d..6eca2c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCachePutRemoveLoadTest.java @@ -96,7 +96,7 @@ public class GridCachePutRemoveLoadTest { protected void startNodes() throws Exception { for (int i = 0; i < args.nodes(); i++) { IgniteConfiguration cfg = - GridGainEx.loadConfiguration("modules/core/src/test/config/spring-cache-put-remove-load.xml").get1(); + IgnitionEx.loadConfiguration("modules/core/src/test/config/spring-cache-put-remove-load.xml").get1(); assert cfg != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index fca61d1..84883f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -653,7 +653,7 @@ public abstract class GridAbstractTest extends TestCase { * @throws Exception If failed. */ protected Ignite startGrid(String gridName, GridSpringResourceContext ctx) throws Exception { - return GridGainEx.start(optimize(getConfiguration(gridName)), ctx); + return IgnitionEx.start(optimize(getConfiguration(gridName)), ctx); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java ---------------------------------------------------------------------- diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java index 74f9e1b..cbc54dc 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpring.java @@ -48,7 +48,7 @@ public class IgniteSpring { * also if default grid has already been started. */ public static Ignite start(@Nullable ApplicationContext springCtx) throws IgniteCheckedException { - return GridGainEx.start(new GridSpringResourceContextImpl(springCtx)); + return IgnitionEx.start(new GridSpringResourceContextImpl(springCtx)); } /** @@ -64,7 +64,7 @@ public class IgniteSpring { * also if named grid has already been started. */ public static Ignite start(IgniteConfiguration cfg, @Nullable ApplicationContext springCtx) throws IgniteCheckedException { - return GridGainEx.start(cfg, new GridSpringResourceContextImpl(springCtx)); + return IgnitionEx.start(cfg, new GridSpringResourceContextImpl(springCtx)); } /** @@ -88,7 +88,7 @@ public class IgniteSpring { * been started or Spring XML configuration file is invalid. */ public static Ignite start(String springCfgPath, @Nullable ApplicationContext springCtx) throws IgniteCheckedException { - return GridGainEx.start(springCfgPath, null, new GridSpringResourceContextImpl(springCtx)); + return IgnitionEx.start(springCfgPath, null, new GridSpringResourceContextImpl(springCtx)); } /** @@ -112,6 +112,6 @@ public class IgniteSpring { * been started or Spring XML configuration file is invalid. */ public static Ignite start(URL springCfgUrl, @Nullable ApplicationContext springCtx) throws IgniteCheckedException { - return GridGainEx.start(springCfgUrl, null, new GridSpringResourceContextImpl(springCtx)); + return IgnitionEx.start(springCfgUrl, null, new GridSpringResourceContextImpl(springCtx)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java index 928958d..4759907 100644 --- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java +++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletContextListenerStartup.java @@ -121,7 +121,7 @@ public class GridServletContextListenerStartup implements ServletContextListener IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext> t; try { - t = GridGainEx.loadConfigurations(cfgUrl); + t = IgnitionEx.loadConfigurations(cfgUrl); } catch (IgniteCheckedException e) { throw new IgniteException("Failed to load GridGain configuration.", e); @@ -149,7 +149,7 @@ public class GridServletContextListenerStartup implements ServletContextListener ignite = G.ignite(cfg.getGridName()); } catch (IgniteIllegalStateException ignored) { - ignite = GridGainEx.start(new IgniteConfiguration(cfg), rsrcCtx); + ignite = IgnitionEx.start(new IgniteConfiguration(cfg), rsrcCtx); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java index 8e806d3..0cc5701 100644 --- a/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java +++ b/modules/web/src/main/java/org/apache/ignite/startup/servlet/GridServletStartup.java @@ -141,7 +141,7 @@ public class GridServletStartup extends HttpServlet { try { IgniteBiTuple<Collection<IgniteConfiguration>, ? extends GridSpringResourceContext> t = - GridGainEx.loadConfigurations(cfgUrl); + IgnitionEx.loadConfigurations(cfgUrl); Collection<IgniteConfiguration> cfgs = t.get1(); @@ -153,7 +153,7 @@ public class GridServletStartup extends HttpServlet { IgniteConfiguration adapter = new IgniteConfiguration(cfg); - Ignite ignite = GridGainEx.start(adapter, t.get2()); + Ignite ignite = IgnitionEx.start(adapter, t.get2()); // Test if grid is not null - started properly. if (ignite != null)
