ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsetrak...@apache.org
Subject [28/61] [abbrv] incubator-ignite git commit: sprint-1 - Renamed events.
Date Fri, 06 Feb 2015 04:25:41 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java
index d7682df..81641e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java
@@ -28,7 +28,7 @@ import org.apache.ignite.testframework.junits.common.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Test for {@link TcpDiscoverySpi}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java
index 8b6f59a..d0b2e7c 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java
@@ -42,7 +42,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.spi.IgnitePortProtocol.*;
 
 /**
@@ -281,14 +281,14 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
         final CountDownLatch cnt = new CountDownLatch(1);
 
         pingingNode.events().localListen(
-            new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     cnt.countDown();
 
                     return true;
                 }
             },
-            IgniteEventType.EVT_NODE_FAILED
+            EventType.EVT_NODE_FAILED
         );
 
         info("Nodes were started");
@@ -315,11 +315,11 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
             final CountDownLatch cnt = new CountDownLatch(2);
 
             g1.events().localListen(
-                new IgnitePredicate<IgniteEvent>() {
-                    @Override public boolean apply(IgniteEvent evt) {
+                new IgnitePredicate<Event>() {
+                    @Override public boolean apply(Event evt) {
                         info("Node joined: " + evt.message());
 
-                        IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt;
+                        DiscoveryEvent discoEvt = (DiscoveryEvent)evt;
 
                         TcpDiscoveryNode node = ((TcpDiscoveryNode)discoMap.get(g1.name()).
                             getNode(discoEvt.eventNode().id()));
@@ -331,7 +331,7 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
                         return true;
                     }
                 },
-                IgniteEventType.EVT_NODE_JOINED
+                EventType.EVT_NODE_JOINED
             );
 
             startGrid(2);
@@ -358,8 +358,8 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
             final CountDownLatch cnt = new CountDownLatch(2);
 
             g1.events().localListen(
-                new IgnitePredicate<IgniteEvent>() {
-                    @Override public boolean apply(IgniteEvent evt) {
+                new IgnitePredicate<Event>() {
+                    @Override public boolean apply(Event evt) {
                         cnt.countDown();
 
                         return true;
@@ -392,8 +392,8 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
 
             final CountDownLatch cnt = new CountDownLatch(1);
 
-            g2.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            g2.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     cnt.countDown();
 
                     return true;
@@ -409,8 +409,8 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
             // Start new grid, ensure that added to topology
             final CountDownLatch cnt2 = new CountDownLatch(1);
 
-            g2.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            g2.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     cnt2.countDown();
 
                     return true;
@@ -438,14 +438,14 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
             final CountDownLatch cnt = new CountDownLatch(2);
 
             g1.events().localListen(
-                new IgnitePredicate<IgniteEvent>() {
-                    @Override public boolean apply(IgniteEvent evt) {
+                new IgnitePredicate<Event>() {
+                    @Override public boolean apply(Event evt) {
                         cnt.countDown();
 
                         return true;
                     }
                 },
-                IgniteEventType.EVT_NODE_FAILED
+                EventType.EVT_NODE_FAILED
             );
 
             info("Nodes were started");
@@ -470,13 +470,13 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
 
             final CountDownLatch cnt = new CountDownLatch(1);
 
-            g2.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            g2.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     cnt.countDown();
 
                     return true;
                 }
-            }, IgniteEventType.EVT_NODE_FAILED);
+            }, EventType.EVT_NODE_FAILED);
 
             info("Nodes were started");
 
@@ -500,8 +500,8 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
 
             final Ignite g1 = startGrid(1);
 
-            IgnitePredicate<IgniteEvent> lsnr1 = new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            IgnitePredicate<Event> lsnr1 = new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     info(evt.message());
 
                     latch1.countDown();
@@ -524,14 +524,14 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
             final Ignite g2 = startGrid(2);
 
             g2.events().localListen(
-                new IgnitePredicate<IgniteEvent>() {
-                    @Override public boolean apply(IgniteEvent evt) {
+                new IgnitePredicate<Event>() {
+                    @Override public boolean apply(Event evt) {
                         if (stopping.get())
                             return true;
 
                         info(evt.message());
 
-                        UUID id = ((IgniteDiscoveryEvent) evt).eventNode().id();
+                        UUID id = ((DiscoveryEvent) evt).eventNode().id();
 
                         if (id.equals(g1.cluster().localNode().id()))
                             latch2_1.countDown();
@@ -546,14 +546,14 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
                 EVT_NODE_METRICS_UPDATED
             );
 
-            g1.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            g1.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     if (stopping.get())
                         return true;
 
                     info(evt.message());
 
-                    UUID id = ((IgniteDiscoveryEvent) evt).eventNode().id();
+                    UUID id = ((DiscoveryEvent) evt).eventNode().id();
 
                     if (id.equals(g1.cluster().localNode().id()))
                         latch1_1.countDown();
@@ -588,8 +588,8 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
             final CountDownLatch joinCnt = new CountDownLatch(2);
             final CountDownLatch failCnt = new CountDownLatch(1);
 
-            g1.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            g1.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     if (evt.type() == EVT_NODE_JOINED)
                         joinCnt.countDown();
                     else if (evt.type() == EVT_NODE_FAILED)
@@ -627,8 +627,8 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
 
             final CountDownLatch cnt = new CountDownLatch(1);
 
-            g3.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            g3.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     cnt.countDown();
 
                     return true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java
index 7f11b9d..cdbdd70 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageMultiThreadedSelfTest.java
@@ -37,13 +37,13 @@ public class GridMemoryEventStorageMultiThreadedSelfTest extends GridSpiAbstract
         GridTestUtils.runMultiThreaded(new Callable<Object>() {
             @Override public Object call() throws Exception {
                 for (int i = 0; i < 100000; i++)
-                    getSpi().record(new IgniteDiscoveryEvent(null, "Test event", 1, null));
+                    getSpi().record(new DiscoveryEvent(null, "Test event", 1, null));
 
                 return null;
             }
         }, 10, "event-thread");
 
-        Collection<IgniteEvent> evts = getSpi().localEvents(F.<IgniteEvent>alwaysTrue());
+        Collection<Event> evts = getSpi().localEvents(F.<Event>alwaysTrue());
 
         info("Events count in memory: " + evts.size());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java
index 3f0ab88..f9da617 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/eventstorage/memory/GridMemoryEventStorageSpiSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.testframework.junits.spi.*;
 
 import java.util.*;
 
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Tests for {@link MemoryEventStorageSpi}.
@@ -56,10 +56,10 @@ public class GridMemoryEventStorageSpiSelfTest extends GridSpiAbstractTest<Memor
     public void testMemoryEventStorage() throws Exception {
         MemoryEventStorageSpi spi = getSpi();
 
-        IgnitePredicate<IgniteEvent> filter = F.alwaysTrue();
+        IgnitePredicate<Event> filter = F.alwaysTrue();
 
         // Get all events.
-        Collection<IgniteEvent> evts = spi.localEvents(filter);
+        Collection<Event> evts = spi.localEvents(filter);
 
         // Check.
         assert evts != null : "Events can't be null.";
@@ -106,7 +106,7 @@ public class GridMemoryEventStorageSpiSelfTest extends GridSpiAbstractTest<Memor
         try {
             spi.clearAll();
 
-            spi.setFilter(F.<IgniteEvent>alwaysFalse());
+            spi.setFilter(F.<Event>alwaysFalse());
 
             // This event should not record.
             spi.record(createEvent());
@@ -116,7 +116,7 @@ public class GridMemoryEventStorageSpiSelfTest extends GridSpiAbstractTest<Memor
             spi.record(createEvent());
 
             // Get all events.
-            Collection<IgniteEvent> evts = spi.localEvents(F.<IgniteEvent>alwaysTrue());
+            Collection<Event> evts = spi.localEvents(F.<Event>alwaysTrue());
 
             assert evts != null : "Events can't be null.";
             assert evts.size() == 1 : "Invalid events count: " + evts.size();
@@ -131,8 +131,8 @@ public class GridMemoryEventStorageSpiSelfTest extends GridSpiAbstractTest<Memor
      * @return Discovery event.
      * @throws Exception If error occurred.
      */
