Repository: incubator-ignite Updated Branches: refs/heads/ignite-72 a423ffd0f -> eb15b4431
Ignite-72 Java web classes fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb15b443 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb15b443 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb15b443 Branch: refs/heads/ignite-72 Commit: eb15b44317d8a6d0d21c402756ac354bb39db5ce Parents: a423ffd Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Jan 28 11:49:41 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Jan 28 11:49:41 2015 +0300 ---------------------------------------------------------------------- .../startup/servlet/GridServletContextListenerStartup.java | 4 ++-- .../org/apache/ignite/startup/servlet/GridServletStartup.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb15b443/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..1434a32 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 = IgniteEx.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 = IgniteEx.start(new IgniteConfiguration(cfg), rsrcCtx); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb15b443/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..e7b41d5 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); + IgniteEx.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 = IgniteEx.start(adapter, t.get2()); // Test if grid is not null - started properly. if (ignite != null)
