You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/02/02 15:57:30 UTC
incubator-ignite git commit: #IGNITE-106: Revert some renaming.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-106 bdfcc129d -> 48a7281e7
#IGNITE-106: Revert some renaming.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/48a7281e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/48a7281e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/48a7281e
Branch: refs/heads/ignite-106
Commit: 48a7281e77abb11995642524fd9bde378d005542
Parents: bdfcc12
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Feb 2 17:57:23 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Feb 2 17:57:23 2015 +0300
----------------------------------------------------------------------
.../misc/lifecycle/LifecycleExample.java | 4 +--
.../apache/ignite/internal/IgniteKernal.java | 4 +--
.../apache/ignite/lifecycle/LifecycleBean.java | 4 +--
.../ignite/lifecycle/LifecycleEventType.java | 4 +--
.../internal/GridLifecycleBeanSelfTest.java | 38 ++++++++++----------
.../dht/GridCacheDhtPreloadBigDataSelfTest.java | 2 +-
.../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +-
...achePartitionedPreloadLifecycleSelfTest.java | 4 +--
...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +--
.../colocation/GridTestLifecycleBean.java | 2 +-
.../loadtests/dsi/GridDsiLifecycleBean.java | 4 +--
.../ignite/internal/GridFactorySelfTest.java | 6 ++--
12 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
index 180e5ef..a25937f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/lifecycle/LifecycleExample.java
@@ -76,9 +76,9 @@ public final class LifecycleExample {
System.out.println(">>> Grid lifecycle event occurred: " + evt);
System.out.println(">>> Grid name: " + ignite.name());
- if (evt == AFTER_IGNITE_START)
+ if (evt == AFTER_GRID_START)
isStarted = true;
- else if (evt == AFTER_IGNITE_STOP)
+ else if (evt == AFTER_GRID_STOP)
isStarted = false;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 0cfb80c..dc9d81d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -816,7 +816,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
registerExecutorMBeans();
// Lifecycle bean notifications.
- notifyLifecycleBeans(AFTER_IGNITE_START);
+ notifyLifecycleBeans(AFTER_GRID_START);
}
catch (Throwable e) {
IgniteSpiVersionCheckException verCheckErr = X.cause(e, IgniteSpiVersionCheckException.class);
@@ -1989,7 +1989,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit
U.stopLifecycleAware(log, lifecycleAwares(cfg));
// Lifecycle notification.
- notifyLifecycleBeansEx(LifecycleEventType.AFTER_IGNITE_STOP);
+ notifyLifecycleBeansEx(LifecycleEventType.AFTER_GRID_STOP);
// Clean internal class/classloader caches to avoid stopped contexts held in memory.
IgniteOptimizedMarshaller.clearCache();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
index f413e90..0095661 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleBean.java
@@ -33,7 +33,7 @@ import org.apache.ignite.*;
* annotation, you cannot use it yet.
* </li>
* <li>
- * {@link LifecycleEventType#AFTER_IGNITE_START} invoked right after grid
+ * {@link LifecycleEventType#AFTER_GRID_START} invoked right after grid
* has started. At this point, if you injected a grid instance via
* {@link org.apache.ignite.resources.IgniteInstanceResource} annotation, you can start using it. Note that
* you should not be using {@link org.apache.ignite.Ignition} to get grid instance from
@@ -46,7 +46,7 @@ import org.apache.ignite.*;
* you can use it.
* </li>
* <li>
- * {@link LifecycleEventType#AFTER_IGNITE_STOP} invoked right after grid
+ * {@link LifecycleEventType#AFTER_GRID_STOP} invoked right after grid
* has stopped. Note that grid is not available during this event.
* </li>
* </ul>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
index 3b9eeb3..d7b7478 100644
--- a/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
+++ b/modules/core/src/main/java/org/apache/ignite/lifecycle/LifecycleEventType.java
@@ -37,7 +37,7 @@ public enum LifecycleEventType {
* Invoked after grid startup is complete. Grid is fully
* initialized and fully functional.
*/
- AFTER_IGNITE_START,
+ AFTER_GRID_START,
/**
* Invoked before grid stopping routine. Grid is fully functional
@@ -49,7 +49,7 @@ public enum LifecycleEventType {
* Invoked after grid had stopped. Grid is stopped and
* cannot be used.
*/
- AFTER_IGNITE_STOP;
+ AFTER_GRID_STOP;
/** Enumerated values. */
private static final LifecycleEventType[] VALS = values();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
index a603e8a..b177610 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
@@ -58,9 +58,9 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
assertEquals(IgniteState.STARTED, G.state(getTestGridName()));
assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_IGNITE_START));
+ assertEquals(1, bean.count(AFTER_GRID_START));
assertEquals(0, bean.count(BEFORE_GRID_STOP));
- assertEquals(0, bean.count(AFTER_IGNITE_STOP));
+ assertEquals(0, bean.count(AFTER_GRID_STOP));
}
finally {
stopAllGrids();
@@ -70,9 +70,9 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
assertEquals(IgniteState.STOPPED, G.state(getTestGridName()));
assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_IGNITE_START));
+ assertEquals(1, bean.count(AFTER_GRID_START));
assertEquals(1, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_IGNITE_STOP));
+ assertEquals(1, bean.count(AFTER_GRID_STOP));
}
/**
@@ -125,9 +125,9 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
}
assertEquals(0, bean.count(BEFORE_GRID_START));
- assertEquals(0, bean.count(AFTER_IGNITE_START));
+ assertEquals(0, bean.count(AFTER_GRID_START));
assertEquals(0, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_IGNITE_STOP));
+ assertEquals(1, bean.count(AFTER_GRID_STOP));
}
/**
@@ -135,7 +135,7 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
private void checkAfterStart(boolean gridErr) throws Exception {
- bean = new LifeCycleExceptionBean(AFTER_IGNITE_START, gridErr);
+ bean = new LifeCycleExceptionBean(AFTER_GRID_START, gridErr);
try {
startGrid();
@@ -152,9 +152,9 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
}
assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(0, bean.count(AFTER_IGNITE_START));
+ assertEquals(0, bean.count(AFTER_GRID_START));
assertEquals(1, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_IGNITE_STOP));
+ assertEquals(1, bean.count(AFTER_GRID_STOP));
}
/**
@@ -164,9 +164,9 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
checkOnStop(BEFORE_GRID_STOP, true);
assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_IGNITE_START));
+ assertEquals(1, bean.count(AFTER_GRID_START));
assertEquals(0, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_IGNITE_STOP));
+ assertEquals(1, bean.count(AFTER_GRID_STOP));
}
/**
@@ -176,33 +176,33 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
checkOnStop(BEFORE_GRID_STOP, false);
assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_IGNITE_START));
+ assertEquals(1, bean.count(AFTER_GRID_START));
assertEquals(0, bean.count(BEFORE_GRID_STOP));
- assertEquals(1, bean.count(AFTER_IGNITE_STOP));
+ assertEquals(1, bean.count(AFTER_GRID_STOP));
}
/**
* @throws Exception If failed.
*/
public void testGridErrorAfterStop() throws Exception {
- checkOnStop(AFTER_IGNITE_STOP, true);
+ checkOnStop(AFTER_GRID_STOP, true);
assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_IGNITE_START));
+ assertEquals(1, bean.count(AFTER_GRID_START));
assertEquals(1, bean.count(BEFORE_GRID_STOP));
- assertEquals(0, bean.count(AFTER_IGNITE_STOP));
+ assertEquals(0, bean.count(AFTER_GRID_STOP));
}
/**
* @throws Exception If failed.
*/
public void testOtherErrorAfterStop() throws Exception {
- checkOnStop(AFTER_IGNITE_STOP, false);
+ checkOnStop(AFTER_GRID_STOP, false);
assertEquals(1, bean.count(BEFORE_GRID_START));
- assertEquals(1, bean.count(AFTER_IGNITE_START));
+ assertEquals(1, bean.count(AFTER_GRID_START));
assertEquals(1, bean.count(BEFORE_GRID_STOP));
- assertEquals(0, bean.count(AFTER_IGNITE_STOP));
+ assertEquals(0, bean.count(AFTER_GRID_STOP));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
index a301bda..9295a05 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadBigDataSelfTest.java
@@ -166,7 +166,7 @@ public class GridCacheDhtPreloadBigDataSelfTest extends GridCommonAbstractTest {
private Ignite ignite;
@Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
- if (evt == LifecycleEventType.AFTER_IGNITE_START) {
+ if (evt == LifecycleEventType.AFTER_GRID_START) {
GridCache<Integer, byte[]> c = ignite.cache(null);
if (c.putxIfAbsent(-1, new byte[1])) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
index bd77208..b8818b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadUnloadSelfTest.java
@@ -264,7 +264,7 @@ public class GridCacheDhtPreloadUnloadSelfTest extends GridCommonAbstractTest {
private Ignite ignite;
@Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
- if (evt == LifecycleEventType.AFTER_IGNITE_START) {
+ if (evt == LifecycleEventType.AFTER_GRID_START) {
GridCache<Integer, String> c = ignite.cache(null);
if (c.putxIfAbsent(-1, "true")) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
index 4fcc417..7f68b6d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
@@ -83,7 +83,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
@Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
switch (evt) {
- case AFTER_IGNITE_START: {
+ case AFTER_GRID_START: {
GridCache<Object, MyValue> c1 = ignite.cache("one");
GridCache<Object, MyValue> c2 = ignite.cache("two");
@@ -120,7 +120,7 @@ public class GridCachePartitionedPreloadLifecycleSelfTest extends GridCachePrelo
case BEFORE_GRID_START:
case BEFORE_GRID_STOP:
- case AFTER_IGNITE_STOP: {
+ case AFTER_GRID_STOP: {
info("Lifecycle event: " + evt);
break;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index 5ba5c97..266ba56 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@ -84,7 +84,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
@Override public void onLifecycleEvent(LifecycleEventType evt) throws IgniteCheckedException {
switch (evt) {
- case AFTER_IGNITE_START: {
+ case AFTER_GRID_START: {
GridCache<Object, MyValue> c1 = ignite.cache("one");
GridCache<Object, MyValue> c2 = ignite.cache("two");
@@ -123,7 +123,7 @@ public class GridCacheReplicatedPreloadLifecycleSelfTest extends GridCachePreloa
case BEFORE_GRID_START:
case BEFORE_GRID_STOP:
- case AFTER_IGNITE_STOP: {
+ case AFTER_GRID_STOP: {
info("Lifecycle event: " + evt);
break;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
index 5eaa36c..bd011f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/GridTestLifecycleBean.java
@@ -30,7 +30,7 @@ public class GridTestLifecycleBean implements LifecycleBean {
private Ignite g;
@Override public void onLifecycleEvent(LifecycleEventType type) throws IgniteCheckedException {
- if (type == LifecycleEventType.AFTER_IGNITE_START) {
+ if (type == LifecycleEventType.AFTER_GRID_START) {
GridCache<GridTestKey, Long> cache = g.cache("partitioned");
assert cache != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
index 8645a14..b12c94d 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiLifecycleBean.java
@@ -45,14 +45,14 @@ public class GridDsiLifecycleBean implements LifecycleBean {
case BEFORE_GRID_START:
break;
- case AFTER_IGNITE_START:
+ case AFTER_GRID_START:
ignite.cache("PARTITIONED_CACHE").dataStructures().atomicSequence("ID", 0, true);
break;
case BEFORE_GRID_STOP:
break;
- case AFTER_IGNITE_STOP:
+ case AFTER_GRID_STOP:
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48a7281e/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index ae724e1..fafb78f 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -178,9 +178,9 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
List<String> gridNames = bean.getGridNames();
assert evts.get(0) == LifecycleEventType.BEFORE_GRID_START : "Invalid lifecycle event: " + evts.get(0);
- assert evts.get(1) == LifecycleEventType.AFTER_IGNITE_START : "Invalid lifecycle event: " + evts.get(1);
+ assert evts.get(1) == LifecycleEventType.AFTER_GRID_START : "Invalid lifecycle event: " + evts.get(1);
assert evts.get(2) == LifecycleEventType.BEFORE_GRID_STOP : "Invalid lifecycle event: " + evts.get(2);
- assert evts.get(3) == LifecycleEventType.AFTER_IGNITE_STOP : "Invalid lifecycle event: " + evts.get(3);
+ assert evts.get(3) == LifecycleEventType.AFTER_GRID_STOP : "Invalid lifecycle event: " + evts.get(3);
checkGridNameEquals(gridNames.get(0), gridName);
checkGridNameEquals(gridNames.get(1), gridName);
@@ -645,7 +645,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
try {
checkState(ignite.name(),
- evt == LifecycleEventType.AFTER_IGNITE_START || evt == LifecycleEventType.BEFORE_GRID_STOP);
+ evt == LifecycleEventType.AFTER_GRID_START || evt == LifecycleEventType.BEFORE_GRID_STOP);
}
catch (Throwable e) {
log.error("Lifecycle bean failed state check: " + this, e);