-    private IgniteEvent createEvent() throws Exception {
-        return new IgniteDiscoveryEvent(null, "Test Event", EVT_NODE_METRICS_UPDATED, null);
+    private Event createEvent() throws Exception {
+        return new DiscoveryEvent(null, "Test Event", EVT_NODE_METRICS_UPDATED, null);
     }
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiMultipleNodesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiMultipleNodesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiMultipleNodesSelfTest.java
index 5a8bbe9..2b5bee5 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiMultipleNodesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiMultipleNodesSelfTest.java
@@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.spi.*;
 
 import java.util.*;
 
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Tests round robin load balancing SPI.
@@ -126,9 +126,9 @@ public class GridRoundRobinLoadBalancingSpiMultipleNodesSelfTest
             assert orderedNodes1.get(i) == orderedNodes2.get(i);
         }
 
-        getSpiContext().triggerEvent(new IgniteTaskEvent(
+        getSpiContext().triggerEvent(new TaskEvent(
             null, null, EVT_TASK_FINISHED, ses1.getId(), null, null, false, null));
-        getSpiContext().triggerEvent(new IgniteTaskEvent(
+        getSpiContext().triggerEvent(new TaskEvent(
             null, null, EVT_TASK_FAILED, ses2.getId(), null, null, false, null));
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
index 1dda864..72c1014 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/loadbalancing/roundrobin/GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest.java
@@ -27,7 +27,7 @@ import org.apache.ignite.testframework.junits.spi.*;
 
 import java.util.*;
 
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.spi.loadbalancing.roundrobin.GridRoundRobinTestUtils.*;
 
 /**
@@ -89,9 +89,9 @@ public class GridRoundRobinLoadBalancingSpiNotPerTaskSelfTest
 
         checkCyclicBalancing(getSpi(), allNodes, orderedNodes, ses1, ses2);
 
-        getSpiContext().triggerEvent(new IgniteTaskEvent(
+        getSpiContext().triggerEvent(new TaskEvent(
             null, null, EVT_TASK_FINISHED, ses1.getId(), null, null, false, null));
-        getSpiContext().triggerEvent(new IgniteTaskEvent(
+        getSpiContext().triggerEvent(new TaskEvent(
             null, null, EVT_TASK_FAILED, ses2.getId(), null, null, false, null));
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
index 89d4b63..cd1537e 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/GridSwapSpaceSpiAbstractSelfTest.java
@@ -29,7 +29,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
index 5545848..4edb607 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/inmemory/GridTestSwapSpaceSpi.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Test swap space SPI that stores values in map.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
index 69cd4e0..d8a3435 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java
@@ -36,7 +36,7 @@ import java.nio.*;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Test SPI context.
@@ -167,7 +167,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
                 if (!nodes.contains(node)) {
                     iter.remove();
 
-                    notifyListener(new IgniteDiscoveryEvent(locNode, "Node left", EVT_NODE_LEFT, node));
+                    notifyListener(new DiscoveryEvent(locNode, "Node left", EVT_NODE_LEFT, node));
                 }
             }
         }
@@ -187,7 +187,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
     public void addNode(ClusterNode node) {
         rmtNodes.add(node);
 
-        notifyListener(new IgniteDiscoveryEvent(locNode, "Node joined", EVT_NODE_JOINED, node));
+        notifyListener(new DiscoveryEvent(locNode, "Node joined", EVT_NODE_JOINED, node));
     }
 
     /**
@@ -195,7 +195,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
      */
     public void removeNode(ClusterNode node) {
         if (rmtNodes.remove(node))
-            notifyListener(new IgniteDiscoveryEvent(locNode, "Node left", EVT_NODE_LEFT, node));
+            notifyListener(new DiscoveryEvent(locNode, "Node left", EVT_NODE_LEFT, node));
     }
 
     /**
@@ -208,7 +208,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
             if (node.id().equals(nodeId)) {
                 iter.remove();
 
-                notifyListener(new IgniteDiscoveryEvent(locNode, "Node left", EVT_NODE_LEFT, node));
+                notifyListener(new DiscoveryEvent(locNode, "Node left", EVT_NODE_LEFT, node));
             }
         }
     }
@@ -218,7 +218,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
      */
     public void failNode(ClusterNode node) {
         if (rmtNodes.remove(node))
-            notifyListener(new IgniteDiscoveryEvent(locNode, "Node failed", EVT_NODE_FAILED, node));
+            notifyListener(new DiscoveryEvent(locNode, "Node failed", EVT_NODE_FAILED, node));
     }
 
     /**
@@ -226,22 +226,22 @@ public class GridSpiTestContext implements IgniteSpiContext {
      */
     public void updateMetrics(ClusterNode node) {
         if (locNode.equals(node) || rmtNodes.contains(node))
-            notifyListener(new IgniteDiscoveryEvent(locNode, "Metrics updated.", EVT_NODE_METRICS_UPDATED, node));
+            notifyListener(new DiscoveryEvent(locNode, "Metrics updated.", EVT_NODE_METRICS_UPDATED, node));
     }
 
     /** */
     public void updateAllMetrics() {
-        notifyListener(new IgniteDiscoveryEvent(locNode, "Metrics updated", EVT_NODE_METRICS_UPDATED, locNode));
+        notifyListener(new DiscoveryEvent(locNode, "Metrics updated", EVT_NODE_METRICS_UPDATED, locNode));
 
         for (ClusterNode node : rmtNodes) {
-            notifyListener(new IgniteDiscoveryEvent(locNode, "Metrics updated", EVT_NODE_METRICS_UPDATED, node));
+            notifyListener(new DiscoveryEvent(locNode, "Metrics updated", EVT_NODE_METRICS_UPDATED, node));
         }
     }
 
     /**
      * @param evt Event node.
      */
-    private void notifyListener(IgniteEvent evt) {
+    private void notifyListener(Event evt) {
         assert evt.type() > 0;
 
         for (Map.Entry<GridLocalEventListener, Set<Integer>> entry : evtLsnrs.entrySet()) {
@@ -309,13 +309,13 @@ public class GridSpiTestContext implements IgniteSpiContext {
     public void triggerTaskEvent(int type, String taskName, IgniteUuid taskSesId, String msg) {
         assert type > 0;
 
-        triggerEvent(new IgniteTaskEvent(locNode, msg, type, taskSesId, taskName, null, false, null));
+        triggerEvent(new TaskEvent(locNode, msg, type, taskSesId, taskName, null, false, null));
     }
 
     /**
      * @param evt Event to trigger.
      */
-    public void triggerEvent(IgniteEvent evt) {
+    public void triggerEvent(Event evt) {
         notifyListener(evt);
     }
 
@@ -347,7 +347,7 @@ public class GridSpiTestContext implements IgniteSpiContext {
     }
 
     /** {@inheritDoc} */
-    @Override public void recordEvent(IgniteEvent evt) {
+    @Override public void recordEvent(Event evt) {
         notifyListener(evt);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 6598c1d..d19832c 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
@@ -1110,7 +1110,7 @@ public abstract class GridAbstractTest extends TestCase {
 
         cfg.setRestEnabled(false);
 
-        cfg.setIncludeEventTypes(IgniteEventType.EVTS_ALL);
+        cfg.setIncludeEventTypes(EventType.EVTS_ALL);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 475fcc7..75f7d4b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -611,7 +611,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
      * @return Future.
      * @throws IgniteCheckedException If failed.
      */
-    protected <T extends IgniteEvent> IgniteFuture<T> waitForLocalEvent(IgniteEvents evts,
+    protected <T extends Event> IgniteFuture<T> waitForLocalEvent(IgniteEvents evts,
         @Nullable IgnitePredicate<T> filter, @Nullable int... types) throws IgniteCheckedException {
         evts = evts.withAsync();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/core/src/test/webapp/META-INF/gg-config.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml
index 2944f16..11a6f40 100644
--- a/modules/core/src/test/webapp/META-INF/gg-config.xml
+++ b/modules/core/src/test/webapp/META-INF/gg-config.xml
@@ -75,7 +75,7 @@
             Enable cache events.
         -->
         <property name="includeEventTypes">
-            <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVTS_CACHE"/>
+            <util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/>
         </property>
 
         <property name="cacheConfiguration">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridEventConsumeFilter.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridEventConsumeFilter.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridEventConsumeFilter.java
index fdcc29c..d017aea 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridEventConsumeFilter.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridEventConsumeFilter.java
@@ -23,9 +23,9 @@ import org.apache.ignite.internal.util.typedef.*;
 /**
  * Filter for event consume test.
  */
-public class GridEventConsumeFilter implements P1<IgniteEvent> {
+public class GridEventConsumeFilter implements P1<Event> {
     /** {@inheritDoc} */
-    @Override public boolean apply(IgniteEvent e) {
+    @Override public boolean apply(Event e) {
         return true;
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath1.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath1.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath1.java
index db7ca74..fcf72f8 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath1.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath1.java
@@ -26,13 +26,13 @@ import org.apache.ignite.resources.*;
  * Simple event filter
  */
 @SuppressWarnings({"ProhibitedExceptionThrown"})
-public class GridP2PEventFilterExternalPath1 implements IgnitePredicate<IgniteEvent> {
+public class GridP2PEventFilterExternalPath1 implements IgnitePredicate<Event> {
     /** Instance of grid. Used for save class loader and injected resource. */
     @IgniteInstanceResource
     private Ignite ignite;
 
     /** {@inheritDoc} */
-    @Override public boolean apply(IgniteEvent evt) {
+    @Override public boolean apply(Event evt) {
         try {
             int[] res = new int[] {
                 System.identityHashCode(getClass().getClassLoader())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath2.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath2.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath2.java
index 7a91558..576b8ba 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath2.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PEventFilterExternalPath2.java
@@ -26,13 +26,13 @@ import org.apache.ignite.resources.*;
  * Simple event filter
  */
 @SuppressWarnings({"ProhibitedExceptionThrown"})
-public class GridP2PEventFilterExternalPath2 implements IgnitePredicate<IgniteEvent> {
+public class GridP2PEventFilterExternalPath2 implements IgnitePredicate<Event> {
     /** Instance of grid. Used for save class loader and injected resource. */
     @IgniteInstanceResource
     private Ignite ignite;
 
     /** {@inheritDoc} */
-    @Override public boolean apply(IgniteEvent evt) {
+    @Override public boolean apply(Event evt) {
         try {
             int[] res = new int[] {
                 System.identityHashCode(getClass().getClassLoader())

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
index 2a771b8..3af9835 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/GridHadoopJobTracker.java
@@ -197,7 +197,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
         qry.execute(ctx.kernalContext().grid().forLocal());
 
         ctx.kernalContext().event().addLocalEventListener(new GridLocalEventListener() {
-            @Override public void onEvent(final IgniteEvent evt) {
+            @Override public void onEvent(final Event evt) {
                 if (!busyLock.tryReadLock())
                     return;
 
@@ -205,7 +205,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
                     // Must process discovery callback in a separate thread to avoid deadlock.
                     evtProcSvc.submit(new EventHandler() {
                         @Override protected void body() {
-                            processNodeLeft((IgniteDiscoveryEvent)evt);
+                            processNodeLeft((DiscoveryEvent)evt);
                         }
                     });
                 }
@@ -213,7 +213,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
                     busyLock.readUnlock();
                 }
             }
-        }, IgniteEventType.EVT_NODE_FAILED, IgniteEventType.EVT_NODE_LEFT);
+        }, EventType.EVT_NODE_FAILED, EventType.EVT_NODE_LEFT);
     }
 
     /** {@inheritDoc} */
@@ -550,7 +550,7 @@ public class GridHadoopJobTracker extends GridHadoopComponent {
      * @param evt Discovery event.
      */
     @SuppressWarnings("ConstantConditions")
-    private void processNodeLeft(IgniteDiscoveryEvent evt) {
+    private void processNodeLeft(DiscoveryEvent evt) {
         if (log.isDebugEnabled())
             log.debug("Processing discovery event [locNodeId=" + ctx.localNodeId() + ", evt=" + evt + ']');
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
index d636ff3..941c8e8 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
@@ -47,7 +47,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.ignitefs.IgniteFsMode.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java
index a68c02f..1505b56 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemAbstractSelfTest.java
@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.ignitefs.IgniteFsMode.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
index 0f401f3..31f39da 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
@@ -38,7 +38,7 @@ import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * IPC cache test.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java
index b9c0937..93b8049 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java
@@ -38,7 +38,7 @@ import java.util.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Test hadoop file system implementation.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 3595aca..d0764a5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -52,7 +52,7 @@ import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CachePreloadMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.cache.query.CacheQueryType.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.junit.Assert.*;
 
 /**
@@ -1326,11 +1326,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount());
 
         for (int i = 0; i < gridCount(); i++) {
-            grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    assert evt instanceof IgniteCacheQueryReadEvent;
+            grid(i).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    assert evt instanceof CacheQueryReadEvent;
 
-                    IgniteCacheQueryReadEvent<Integer, Integer> qe = (IgniteCacheQueryReadEvent<Integer, Integer>)evt;
+                    CacheQueryReadEvent<Integer, Integer> qe = (CacheQueryReadEvent<Integer, Integer>)evt;
 
                     assertEquals(SQL, qe.queryType());
                     assertNull(qe.cacheName());
@@ -1351,11 +1351,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
                 }
             }, EVT_CACHE_QUERY_OBJECT_READ);
 
-            grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    assert evt instanceof IgniteCacheQueryExecutedEvent;
+            grid(i).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    assert evt instanceof CacheQueryExecutedEvent;
 
-                    IgniteCacheQueryExecutedEvent qe = (IgniteCacheQueryExecutedEvent)evt;
+                    CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
 
                     assertEquals(SQL, qe.queryType());
                     assertNull(qe.cacheName());
@@ -1420,11 +1420,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount());
 
         for (int i = 0; i < gridCount(); i++) {
-            grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    assert evt instanceof IgniteCacheQueryReadEvent;
+            grid(i).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    assert evt instanceof CacheQueryReadEvent;
 
-                    IgniteCacheQueryReadEvent<Integer, Integer> qe = (IgniteCacheQueryReadEvent<Integer, Integer>)evt;
+                    CacheQueryReadEvent<Integer, Integer> qe = (CacheQueryReadEvent<Integer, Integer>)evt;
 
                     assertEquals(SCAN, qe.queryType());
                     assertNull(qe.cacheName());
@@ -1445,11 +1445,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
                 }
             }, EVT_CACHE_QUERY_OBJECT_READ);
 
-            grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    assert evt instanceof IgniteCacheQueryExecutedEvent;
+            grid(i).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    assert evt instanceof CacheQueryExecutedEvent;
 
-                    IgniteCacheQueryExecutedEvent qe = (IgniteCacheQueryExecutedEvent)evt;
+                    CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
 
                     assertEquals(SCAN, qe.queryType());
                     assertNull(qe.cacheName());
@@ -1518,11 +1518,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount());
 
         for (int i = 0; i < gridCount(); i++) {
-            grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    assert evt instanceof IgniteCacheQueryReadEvent;
+            grid(i).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    assert evt instanceof CacheQueryReadEvent;
 
-                    IgniteCacheQueryReadEvent<Integer, Person> qe = (IgniteCacheQueryReadEvent<Integer, Person>)evt;
+                    CacheQueryReadEvent<Integer, Person> qe = (CacheQueryReadEvent<Integer, Person>)evt;
 
                     assertEquals(FULL_TEXT, qe.queryType());
                     assertNull(qe.cacheName());
@@ -1543,11 +1543,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
                 }
             }, EVT_CACHE_QUERY_OBJECT_READ);
 
-            grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    assert evt instanceof IgniteCacheQueryExecutedEvent;
+            grid(i).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    assert evt instanceof CacheQueryExecutedEvent;
 
-                    IgniteCacheQueryExecutedEvent qe = (IgniteCacheQueryExecutedEvent)evt;
+                    CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
 
                     assertEquals(FULL_TEXT, qe.queryType());
                     assertNull(qe.cacheName());
@@ -1612,11 +1612,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount());
 
         for (int i = 0; i < gridCount(); i++) {
-            grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    assert evt instanceof IgniteCacheQueryReadEvent;
+            grid(i).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    assert evt instanceof CacheQueryReadEvent;
 
-                    IgniteCacheQueryReadEvent qe = (IgniteCacheQueryReadEvent)evt;
+                    CacheQueryReadEvent qe = (CacheQueryReadEvent)evt;
 
                     assertEquals(SQL_FIELDS, qe.queryType());
                     assertNull(qe.cacheName());
@@ -1639,11 +1639,11 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
                 }
             }, EVT_CACHE_QUERY_OBJECT_READ);
 
-            grid(i).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    assert evt instanceof IgniteCacheQueryExecutedEvent;
+            grid(i).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    assert evt instanceof CacheQueryExecutedEvent;
 
-                    IgniteCacheQueryExecutedEvent qe = (IgniteCacheQueryExecutedEvent)evt;
+                    CacheQueryExecutedEvent qe = (CacheQueryExecutedEvent)evt;
 
                     assertEquals(SQL_FIELDS, qe.queryType());
                     assertNull(qe.cacheName());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
index 8e8dff4..3cde715 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java
@@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
 import static org.apache.ignite.cache.CacheDistributionMode.*;
 import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.configuration.DeploymentMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*;
 
 /**
@@ -75,8 +75,8 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest {
     private final Map<Long, Object> versions = new HashMap<>();
 
     /** Listener on swap events. Updates counters. */
-    private final IgnitePredicate<IgniteEvent> swapLsnr = new IgnitePredicate<IgniteEvent>() {
-        @Override public boolean apply(IgniteEvent evt) {
+    private final IgnitePredicate<Event> swapLsnr = new IgnitePredicate<Event>() {
+        @Override public boolean apply(Event evt) {
             assert evt != null;
 
             switch (evt.type()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
index 08c665f..b766322 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
@@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CacheMode.*;
 import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 import static org.apache.ignite.internal.processors.cache.GridCachePeekMode.*;
 import static org.apache.ignite.configuration.DeploymentMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Test for cache swap.
@@ -246,8 +246,8 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
 
             startGrids(1);
 
-            grid(0).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            grid(0).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     info("Received event: " + evt);
 
                     switch (evt.type()) {
@@ -304,8 +304,8 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
         try {
             startGrids(1);
 
-            grid(0).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            grid(0).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     assert evt != null;
 
                     switch (evt.type()) {
@@ -676,7 +676,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
     /**
      *
      */
-    private class SwapListener implements IgnitePredicate<IgniteEvent> {
+    private class SwapListener implements IgnitePredicate<Event> {
         /** */
         private final CountDownLatch swapLatch = new CountDownLatch(1);
 
@@ -684,7 +684,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
         private final CountDownLatch unswapLatch = new CountDownLatch(1);
 
         /** {@inheritDoc} */
-        @Override public boolean apply(IgniteEvent evt) {
+        @Override public boolean apply(Event evt) {
             assert evt != null;
 
             info("Received event: " + evt);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
index 32924d8..89565b1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
@@ -140,7 +140,7 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest
         CollectingEventListener lsnr = new CollectingEventListener();
 
         for (int i = 0; i < GRID_CNT; i++)
-            grid(i).events().localListen(lsnr, IgniteEventType.EVT_CACHE_PRELOAD_STOPPED);
+            grid(i).events().localListen(lsnr, EventType.EVT_CACHE_PRELOAD_STOPPED);
 
         IgniteInternalFuture<?> fut2 = multithreadedAsync(new Callable<Object>() {
             @SuppressWarnings({"BusyWait"})
@@ -176,18 +176,18 @@ public class GridCacheQueryNodeRestartSelfTest extends GridCacheAbstractSelfTest
         boolean success = lsnr.awaitEvents(GRID_CNT * 2 * restartCnt.get(), 15000);
 
         for (int i = 0; i < GRID_CNT; i++)
-            grid(i).events().stopLocalListen(lsnr, IgniteEventType.EVT_CACHE_PRELOAD_STOPPED);
+            grid(i).events().stopLocalListen(lsnr, EventType.EVT_CACHE_PRELOAD_STOPPED);
 
         assert success;
     }
 
     /** Listener that will wait for specified number of events received. */
-    private class CollectingEventListener implements IgnitePredicate<IgniteEvent> {
+    private class CollectingEventListener implements IgnitePredicate<Event> {
         /** Registered events count. */
         private int evtCnt;
 
         /** {@inheritDoc} */
-        @Override public synchronized boolean apply(IgniteEvent evt) {
+        @Override public synchronized boolean apply(Event evt) {
             evtCnt++;
 
             info("Processed event [evt=" + evt + ", evtCnt=" + evtCnt + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
index c068f43..64ad237 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
@@ -35,7 +35,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Tests for fields queries.
@@ -96,9 +96,9 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie
             final UUID nodeId = g.cluster().localNode().id();
             final CountDownLatch latch = new CountDownLatch(1);
 
-            grid(0).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    if (((IgniteDiscoveryEvent) evt).eventNode().id().equals(nodeId))
+            grid(0).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    if (((DiscoveryEvent) evt).eventNode().id().equals(nodeId))
                         latch.countDown();
 
                     return true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
index 97809a8..cd10674 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
@@ -43,7 +43,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Tests replicated query.
@@ -217,16 +217,16 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
 
         final CountDownLatch latch = new CountDownLatch(keyCnt * 2);
 
-        IgnitePredicate<IgniteEvent> lsnr = new IgnitePredicate<IgniteEvent>() {
-            @Override public boolean apply(IgniteEvent evt) {
+        IgnitePredicate<Event> lsnr = new IgnitePredicate<Event>() {
+            @Override public boolean apply(Event evt) {
                 latch.countDown();
 
                 return true;
             }
         };
 
-        ignite2.events().localListen(lsnr, IgniteEventType.EVT_CACHE_OBJECT_PUT);
-        ignite3.events().localListen(lsnr, IgniteEventType.EVT_CACHE_OBJECT_PUT);
+        ignite2.events().localListen(lsnr, EventType.EVT_CACHE_OBJECT_PUT);
+        ignite3.events().localListen(lsnr, EventType.EVT_CACHE_OBJECT_PUT);
 
         IgniteTx tx = cache1.txStart();
 
@@ -467,9 +467,9 @@ public class GridCacheReplicatedQuerySelfTest extends GridCacheAbstractQuerySelf
             final UUID nodeId = g.cluster().localNode().id();
             final CountDownLatch latch = new CountDownLatch(1);
 
-            grid(0).events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
-                    if (((IgniteDiscoveryEvent)evt).eventNode().id().equals(nodeId))
+            grid(0).events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
+                    if (((DiscoveryEvent)evt).eventNode().id().equals(nodeId))
                         latch.countDown();
 
                     return true;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
index 5801394..94d29c3 100644
--- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
+++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml
@@ -63,7 +63,7 @@
             Enable cache events.
         -->
         <property name="includeEventTypes">
-            <util:constant static-field="org.apache.ignite.events.IgniteEventType.EVTS_CACHE"/>
+            <util:constant static-field="org.apache.ignite.events.EventType.EVTS_CACHE"/>
         </property>
 
         <!--

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
index 2802c14..2c85b99 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheSpec.scala
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.scalar.tests
 
-import org.apache.ignite.events.IgniteEvent
-import org.apache.ignite.events.IgniteEventType._
+import org.apache.ignite.events.Event
+import org.apache.ignite.events.EventType._
 import org.apache.ignite.lang.IgnitePredicate
 import org.apache.ignite.scalar.scalar
 import org.apache.ignite.scalar.scalar._
@@ -57,8 +57,8 @@ class ScalarCacheSpec extends FlatSpec with ShouldMatchers {
         val g = ignite$
 
         g *< (() => {
-            val lsnr = new IgnitePredicate[IgniteEvent]() {
-                override def apply(e: IgniteEvent): Boolean = {
+            val lsnr = new IgnitePredicate[Event]() {
+                override def apply(e: Event): Boolean = {
                     println(e.shortDisplay)
 
                     true

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/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 916a87f..bf6ef63 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
@@ -668,7 +668,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
 
             if (exec)
                 // Execute any grid method.
-                G.ignite(gridName).events().localQuery(F.<IgniteEvent>alwaysTrue());
+                G.ignite(gridName).events().localQuery(F.<Event>alwaysTrue());
         }
 
         /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
index eda8965..1126dc1 100644
--- a/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/p2p/GridP2PUserVersionChangeSelfTest.java
@@ -35,7 +35,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * The test does the following:
@@ -138,10 +138,10 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
 
             final CountDownLatch undeployed = new CountDownLatch(1);
 
-            ignite2.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            ignite2.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     if (evt.type() == EVT_TASK_UNDEPLOYED &&
-                        ((IgniteDeploymentEvent) evt).alias().equals(TEST_TASK_NAME))
+                        ((DeploymentEvent) evt).alias().equals(TEST_TASK_NAME))
                         undeployed.countDown();
 
                     return true;
@@ -186,10 +186,10 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
 
             final CountDownLatch undeployed = new CountDownLatch(1);
 
-            ignite2.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            ignite2.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     if (evt.type() == EVT_TASK_UNDEPLOYED &&
-                        ((IgniteDeploymentEvent) evt).alias().equals(TEST_TASK_NAME))
+                        ((DeploymentEvent) evt).alias().equals(TEST_TASK_NAME))
                         undeployed.countDown();
 
                     return true;
@@ -231,10 +231,10 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
 
             final CountDownLatch undeployed = new CountDownLatch(1);
 
-            ignite2.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            ignite2.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     if (evt.type() == EVT_TASK_UNDEPLOYED &&
-                        ((IgniteDeploymentEvent) evt).alias().equals(TEST_TASK_NAME))
+                        ((DeploymentEvent) evt).alias().equals(TEST_TASK_NAME))
                         undeployed.countDown();
 
                     return true;
@@ -243,8 +243,8 @@ public class GridP2PUserVersionChangeSelfTest extends GridCommonAbstractTest {
 
             final CountDownLatch discoLatch = new CountDownLatch(1);
 
-            ignite2.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            ignite2.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     if (evt.type() == EVT_NODE_LEFT)
                         discoLatch.countDown();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
index 20c52d5..7c8f712 100644
--- a/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
+++ b/modules/ssh/src/test/java/org/apache/ignite/internal/GridProjectionStartStopRestartSelfTest.java
@@ -35,7 +35,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.internal.util.nodestart.GridNodeStartUtils.*;
 
 /**
@@ -123,8 +123,8 @@ public class GridProjectionStartStopRestartSelfTest extends GridCommonAbstractTe
 
         G.setDaemon(false);
 
-        ignite.events().localListen(new IgnitePredicate<IgniteEvent>() {
-            @Override public boolean apply(IgniteEvent evt) {
+        ignite.events().localListen(new IgnitePredicate<Event>() {
+            @Override public boolean apply(Event evt) {
                 info("Received event: " + evt.shortDisplay());
 
                 if (evt.type() == EVT_NODE_JOINED) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
index b030d66..181e092 100644
--- a/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
+++ b/modules/urideploy/src/test/java/org/apache/ignite/internal/GridTaskUriDeploymentDeadlockSelfTest.java
@@ -31,7 +31,7 @@ import java.util.*;
 import java.util.concurrent.*;
 
 import static java.util.concurrent.TimeUnit.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 
 /**
  * Test to reproduce gg-2852.
@@ -69,8 +69,8 @@ public class GridTaskUriDeploymentDeadlockSelfTest extends GridCommonAbstractTes
 
             final CountDownLatch latch = new CountDownLatch(1);
 
-            g.events().localListen(new IgnitePredicate<IgniteEvent>() {
-                @Override public boolean apply(IgniteEvent evt) {
+            g.events().localListen(new IgnitePredicate<Event>() {
+                @Override public boolean apply(Event evt) {
                     assert evt.type() == EVT_NODE_JOINED;
 
                     latch.countDown();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index 8b74782..819dfa6 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -22,8 +22,8 @@ import org.apache.ignite.internal.util.lang.{GridFunc => F}
 
 import org.apache.ignite._
 import org.apache.ignite.cluster.ClusterNode
-import org.apache.ignite.events.IgniteEventType._
-import org.apache.ignite.events.{IgniteDiscoveryEvent, IgniteEvent}
+import org.apache.ignite.events.EventType._
+import org.apache.ignite.events.{DiscoveryEvent, Event}
 import org.apache.ignite.lang.IgnitePredicate
 
 import java.util.UUID
@@ -147,7 +147,7 @@ class VisorAlertCommand {
     private val guard = new AtomicBoolean(false)
 
     /** Node metric update listener. */
-    private var lsnr: IgnitePredicate[IgniteEvent] = null
+    private var lsnr: IgnitePredicate[Event] = null
 
     /**
      * Prints error message and advise.
@@ -354,9 +354,9 @@ class VisorAlertCommand {
         if (guard.compareAndSet(false, true)) {
             assert(lsnr == null)
 
-            lsnr = new IgnitePredicate[IgniteEvent] {
-                override def apply(evt: IgniteEvent): Boolean = {
-                    val discoEvt = evt.asInstanceOf[IgniteDiscoveryEvent]
+            lsnr = new IgnitePredicate[Event] {
+                override def apply(evt: Event): Boolean = {
+                    val discoEvt = evt.asInstanceOf[DiscoveryEvent]
 
                     val node = grid.node(discoEvt.eventNode().id())
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
index fc0f35d..99a43a7 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
@@ -25,8 +25,8 @@ import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask.VisorN
 import org.apache.ignite.internal.util.lang.{GridFunc => F}
 
 import org.apache.ignite.cluster.ClusterNode
-import org.apache.ignite.events.IgniteEventType
-import org.apache.ignite.events.IgniteEventType._
+import org.apache.ignite.events.EventType
+import org.apache.ignite.events.EventType._
 import org.apache.ignite.visor.{VisorTag, visor}
 
 import org.apache.ignite.visor.commands.{VisorConsoleCommand, VisorTextTable}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index 21d02d0..f893073 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -24,8 +24,8 @@ import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask
 import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask.VisorNodeEventsCollectorTaskArg
 
 import org.apache.ignite._
-import org.apache.ignite.events.IgniteEventType
-import org.apache.ignite.events.IgniteEventType._
+import org.apache.ignite.events.EventType
+import org.apache.ignite.events.EventType._
 
 import java.util.UUID
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
index fd5e0b3..0dfbeb4 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
@@ -25,8 +25,8 @@ import org.apache.ignite.internal.visor.node.VisorNodeEventsCollectorTask.VisorN
 import org.apache.ignite.internal.util.typedef.X
 
 import org.apache.ignite._
-import org.apache.ignite.events.IgniteEventType
-import org.apache.ignite.events.IgniteEventType._
+import org.apache.ignite.events.EventType
+import org.apache.ignite.events.EventType._
 import org.apache.ignite.lang.IgniteUuid
 
 import java.util.UUID

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index b277f3b..53ea3dc 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -26,8 +26,8 @@ import java.util.{HashSet => JHashSet, _}
 import org.apache.ignite.IgniteSystemProperties._
 import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode}
 import org.apache.ignite.configuration.IgniteConfiguration
-import org.apache.ignite.events.IgniteEventType._
-import org.apache.ignite.events.{IgniteDiscoveryEvent, IgniteEvent}
+import org.apache.ignite.events.EventType._
+import org.apache.ignite.events.{DiscoveryEvent, Event}
 import org.apache.ignite.internal.IgniteComponentType._
 import org.apache.ignite.internal.GridNodeAttributes._
 import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException
@@ -131,7 +131,7 @@ object visor extends VisorTag {
     type NodeFilter = ClusterNode => Boolean
 
     /** Type alias for general event filter. */
-    type EventFilter = IgniteEvent => Boolean
+    type EventFilter = Event => Boolean
 
     /** `Nil` is for empty list, `Til` is for empty tuple. */
     val Til: Arg = (null, null)
@@ -146,13 +146,13 @@ object visor extends VisorTag {
     private var cmdLst: Seq[VisorConsoleCommandHolder] = Nil
 
     /** Node left listener. */
-    private var nodeLeftLsnr: IgnitePredicate[IgniteEvent] = null
+    private var nodeLeftLsnr: IgnitePredicate[Event] = null
 
     /** Node join listener. */
-    private var nodeJoinLsnr: IgnitePredicate[IgniteEvent] = null
+    private var nodeJoinLsnr: IgnitePredicate[Event] = null
 
     /** Node segmentation listener. */
-    private var nodeSegLsnr: IgnitePredicate[IgniteEvent] = null
+    private var nodeSegLsnr: IgnitePredicate[Event] = null
 
     /** Node stop listener. */
     private var nodeStopLsnr: IgnitionListener = null
@@ -1625,10 +1625,10 @@ object visor extends VisorTag {
                 setVarIfAbsent(ip.get, "h")
         })
 
-        nodeJoinLsnr = new IgnitePredicate[IgniteEvent]() {
-            override def apply(e: IgniteEvent): Boolean = {
+        nodeJoinLsnr = new IgnitePredicate[Event]() {
+            override def apply(e: Event): Boolean = {
                 e match {
-                    case de: IgniteDiscoveryEvent =>
+                    case de: DiscoveryEvent =>
                         setVarIfAbsent(nid8(de.eventNode()), "n")
 
                         val node = grid.node(de.eventNode().id())
@@ -1654,10 +1654,10 @@ object visor extends VisorTag {
 
         grid.events().localListen(nodeJoinLsnr, EVT_NODE_JOINED)
 
-        nodeLeftLsnr = new IgnitePredicate[IgniteEvent]() {
-            override def apply(e: IgniteEvent): Boolean = {
+        nodeLeftLsnr = new IgnitePredicate[Event]() {
+            override def apply(e: Event): Boolean = {
                 e match {
-                    case (de: IgniteDiscoveryEvent) =>
+                    case (de: DiscoveryEvent) =>
                         val nv = mfind(nid8(de.eventNode()))
 
                         if (nv.isDefined)
@@ -1685,10 +1685,10 @@ object visor extends VisorTag {
 
         grid.events().localListen(nodeLeftLsnr, EVT_NODE_LEFT, EVT_NODE_FAILED)
 
-        nodeSegLsnr = new IgnitePredicate[IgniteEvent] {
-            override def apply(e: IgniteEvent): Boolean = {
+        nodeSegLsnr = new IgnitePredicate[Event] {
+            override def apply(e: Event): Boolean = {
                 e match {
-                    case de: IgniteDiscoveryEvent =>
+                    case de: DiscoveryEvent =>
                         if (de.eventNode().id() == grid.localNode.id) {
                             warn("Closing Visor console due to topology segmentation.")
                             warn("Contact your system administrator.")

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
index 575728b..010165d 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommandSpec.scala
@@ -18,7 +18,7 @@
 package org.apache.ignite.visor.commands.config
 
 import org.apache.ignite.configuration.IgniteConfiguration
-import org.apache.ignite.events.IgniteEventType._
+import org.apache.ignite.events.EventType._
 import org.apache.ignite.visor.{VisorRuntimeBaseSpec, visor}
 
 import org.apache.ignite.visor.commands.config.VisorConfigurationCommand._

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
index 897fa39..0212d65 100644
--- a/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
+++ b/modules/visor-console/src/test/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommandSpec.scala
@@ -20,8 +20,8 @@ package org.apache.ignite.visor.commands.tasks
 import org.apache.ignite.Ignition
 import org.apache.ignite.compute.{ComputeJob, ComputeJobAdapter, ComputeJobResult, ComputeTaskSplitAdapter}
 import org.apache.ignite.configuration.IgniteConfiguration
-import org.apache.ignite.events.IgniteEventType
-import org.apache.ignite.events.IgniteEventType._
+import org.apache.ignite.events.EventType
+import org.apache.ignite.events.EventType._
 import org.apache.ignite.visor.visor
 import org.scalatest._
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f1c7b39/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
index c09d185..a57f5b5 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteAbstractBenchmark.java
@@ -25,7 +25,7 @@ import org.yardstickframework.*;
 import java.util.concurrent.*;
 
 import static org.apache.ignite.cache.CacheDistributionMode.*;
-import static org.apache.ignite.events.IgniteEventType.*;
+import static org.apache.ignite.events.EventType.*;
 import static org.yardstickframework.BenchmarkUtils.*;
 
 /**
@@ -88,8 +88,8 @@ public abstract class IgniteAbstractBenchmark extends BenchmarkDriverAdapter {
     private void waitForNodes() throws Exception {
         final CountDownLatch nodesStartedLatch = new CountDownLatch(1);
 
-        ignite().events().localListen(new IgnitePredicate<IgniteEvent>() {
-            @Override public boolean apply(IgniteEvent gridEvt) {
+        ignite().events().localListen(new IgnitePredicate<Event>() {
+            @Override public boolean apply(Event gridEvt) {
                 if (nodesStarted())
                     nodesStartedLatch.countDown();
 


Mime
View raw message