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:22 UTC
[46/50] [abbrv] incubator-ignite git commit: GridNamedInstance ->
IgniteNamedInstance GridgainEx -> IgnitionEx
GridNamedInstance -> IgniteNamedInstance
GridgainEx -> IgnitionEx
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c5247ab3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c5247ab3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c5247ab3
Branch: refs/heads/ignite-16
Commit: c5247ab37b5233520bb610570d9a1dd2b793d0bb
Parents: c323a8e
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jan 29 12:44:57 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jan 29 12:44:57 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/Ignition.java | 38 +-
.../apache/ignite/cache/CachingProvider.java | 2 +-
.../ignite/internal/ClusterGroupAdapter.java | 2 +-
.../internal/ClusterNodeLocalMapImpl.java | 2 +-
.../org/apache/ignite/internal/GridGainEx.java | 2399 ------------------
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../apache/ignite/internal/GridLoggerProxy.java | 2 +-
.../org/apache/ignite/internal/IgnitionEx.java | 2399 ++++++++++++++++++
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheContext.java | 2 +-
.../resource/GridSpringResourceContext.java | 2 +-
.../fs/GridGgfsEventsAbstractSelfTest.java | 2 +-
.../cache/GridCachePutRemoveLoadTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 2 +-
.../java/org/apache/ignite/IgniteSpring.java | 8 +-
.../GridServletContextListenerStartup.java | 4 +-
.../startup/servlet/GridServletStartup.java | 4 +-
17 files changed, 2437 insertions(+), 2437 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/Ignition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/Ignition.java b/modules/core/src/main/java/org/apache/ignite/Ignition.java
index 568b520..a8c3619 100644
--- a/modules/core/src/main/java/org/apache/ignite/Ignition.java
+++ b/modules/core/src/main/java/org/apache/ignite/Ignition.java
@@ -120,7 +120,7 @@ public class Ignition {
* @param daemon Daemon flag to set.
*/
public static void setDaemon(boolean daemon) {
- GridGainEx.setDaemon(daemon);
+ IgnitionEx.setDaemon(daemon);
}
/**
@@ -134,7 +134,7 @@ public class Ignition {
* @return Daemon flag.
*/
public static boolean isDaemon() {
- return GridGainEx.isDaemon();
+ return IgnitionEx.isDaemon();
}
/**
@@ -143,7 +143,7 @@ public class Ignition {
* @return Default grid state.
*/
public static IgniteState state() {
- return GridGainEx.state();
+ return IgnitionEx.state();
}
/**
@@ -155,7 +155,7 @@ public class Ignition {
* @return Grid state.
*/
public static IgniteState state(@Nullable String name) {
- return GridGainEx.state(name);
+ return IgnitionEx.state(name);
}
/**
@@ -170,7 +170,7 @@ public class Ignition {
* {@code false} otherwise (if it was not started).
*/
public static boolean stop(boolean cancel) {
- return GridGainEx.stop(cancel);
+ return IgnitionEx.stop(cancel);
}
/**
@@ -193,7 +193,7 @@ public class Ignition {
* not found).
*/
public static boolean stop(@Nullable String name, boolean cancel) {
- return GridGainEx.stop(name, cancel);
+ return IgnitionEx.stop(name, cancel);
}
/**
@@ -212,7 +212,7 @@ public class Ignition {
* up to the actual job to exit from execution
*/
public static void stopAll(boolean cancel) {
- GridGainEx.stopAll(cancel);
+ IgnitionEx.stopAll(cancel);
}
/**
@@ -236,7 +236,7 @@ public class Ignition {
* @see #RESTART_EXIT_CODE
*/
public static void restart(boolean cancel) {
- GridGainEx.restart(cancel);
+ IgnitionEx.restart(cancel);
}
/**
@@ -259,7 +259,7 @@ public class Ignition {
* @see #KILL_EXIT_CODE
*/
public static void kill(boolean cancel) {
- GridGainEx.kill(cancel);
+ IgnitionEx.kill(cancel);
}
/**
@@ -272,7 +272,7 @@ public class Ignition {
* also if default grid has already been started.
*/
public static Ignite start() throws IgniteCheckedException {
- return GridGainEx.start();
+ return IgnitionEx.start();
}
/**
@@ -285,7 +285,7 @@ public class Ignition {
* also if named grid has already been started.
*/
public static Ignite start(IgniteConfiguration cfg) throws IgniteCheckedException {
- return GridGainEx.start(cfg);
+ return IgnitionEx.start(cfg);
}
/**
@@ -305,7 +305,7 @@ public class Ignition {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(@Nullable String springCfgPath) throws IgniteCheckedException {
- return GridGainEx.start(springCfgPath);
+ return IgnitionEx.start(springCfgPath);
}
/**
@@ -325,7 +325,7 @@ public class Ignition {
* been started or Spring XML configuration file is invalid.
*/
public static Ignite start(URL springCfgUrl) throws IgniteCheckedException {
- return GridGainEx.start(springCfgUrl);
+ return IgnitionEx.start(springCfgUrl);
}
/**
@@ -341,7 +341,7 @@ public class Ignition {
* initialized or grid instance was stopped or was not started.
*/
public static Ignite ignite() throws IgniteIllegalStateException {
- return GridGainEx.grid();
+ return IgnitionEx.grid();
}
/**
@@ -350,7 +350,7 @@ public class Ignition {
* @return List of all grids started so far.
*/
public static List<Ignite> allGrids() {
- return GridGainEx.allGrids();
+ return IgnitionEx.allGrids();
}
/**
@@ -366,7 +366,7 @@ public class Ignition {
* initialized or grid instance was stopped or was not started.
*/
public static Ignite ignite(UUID locNodeId) throws IgniteIllegalStateException {
- return GridGainEx.grid(locNodeId);
+ return IgnitionEx.grid(locNodeId);
}
/**
@@ -386,7 +386,7 @@ public class Ignition {
* initialized or grid instance was stopped or was not started.
*/
public static Ignite ignite(@Nullable String name) throws IgniteIllegalStateException {
- return GridGainEx.grid(name);
+ return IgnitionEx.grid(name);
}
/**
@@ -402,7 +402,7 @@ public class Ignition {
* this method is no-op.
*/
public static void addListener(IgniteListener lsnr) {
- GridGainEx.addListener(lsnr);
+ IgnitionEx.addListener(lsnr);
}
/**
@@ -412,6 +412,6 @@ public class Ignition {
* @return {@code true} if lsnr was added before, {@code false} otherwise.
*/
public static boolean removeListener(IgniteListener lsnr) {
- return GridGainEx.removeListener(lsnr);
+ return IgnitionEx.removeListener(lsnr);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
index 1b6c945..c594594 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
@@ -40,7 +40,7 @@ public class CachingProvider implements javax.cache.spi.CachingProvider {
URI uri = null;
try {
- URL dfltCfgURL = U.resolveGridGainUrl(GridGainEx.DFLT_CFG);
+ URL dfltCfgURL = U.resolveGridGainUrl(IgnitionEx.DFLT_CFG);
if (dfltCfgURL != null)
uri = dfltCfgURL.toURI();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
index b3f8cc0..820735e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
@@ -638,7 +638,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
*/
protected Object readResolve() throws ObjectStreamException {
try {
- IgniteKernal g = GridGainEx.gridx(gridName);
+ IgniteKernal g = IgnitionEx.gridx(gridName);
return ids != null ? new ClusterGroupAdapter(g, g.context(), subjId, ids) :
p != null ? new ClusterGroupAdapter(g, g.context(), subjId, p) : g;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c5247ab3/modules/core/src/main/java/org/apache/ignite/internal/ClusterNodeLocalMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterNodeLocalMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterNodeLocalMapImpl.java
index 5487f0a..c5378a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterNodeLocalMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterNodeLocalMapImpl.java
@@ -85,7 +85,7 @@ public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K, V> impl
*/
protected Object readResolve() throws ObjectStreamException {
try {
- return GridGainEx.gridx(stash.get()).nodeLocalMap();
+ return IgnitionEx.gridx(stash.get()).nodeLocalMap();
}
catch (IllegalStateException e) {
throw U.withCause(new InvalidObjectException(e.getMessage()), e);