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 14:55:07 UTC

[1/3] incubator-ignite git commit: #IGNITE-106: Remove grid from comments.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-106 8c83e3ac8 -> 921fd0c78


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridHibernateL2CacheExampleMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridHibernateL2CacheExampleMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridHibernateL2CacheExampleMultiNodeSelfTest.java
deleted file mode 100644
index 9f39ec6..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridHibernateL2CacheExampleMultiNodeSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.datagrid.hibernate.*;
-
-/**
- * Multi-node test for {@link HibernateL2CacheExample}.
- */
-public class GridHibernateL2CacheExampleMultiNodeSelfTest extends GridHibernateL2CacheExampleSelfTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        for (int i = 0; i < RMT_NODES_CNT; i++)
-            startGrid("node-" + i, HibernateL2CacheExampleNodeStartup.configuration());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridHibernateL2CacheExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridHibernateL2CacheExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridHibernateL2CacheExampleSelfTest.java
deleted file mode 100644
index 44c799f..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridHibernateL2CacheExampleSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.datagrid.hibernate.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Tests the {@link HibernateL2CacheExample}.
- */
-public class GridHibernateL2CacheExampleSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridHibernateL2CacheExample() throws Exception {
-        HibernateL2CacheExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridLifecycleExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridLifecycleExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridLifecycleExamplesSelfTest.java
deleted file mode 100644
index cc067d4..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridLifecycleExamplesSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.misc.lifecycle.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * GridLifecycleExample self test.
- */
-public class GridLifecycleExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridLifecycleExample() throws Exception {
-        LifecycleExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridMemcacheRestExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridMemcacheRestExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridMemcacheRestExamplesMultiNodeSelfTest.java
deleted file mode 100644
index 949ebc9..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridMemcacheRestExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.misc.client.memcache.*;
-
-/**
- * GridMemcacheRestExample multi-node self test.
- */
-public class GridMemcacheRestExamplesMultiNodeSelfTest extends GridMemcacheRestExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        for (int i = 0; i < RMT_NODES_CNT; i++)
-            startGrid("memcache-rest-examples-" + i, MemcacheRestExampleNodeStartup.configuration());
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridMemcacheRestExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridMemcacheRestExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridMemcacheRestExamplesSelfTest.java
deleted file mode 100644
index 7e5f69c..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridMemcacheRestExamplesSelfTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.misc.client.memcache.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * GridMemcacheRestExample self test.
- */
-public class GridMemcacheRestExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    @Override protected void beforeTest() throws Exception {
-        // Start up a grid node.
-        startGrid("memcache-rest-examples", MemcacheRestExampleNodeStartup.configuration());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridMemcacheRestExample() throws Exception {
-        MemcacheRestExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridMessagingExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridMessagingExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridMessagingExamplesSelfTest.java
deleted file mode 100644
index 6822fc1..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridMessagingExamplesSelfTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.messaging.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Messaging examples self test.
- */
-public class GridMessagingExamplesSelfTest extends GridAbstractExamplesTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        startGrid("companion", DFLT_CFG);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridMessagingExample() throws Exception {
-        MessagingExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridMessagingPingPongExample() throws Exception {
-        MessagingPingPongExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridMessagingPingPongListenActorExample() throws Exception {
-        MessagingPingPongListenActorExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesMultiNodeSelfTest.java
deleted file mode 100644
index cae30e2..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-/**
- * GridPrimeExample multi-node self test.
- */
-public class GridMonteCarloExamplesMultiNodeSelfTest extends GridMonteCarloExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        startRemoteNodes();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java
deleted file mode 100644
index 89f49cc..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridMonteCarloExamplesSelfTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.compute.montecarlo.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Gridify examples self test. Excludes Gridify Spring tests.
- *
- * <h1 class="header">AOP Configuration</h1>
- * In order for this test to execute, any of the following
- * AOP configurations must be provided.
- * <h2 class="header">Jboss AOP</h2>
- * The following configuration needs to be applied to enable JBoss byte code
- * weaving. Note that Ignite is not shipped with JBoss and necessary
- * libraries will have to be downloaded separately (they come standard
- * if you have JBoss installed already):
- * <ul>
- * <li>
- *      The following JVM configuration must be present:
- *      <ul>
- *      <li>{@code -javaagent:[path to jboss-aop-jdk50-4.x.x.jar]}</li>
- *      <li>{@code -Djboss.aop.class.path=[path to gridgain.jar]}</li>
- *      <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain.examples}</li>
- *      </ul>
- * </li>
- * <li>
- *      The following JARs should be in a classpath:
- *      <ul>
- *      <li>{@code javassist-3.x.x.jar}</li>
- *      <li>{@code jboss-aop-jdk50-4.x.x.jar}</li>
- *      <li>{@code jboss-aspect-library-jdk50-4.x.x.jar}</li>
- *      <li>{@code jboss-common-4.x.x.jar}</li>
- *      <li>{@code trove-1.0.2.jar}</li>
- *      </ul>
- * </li>
- * </ul>
- * <p>
- * <h2 class="header">AspectJ AOP</h2>
- * The following configuration needs to be applied to enable AspectJ byte code
- * weaving.
- * <ul>
- * <li>
- *      JVM configuration should include:
- *      {@code -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar}
- * </li>
- * <li>
- *      Classpath should contain the {@code ${IGNITE_HOME}/modules/tests/config/aop/aspectj} folder.
- * </li>
- */
-public class GridMonteCarloExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testCreditRiskExample() throws Exception {
-        CreditRiskExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridProjectionExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridProjectionExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridProjectionExampleSelfTest.java
deleted file mode 100644
index 88f358f..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridProjectionExampleSelfTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.compute.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- *
- */
-public class GridProjectionExampleSelfTest extends GridAbstractExamplesTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        // Start up a grid node.
-        startGrid("grid-projection-example", DFLT_CFG);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridProjectionExample() throws Exception {
-        ComputeProjectionExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridSpringBeanExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridSpringBeanExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridSpringBeanExamplesSelfTest.java
deleted file mode 100644
index b1675d8..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridSpringBeanExamplesSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.misc.springbean.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Spring bean examples self test.
- */
-public class GridSpringBeanExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridSpringBeanHelloWorldExample() throws Exception {
-        SpringBeanExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridTaskExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridTaskExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridTaskExamplesMultiNodeSelfTest.java
deleted file mode 100644
index ab7be82..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridTaskExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-/**
- * Hello world examples multi-node self test.
- */
-public class GridTaskExamplesMultiNodeSelfTest extends GridTaskExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        startRemoteNodes();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridTaskExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridTaskExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridTaskExamplesSelfTest.java
deleted file mode 100644
index 9a3cdc0..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridTaskExamplesSelfTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.compute.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Hello world examples self test.
- */
-public class GridTaskExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testTaskSplitExample() throws Exception {
-        ComputeTaskSplitExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testTaskMapExample() throws Exception {
-        ComputeTaskMapExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
new file mode 100644
index 0000000..29a85b8
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleMultiNodeSelfTest.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.datagrid.hibernate.*;
+
+/**
+ * Multi-node test for {@link HibernateL2CacheExample}.
+ */
+public class HibernateL2CacheExampleMultiNodeSelfTest extends HibernateL2CacheExampleSelfTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        for (int i = 0; i < RMT_NODES_CNT; i++)
+            startGrid("node-" + i, HibernateL2CacheExampleNodeStartup.configuration());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
new file mode 100644
index 0000000..0c46894
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/HibernateL2CacheExampleSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.datagrid.hibernate.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Tests the {@link HibernateL2CacheExample}.
+ */
+public class HibernateL2CacheExampleSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridHibernateL2CacheExample() throws Exception {
+        HibernateL2CacheExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java
index 8ac2a5c..ec26b4e 100644
--- a/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java
+++ b/examples/src/test/java/org/apache/ignite/examples/IgniteFsExamplesSelfTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.testframework.junits.common.*;
 /**
  * IgniteFs examples self test.
  */
-public class IgniteFsExamplesSelfTest extends GridAbstractExamplesTest {
+public class IgniteFsExamplesSelfTest extends AbstractExamplesTest {
     /** GGFS config with shared memory IPC. */
     private static final String GGFS_SHMEM_CFG = "modules/core/src/test/config/ggfs-shmem.xml";
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
new file mode 100644
index 0000000..4b148a5
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/LifecycleExamplesSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.misc.lifecycle.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * GridLifecycleExample self test.
+ */
+public class LifecycleExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridLifecycleExample() throws Exception {
+        LifecycleExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..9a87f55
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesMultiNodeSelfTest.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.misc.client.memcache.*;
+
+/**
+ * GridMemcacheRestExample multi-node self test.
+ */
+public class MemcacheRestExamplesMultiNodeSelfTest extends MemcacheRestExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        for (int i = 0; i < RMT_NODES_CNT; i++)
+            startGrid("memcache-rest-examples-" + i, MemcacheRestExampleNodeStartup.configuration());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
new file mode 100644
index 0000000..4349bd5
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/MemcacheRestExamplesSelfTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.misc.client.memcache.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * GridMemcacheRestExample self test.
+ */
+public class MemcacheRestExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    @Override protected void beforeTest() throws Exception {
+        // Start up a cluster node.
+        startGrid("memcache-rest-examples", MemcacheRestExampleNodeStartup.configuration());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridMemcacheRestExample() throws Exception {
+        MemcacheRestExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
new file mode 100644
index 0000000..80235b1
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/MessagingExamplesSelfTest.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.messaging.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Messaging examples self test.
+ */
+public class MessagingExamplesSelfTest extends AbstractExamplesTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        startGrid("companion", DFLT_CFG);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridMessagingExample() throws Exception {
+        MessagingExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridMessagingPingPongExample() throws Exception {
+        MessagingPingPongExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridMessagingPingPongListenActorExample() throws Exception {
+        MessagingPingPongListenActorExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..0c3bc38
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesMultiNodeSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+/**
+ * GridPrimeExample multi-node self test.
+ */
+public class MonteCarloExamplesMultiNodeSelfTest extends MonteCarloExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        startRemoteNodes();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
new file mode 100644
index 0000000..634ba44
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/MonteCarloExamplesSelfTest.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.compute.montecarlo.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Gridify examples self test. Excludes Gridify Spring tests.
+ *
+ * <h1 class="header">AOP Configuration</h1>
+ * In order for this test to execute, any of the following
+ * AOP configurations must be provided.
+ * <h2 class="header">Jboss AOP</h2>
+ * The following configuration needs to be applied to enable JBoss byte code
+ * weaving. Note that Ignite is not shipped with JBoss and necessary
+ * libraries will have to be downloaded separately (they come standard
+ * if you have JBoss installed already):
+ * <ul>
+ * <li>
+ *      The following JVM configuration must be present:
+ *      <ul>
+ *      <li>{@code -javaagent:[path to jboss-aop-jdk50-4.x.x.jar]}</li>
+ *      <li>{@code -Djboss.aop.class.path=[path to gridgain.jar]}</li>
+ *      <li>{@code -Djboss.aop.exclude=org,com -Djboss.aop.include=org.gridgain.examples}</li>
+ *      </ul>
+ * </li>
+ * <li>
+ *      The following JARs should be in a classpath:
+ *      <ul>
+ *      <li>{@code javassist-3.x.x.jar}</li>
+ *      <li>{@code jboss-aop-jdk50-4.x.x.jar}</li>
+ *      <li>{@code jboss-aspect-library-jdk50-4.x.x.jar}</li>
+ *      <li>{@code jboss-common-4.x.x.jar}</li>
+ *      <li>{@code trove-1.0.2.jar}</li>
+ *      </ul>
+ * </li>
+ * </ul>
+ * <p>
+ * <h2 class="header">AspectJ AOP</h2>
+ * The following configuration needs to be applied to enable AspectJ byte code
+ * weaving.
+ * <ul>
+ * <li>
+ *      JVM configuration should include:
+ *      {@code -javaagent:${IGNITE_HOME}/libs/aspectjweaver-1.7.2.jar}
+ * </li>
+ * <li>
+ *      Classpath should contain the {@code ${IGNITE_HOME}/modules/tests/config/aop/aspectj} folder.
+ * </li>
+ */
+public class MonteCarloExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCreditRiskExample() throws Exception {
+        CreditRiskExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java
new file mode 100644
index 0000000..9944c42
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/ProjectionExampleSelfTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ *
+ */
+public class ProjectionExampleSelfTest extends AbstractExamplesTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        // Start up a cluster node.
+        startGrid("grid-projection-example", DFLT_CFG);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridProjectionExample() throws Exception {
+        ComputeProjectionExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
new file mode 100644
index 0000000..4110b99
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/SpringBeanExamplesSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.misc.springbean.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Spring bean examples self test.
+ */
+public class SpringBeanExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridSpringBeanHelloWorldExample() throws Exception {
+        SpringBeanExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..e0c7bb5
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesMultiNodeSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+/**
+ * Hello world examples multi-node self test.
+ */
+public class TaskExamplesMultiNodeSelfTest extends TaskExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        startRemoteNodes();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
new file mode 100644
index 0000000..54d5ff6
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/TaskExamplesSelfTest.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Hello world examples self test.
+ */
+public class TaskExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testTaskSplitExample() throws Exception {
+        ComputeTaskSplitExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testTaskMapExample() throws Exception {
+        ComputeTaskMapExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
index 7d3bb12..11d7555 100644
--- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
+++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java
@@ -39,35 +39,35 @@ public class IgniteExamplesSelfTestSuite extends TestSuite {
 
         TestSuite suite = new TestSuite("Ignite Examples Test Suite");
 
-        suite.addTest(new TestSuite(GridCacheExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridBasicExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridContinuationExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridContinuousMapperExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridDeploymentExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridEventsExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridLifecycleExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridMessagingExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridMemcacheRestExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridMonteCarloExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridTaskExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridSpringBeanExamplesSelfTest.class));
+        suite.addTest(new TestSuite(CacheExamplesSelfTest.class));
+        suite.addTest(new TestSuite(BasicExamplesSelfTest.class));
+        suite.addTest(new TestSuite(ContinuationExamplesSelfTest.class));
+        suite.addTest(new TestSuite(ContinuousMapperExamplesSelfTest.class));
+        suite.addTest(new TestSuite(DeploymentExamplesSelfTest.class));
+        suite.addTest(new TestSuite(EventsExamplesSelfTest.class));
+        suite.addTest(new TestSuite(LifecycleExamplesSelfTest.class));
+        suite.addTest(new TestSuite(MessagingExamplesSelfTest.class));
+        suite.addTest(new TestSuite(MemcacheRestExamplesSelfTest.class));
+        suite.addTest(new TestSuite(MonteCarloExamplesSelfTest.class));
+        suite.addTest(new TestSuite(TaskExamplesSelfTest.class));
+        suite.addTest(new TestSuite(SpringBeanExamplesSelfTest.class));
         suite.addTest(new TestSuite(IgniteFsExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridCheckpointExamplesSelfTest.class));
-        suite.addTest(new TestSuite(GridHibernateL2CacheExampleSelfTest.class));
-        suite.addTest(new TestSuite(GridProjectionExampleSelfTest.class));
+        suite.addTest(new TestSuite(CheckpointExamplesSelfTest.class));
+        suite.addTest(new TestSuite(HibernateL2CacheExampleSelfTest.class));
+        suite.addTest(new TestSuite(ProjectionExampleSelfTest.class));
 
         // Multi-node.
-        suite.addTest(new TestSuite(GridCacheExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridCacheStoreLoadDataExampleMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridBasicExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridContinuationExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridContinuousMapperExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridDeploymentExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridEventsExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridTaskExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridMemcacheRestExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridMonteCarloExamplesMultiNodeSelfTest.class));
-        suite.addTest(new TestSuite(GridHibernateL2CacheExampleMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(CacheExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(CacheStoreLoadDataExampleMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(BasicExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(ContinuationExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(ContinuousMapperExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(DeploymentExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(EventsExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(TaskExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(MemcacheRestExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(MonteCarloExamplesMultiNodeSelfTest.class));
+        suite.addTest(new TestSuite(HibernateL2CacheExampleMultiNodeSelfTest.class));
 
         return suite;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
----------------------------------------------------------------------
diff --git a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
index 6852ac9..f9b503d 100644
--- a/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
+++ b/examples/src/test/scala/org/apache/ignite/scalar/tests/examples/ScalarExamplesSelfTest.scala
@@ -19,13 +19,13 @@ package org.apache.ignite.scalar.tests.examples
 
 import org.apache.ignite.scalar.examples._
 import org.apache.ignite.scalar.scalar
-import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest
+import org.apache.ignite.testframework.junits.common.AbstractExamplesTest
 import org.scalatest.junit.JUnitSuiteLike
 
 /**
  * Scalar examples self test.
  */
-class ScalarExamplesSelfTest extends GridAbstractExamplesTest with JUnitSuiteLike {
+class ScalarExamplesSelfTest extends AbstractExamplesTest with JUnitSuiteLike {
     /** */
     private def EMPTY_ARGS = Array.empty[String]
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 dc9d81d..0cfb80c 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_GRID_START);
+            notifyLifecycleBeans(AFTER_IGNITE_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_GRID_STOP);
+            notifyLifecycleBeansEx(LifecycleEventType.AFTER_IGNITE_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/921fd0c7/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 0095661..f413e90 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_GRID_START} invoked right after grid
+ *   {@link LifecycleEventType#AFTER_IGNITE_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_GRID_STOP} invoked right after grid
+ *   {@link LifecycleEventType#AFTER_IGNITE_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/921fd0c7/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 d7b7478..3b9eeb3 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_GRID_START,
+    AFTER_IGNITE_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_GRID_STOP;
+    AFTER_IGNITE_STOP;
 
     /** Enumerated values. */
     private static final LifecycleEventType[] VALS = values();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 b177610..a603e8a 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_GRID_START));
+            assertEquals(1, bean.count(AFTER_IGNITE_START));
             assertEquals(0, bean.count(BEFORE_GRID_STOP));
-            assertEquals(0, bean.count(AFTER_GRID_STOP));
+            assertEquals(0, bean.count(AFTER_IGNITE_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_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(1, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
@@ -125,9 +125,9 @@ public class GridLifecycleBeanSelfTest extends GridCommonAbstractTest {
         }
 
         assertEquals(0, bean.count(BEFORE_GRID_START));
-        assertEquals(0, bean.count(AFTER_GRID_START));
+        assertEquals(0, bean.count(AFTER_IGNITE_START));
         assertEquals(0, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_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_GRID_START, gridErr);
+        bean = new LifeCycleExceptionBean(AFTER_IGNITE_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_GRID_START));
+        assertEquals(0, bean.count(AFTER_IGNITE_START));
         assertEquals(1, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_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_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(0, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_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_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(0, bean.count(BEFORE_GRID_STOP));
-        assertEquals(1, bean.count(AFTER_GRID_STOP));
+        assertEquals(1, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testGridErrorAfterStop() throws Exception {
-        checkOnStop(AFTER_GRID_STOP, true);
+        checkOnStop(AFTER_IGNITE_STOP, true);
 
         assertEquals(1, bean.count(BEFORE_GRID_START));
-        assertEquals(1, bean.count(AFTER_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(1, bean.count(BEFORE_GRID_STOP));
-        assertEquals(0, bean.count(AFTER_GRID_STOP));
+        assertEquals(0, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**
      * @throws Exception If failed.
      */
     public void testOtherErrorAfterStop() throws Exception {
-        checkOnStop(AFTER_GRID_STOP, false);
+        checkOnStop(AFTER_IGNITE_STOP, false);
 
         assertEquals(1, bean.count(BEFORE_GRID_START));
-        assertEquals(1, bean.count(AFTER_GRID_START));
+        assertEquals(1, bean.count(AFTER_IGNITE_START));
         assertEquals(1, bean.count(BEFORE_GRID_STOP));
-        assertEquals(0, bean.count(AFTER_GRID_STOP));
+        assertEquals(0, bean.count(AFTER_IGNITE_STOP));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 9295a05..a301bda 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_GRID_START) {
+                    if (evt == LifecycleEventType.AFTER_IGNITE_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/921fd0c7/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 b8818b0..bd77208 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_GRID_START) {
+                    if (evt == LifecycleEventType.AFTER_IGNITE_START) {
                         GridCache<Integer, String> c = ignite.cache(null);
 
                         if (c.putxIfAbsent(-1, "true")) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 7f68b6d..4fcc417 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_GRID_START: {
+                    case AFTER_IGNITE_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_GRID_STOP: {
+                    case AFTER_IGNITE_STOP: {
                         info("Lifecycle event: " + evt);
 
                         break;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 266ba56..5ba5c97 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_GRID_START: {
+                    case AFTER_IGNITE_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_GRID_STOP: {
+                    case AFTER_IGNITE_STOP: {
                         info("Lifecycle event: " + evt);
 
                         break;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 bd011f4..5eaa36c 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_GRID_START) {
+        if (type == LifecycleEventType.AFTER_IGNITE_START) {
             GridCache<GridTestKey, Long> cache = g.cache("partitioned");
 
             assert cache != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 b12c94d..8645a14 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_GRID_START:
+            case AFTER_IGNITE_START:
                 ignite.cache("PARTITIONED_CACHE").dataStructures().atomicSequence("ID", 0, true);
                 break;
 
             case BEFORE_GRID_STOP:
                 break;
 
-            case AFTER_GRID_STOP:
+            case AFTER_IGNITE_STOP:
                 break;
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/AbstractExamplesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/AbstractExamplesTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/AbstractExamplesTest.java
new file mode 100644
index 0000000..a523066
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/AbstractExamplesTest.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.testframework.junits.common;
+
+import org.apache.ignite.internal.util.typedef.internal.*;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ * Base class for examples test.
+ */
+public abstract class AbstractExamplesTest extends GridCommonAbstractTest {
+    /** */
+    protected static final String[] EMPTY_ARGS = new String[0];
+
+    /** */
+    protected static final int RMT_NODES_CNT = 3;
+
+    /** */
+    protected static final String RMT_NODE_CFGS = "modules/core/src/test/config/examples.properties";
+
+    /** */
+    protected static final String DFLT_CFG = "examples/config/example-compute.xml";
+
+    /** */
+    private static final Properties rmtCfgs = new Properties();
+
+    /** {@inheritDoc} */
+    @Override protected void afterTest() throws Exception {
+        stopAllGrids();
+    }
+
+    /**
+     * Starts remote nodes.
+     *
+     * @throws Exception If failed.
+     */
+    protected final void startRemoteNodes() throws Exception {
+        String name = getName().replaceFirst("test", "");
+
+        if (rmtCfgs.isEmpty()) {
+            info("Loading remote configs properties from file: " + RMT_NODE_CFGS);
+
+            try (FileReader reader = new FileReader(U.resolveGridGainPath(RMT_NODE_CFGS))) {
+                rmtCfgs.load(reader);
+            }
+        }
+
+        String cfg = rmtCfgs.getProperty(name, defaultConfig());
+
+        info("Config for remote nodes [name=" + name + ", cfg=" + cfg + ", dflt=" + defaultConfig() + "]");
+
+        for (int i = 0; i < RMT_NODES_CNT; i++)
+            startGrid(getTestGridName(i), cfg);
+    }
+
+    /**
+     * @return Default config for this test.
+     */
+    protected String defaultConfig() {
+        return DFLT_CFG;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java
deleted file mode 100644
index 9df954a..0000000
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractExamplesTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.testframework.junits.common;
-
-import org.apache.ignite.internal.util.typedef.internal.*;
-
-import java.io.*;
-import java.util.*;
-
-/**
- * Base class for examples test.
- */
-public abstract class GridAbstractExamplesTest extends GridCommonAbstractTest {
-    /** */
-    protected static final String[] EMPTY_ARGS = new String[0];
-
-    /** */
-    protected static final int RMT_NODES_CNT = 3;
-
-    /** */
-    protected static final String RMT_NODE_CFGS = "modules/core/src/test/config/examples.properties";
-
-    /** */
-    protected static final String DFLT_CFG = "examples/config/example-compute.xml";
-
-    /** */
-    private static final Properties rmtCfgs = new Properties();
-
-    /** {@inheritDoc} */
-    @Override protected void afterTest() throws Exception {
-        stopAllGrids();
-    }
-
-    /**
-     * Starts remote nodes.
-     *
-     * @throws Exception If failed.
-     */
-    protected final void startRemoteNodes() throws Exception {
-        String name = getName().replaceFirst("test", "");
-
-        if (rmtCfgs.isEmpty()) {
-            info("Loading remote configs properties from file: " + RMT_NODE_CFGS);
-
-            try (FileReader reader = new FileReader(U.resolveGridGainPath(RMT_NODE_CFGS))) {
-                rmtCfgs.load(reader);
-            }
-        }
-
-        String cfg = rmtCfgs.getProperty(name, defaultConfig());
-
-        info("Config for remote nodes [name=" + name + ", cfg=" + cfg + ", dflt=" + defaultConfig() + "]");
-
-        for (int i = 0; i < RMT_NODES_CNT; i++)
-            startGrid(getTestGridName(i), cfg);
-    }
-
-    /**
-     * @return Default config for this test.
-     */
-    protected String defaultConfig() {
-        return DFLT_CFG;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
index c90a709..24fdddb 100644
--- a/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
+++ b/modules/scalar/src/main/scala/org/apache/ignite/scalar/scalar.scala
@@ -196,7 +196,7 @@ object scalar extends ScalarConversions {
      * @param body Closure to execute within automatically managed default grid instance.
      */
     def apply(body: Ignite => Unit) {
-        if (!isStarted) init(Ignition.start, body) else body(grid$)
+        if (!isStarted) init(Ignition.start, body) else body(ignite)
     }
 
     /**
@@ -207,7 +207,7 @@ object scalar extends ScalarConversions {
      * @param body Closure to execute within automatically managed default grid instance.
      */
     def apply[T](body: Ignite => T): T =
-        if (!isStarted) init(Ignition.start, body) else body(grid$)
+        if (!isStarted) init(Ignition.start, body) else body(ignite)
 
     /**
      * Executes given closure within automatically managed default grid instance.
@@ -300,7 +300,7 @@ object scalar extends ScalarConversions {
     @inline def dataLoader$[K, V](
         @Nullable cacheName: String,
         bufSize: Int): IgniteDataLoader[K, V] = {
-        val dl = grid$.dataLoader[K, V](cacheName)
+        val dl = ignite.dataLoader[K, V](cacheName)
 
         dl.perNodeBufferSize(bufSize)
 
@@ -310,7 +310,7 @@ object scalar extends ScalarConversions {
     /**
      * Gets default grid instance.
      */
-    @inline def grid$: Ignite = Ignition.ignite
+    @inline def ignite: Ignite = Ignition.ignite
 
     /**
      * Gets node ID as ID8 string.
@@ -423,7 +423,7 @@ object scalar extends ScalarConversions {
      *  @return Started grid.
      */
     def start(): Ignite = {
-        if (!isStarted) Ignition.start else grid$
+        if (!isStarted) Ignition.start else ignite
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
index 7062984..23dab0e 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarAffinityRoutingSpec.scala
@@ -40,9 +40,9 @@ class ScalarAffinityRoutingSpec extends FlatSpec with ShouldMatchers with Before
 
         val cnt = c.dataStructures().atomicLong("affinityRun", 0, true)
 
-        grid$.affinityRun$(CACHE_NAME, 0, () => { cnt.incrementAndGet() }, null)
-        grid$.affinityRun$(CACHE_NAME, 1, () => { cnt.incrementAndGet() }, null)
-        grid$.affinityRun$(CACHE_NAME, 2, () => { cnt.incrementAndGet() }, null)
+        ignite.affinityRun$(CACHE_NAME, 0, () => { cnt.incrementAndGet() }, null)
+        ignite.affinityRun$(CACHE_NAME, 1, () => { cnt.incrementAndGet() }, null)
+        ignite.affinityRun$(CACHE_NAME, 2, () => { cnt.incrementAndGet() }, null)
 
         assert(cnt.get === 3)
     }
@@ -56,9 +56,9 @@ class ScalarAffinityRoutingSpec extends FlatSpec with ShouldMatchers with Before
 
         val cnt = c.dataStructures().atomicLong("affinityRunAsync", 0, true)
 
-        grid$.affinityRunAsync$(CACHE_NAME, 0, () => { cnt.incrementAndGet() }, null).get
-        grid$.affinityRunAsync$(CACHE_NAME, 1, () => { cnt.incrementAndGet() }, null).get
-        grid$.affinityRunAsync$(CACHE_NAME, 2, () => { cnt.incrementAndGet() }, null).get
+        ignite.affinityRunAsync$(CACHE_NAME, 0, () => { cnt.incrementAndGet() }, null).get
+        ignite.affinityRunAsync$(CACHE_NAME, 1, () => { cnt.incrementAndGet() }, null).get
+        ignite.affinityRunAsync$(CACHE_NAME, 2, () => { cnt.incrementAndGet() }, null).get
 
         assert(cnt.get === 3)
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
----------------------------------------------------------------------
diff --git a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
index b27e069..a034d81 100644
--- a/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
+++ b/modules/scalar/src/test/scala/org/apache/ignite/scalar/tests/ScalarCacheProjectionSpec.scala
@@ -31,7 +31,7 @@ class ScalarCacheProjectionSpec extends FlatSpec {
     behavior of "Cache projection"
 
     it should "work properly via grid.cache(...).viewByType(...)" in scalar("examples/config/example-cache.xml") {
-        val cache = grid$.cache("local").viewByType(classOf[String], classOf[Int])
+        val cache = ignite.cache("local").viewByType(classOf[String], classOf[Int])
 
         assert(cache.putx("1", 1))
         assert(cache.get("1") == 1)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 c58deff..2b160a4 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
@@ -54,7 +54,7 @@ class ScalarCacheSpec extends FlatSpec with ShouldMatchers {
      * so we can actually see what happens underneath locally and remotely.
      */
     def registerListener() {
-        val g = grid$
+        val g = ignite
 
         g *< (() => {
             val lsnr = new IgnitePredicate[IgniteEvent]() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 fafb78f..ae724e1 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_GRID_START : "Invalid lifecycle event: " + evts.get(1);
+        assert evts.get(1) == LifecycleEventType.AFTER_IGNITE_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_GRID_STOP : "Invalid lifecycle event: " + evts.get(3);
+        assert evts.get(3) == LifecycleEventType.AFTER_IGNITE_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_GRID_START || evt == LifecycleEventType.BEFORE_GRID_STOP);
+                    evt == LifecycleEventType.AFTER_IGNITE_START || evt == LifecycleEventType.BEFORE_GRID_STOP);
             }
             catch (Throwable e) {
                 log.error("Lifecycle bean failed state check: " + this, e);


[3/3] incubator-ignite git commit: #IGNITE-106: Remove grid from comments.

Posted by sb...@apache.org.
#IGNITE-106: Remove grid from comments.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/921fd0c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/921fd0c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/921fd0c7

Branch: refs/heads/ignite-106
Commit: 921fd0c7896b1fcde5bcf4caa9c6d98e7f9852b6
Parents: 8c83e3a
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Feb 2 16:54:57 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Feb 2 16:54:59 2015 +0300

----------------------------------------------------------------------
 examples/config/example-cache.xml               |   2 +-
 examples/config/example-streamer.xml            |   4 +-
 examples/config/filesystem/example-ggfs.xml     |   2 +-
 .../hibernate/example-hibernate-L2-cache.xml    |   2 +-
 .../apache/ignite/examples/ExamplesUtils.java   |   4 +-
 .../compute/ComputeBroadcastExample.java        |   2 +-
 .../compute/ComputeCallableExample.java         |   8 +-
 .../examples/compute/ComputeClosureExample.java |   8 +-
 .../compute/ComputeContinuousMapperExample.java |  10 +-
 .../compute/ComputeExecutorServiceExample.java  |   4 +-
 .../ComputeFibonacciContinuationExample.java    |   4 +-
 .../compute/ComputeProjectionExample.java       |   2 +-
 .../examples/compute/ComputeReducerExample.java |   6 +-
 .../compute/ComputeRunnableExample.java         |   4 +-
 .../compute/ComputeScheduleExample.java         |   2 +-
 .../examples/compute/ComputeTaskMapExample.java |  10 +-
 .../compute/ComputeTaskSplitExample.java        |  16 +-
 .../failover/ComputeFailoverExample.java        |   2 +-
 .../compute/montecarlo/CreditRiskExample.java   |  18 +--
 .../compute/montecarlo/CreditRiskManager.java   |   2 +-
 .../apache/ignite/examples/compute/package.html |   2 +-
 .../examples/datagrid/CacheAffinityExample.java |   4 +-
 .../examples/datagrid/CacheEventsExample.java   |   2 +-
 .../datagrid/CachePopularNumbersExample.java    |   2 +-
 .../examples/datagrid/CacheQueryExample.java    |   2 +-
 .../datastructures/CacheAtomicLongExample.java  |   8 +-
 .../CacheAtomicReferenceExample.java            |  12 +-
 .../CacheAtomicSequenceExample.java             |   6 +-
 .../CacheAtomicStampedExample.java              |  10 +-
 .../CacheCountDownLatchExample.java             |   6 +-
 .../datastructures/CacheQueueExample.java       |   2 +-
 .../datastructures/CacheSetExample.java         |   2 +-
 .../ignite/examples/datagrid/package.html       |   2 +-
 .../store/CacheNodeWithStoreStartup.java        |   4 +-
 .../datagrid/store/CacheStoreExample.java       |   2 +-
 .../store/dummy/CacheDummyPersonStore.java      |   2 +-
 .../ignite/examples/events/EventsExample.java   |   6 +-
 .../examples/messaging/MessagingExample.java    |   6 +-
 .../messaging/MessagingPingPongExample.java     |   2 +-
 .../MessagingPingPongListenActorExample.java    |   2 +-
 .../misc/deployment/DeploymentExample.java      |   6 +-
 .../misc/lifecycle/LifecycleExample.java        |   8 +-
 .../misc/springbean/SpringBeanExample.java      |  14 +-
 .../examples/misc/springbean/spring-bean.xml    |   4 +-
 .../org/apache/ignite/examples/package.html     |   2 +-
 .../streaming/StreamingCheckInExample.java      |   4 +-
 .../StreamingPopularNumbersExample.java         |   6 +-
 .../streaming/StreamingPriceBarsExample.java    |   2 +-
 .../apache/ignite/examples/ComputeExample.java  |   9 +-
 .../ignite/examples/MessagingExample.java       |  10 +-
 .../examples/ScalarCacheAffinityExample1.scala  |   6 +-
 .../examples/ScalarCacheAffinityExample2.scala  |   8 +-
 .../ScalarCacheAffinitySimpleExample.scala      |   4 +-
 .../scalar/examples/ScalarCacheExample.scala    |   2 +-
 .../ScalarCachePopularNumbersExample.scala      |   6 +-
 .../examples/ScalarCacheQueryExample.scala      |   2 +-
 .../scalar/examples/ScalarClosureExample.scala  |  16 +-
 .../examples/ScalarContinuationExample.scala    |  16 +-
 .../examples/ScalarCreditRiskExample.scala      |   4 +-
 .../examples/ScalarPiCalculationExample.scala   |   4 +-
 .../scalar/examples/ScalarPingPongExample.scala |   6 +-
 .../scalar/examples/ScalarPrimeExample.scala    |   4 +-
 .../scalar/examples/ScalarScheduleExample.scala |   6 +-
 .../examples/ScalarSnowflakeSchemaExample.scala |   8 +-
 .../scalar/examples/ScalarTaskExample.scala     |   2 +-
 .../examples/ScalarWorldShortestMapReduce.scala |   2 +-
 .../BasicExamplesMultiNodeSelfTest.java         |  28 ++++
 .../ignite/examples/BasicExamplesSelfTest.java  |  82 ++++++++++
 .../CacheExamplesMultiNodeSelfTest.java         |  48 ++++++
 .../ignite/examples/CacheExamplesSelfTest.java  | 155 +++++++++++++++++++
 ...heStoreLoadDataExampleMultiNodeSelfTest.java |  39 +++++
 .../examples/CheckpointExamplesSelfTest.java    |  45 ++++++
 .../ContinuationExamplesMultiNodeSelfTest.java  |  28 ++++
 .../examples/ContinuationExamplesSelfTest.java  |  33 ++++
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |  28 ++++
 .../ContinuousMapperExamplesSelfTest.java       |  33 ++++
 .../DeploymentExamplesMultiNodeSelfTest.java    |  30 ++++
 .../examples/DeploymentExamplesSelfTest.java    |  33 ++++
 .../EventsExamplesMultiNodeSelfTest.java        |  28 ++++
 .../ignite/examples/EventsExamplesSelfTest.java |  33 ++++
 .../GridBasicExamplesMultiNodeSelfTest.java     |  28 ----
 .../examples/GridBasicExamplesSelfTest.java     |  82 ----------
 .../GridCacheExamplesMultiNodeSelfTest.java     |  48 ------
 .../examples/GridCacheExamplesSelfTest.java     | 155 -------------------
 ...heStoreLoadDataExampleMultiNodeSelfTest.java |  39 -----
 .../GridCheckpointExamplesSelfTest.java         |  45 ------
 ...idContinuationExamplesMultiNodeSelfTest.java |  28 ----
 .../GridContinuationExamplesSelfTest.java       |  33 ----
 ...ntinuousMapperExamplesMultiNodeSelfTest.java |  28 ----
 .../GridContinuousMapperExamplesSelfTest.java   |  33 ----
 ...GridDeploymentExamplesMultiNodeSelfTest.java |  30 ----
 .../GridDeploymentExamplesSelfTest.java         |  33 ----
 .../GridEventsExamplesMultiNodeSelfTest.java    |  28 ----
 .../examples/GridEventsExamplesSelfTest.java    |  33 ----
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  31 ----
 .../GridHibernateL2CacheExampleSelfTest.java    |  33 ----
 .../examples/GridLifecycleExamplesSelfTest.java |  33 ----
 ...idMemcacheRestExamplesMultiNodeSelfTest.java |  31 ----
 .../GridMemcacheRestExamplesSelfTest.java       |  41 -----
 .../examples/GridMessagingExamplesSelfTest.java |  52 -------
 ...GridMonteCarloExamplesMultiNodeSelfTest.java |  28 ----
 .../GridMonteCarloExamplesSelfTest.java         |  74 ---------
 .../examples/GridProjectionExampleSelfTest.java |  39 -----
 .../GridSpringBeanExamplesSelfTest.java         |  33 ----
 .../GridTaskExamplesMultiNodeSelfTest.java      |  28 ----
 .../examples/GridTaskExamplesSelfTest.java      |  40 -----
 ...ibernateL2CacheExampleMultiNodeSelfTest.java |  31 ++++
 .../HibernateL2CacheExampleSelfTest.java        |  33 ++++
 .../examples/IgniteFsExamplesSelfTest.java      |   2 +-
 .../examples/LifecycleExamplesSelfTest.java     |  33 ++++
 .../MemcacheRestExamplesMultiNodeSelfTest.java  |  31 ++++
 .../examples/MemcacheRestExamplesSelfTest.java  |  41 +++++
 .../examples/MessagingExamplesSelfTest.java     |  52 +++++++
 .../MonteCarloExamplesMultiNodeSelfTest.java    |  28 ++++
 .../examples/MonteCarloExamplesSelfTest.java    |  74 +++++++++
 .../examples/ProjectionExampleSelfTest.java     |  39 +++++
 .../examples/SpringBeanExamplesSelfTest.java    |  33 ++++
 .../examples/TaskExamplesMultiNodeSelfTest.java |  28 ++++
 .../ignite/examples/TaskExamplesSelfTest.java   |  40 +++++
 .../testsuites/IgniteExamplesSelfTestSuite.java |  52 +++----
 .../tests/examples/ScalarExamplesSelfTest.scala |   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 +-
 .../junits/common/AbstractExamplesTest.java     |  79 ++++++++++
 .../junits/common/GridAbstractExamplesTest.java |  79 ----------
 .../scala/org/apache/ignite/scalar/scalar.scala |  10 +-
 .../tests/ScalarAffinityRoutingSpec.scala       |  12 +-
 .../tests/ScalarCacheProjectionSpec.scala       |   2 +-
 .../ignite/scalar/tests/ScalarCacheSpec.scala   |   2 +-
 .../ignite/internal/GridFactorySelfTest.java    |   6 +-
 138 files changed, 1442 insertions(+), 1443 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/config/example-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml
index 70ffa80..ec02084 100644
--- a/examples/config/example-cache.xml
+++ b/examples/config/example-cache.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    Ignite Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup ignite cache.
 
     When starting a standalone node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-cache.xml

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/config/example-streamer.xml
----------------------------------------------------------------------
diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml
index 0d9c024..c22b19b 100644
--- a/examples/config/example-streamer.xml
+++ b/examples/config/example-streamer.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    Ignite Spring configuration file to startup grid with streamers.
+    Ignite Spring configuration file to startup ignite with streamers.
 
     When starting a standalone node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/example-streamer.xml
@@ -43,7 +43,7 @@
     </description>
 
     <!--
-        Configuration below demonstrates how to setup caches within grid nodes.
+        Configuration below demonstrates how to setup caches within cluster nodes.
     -->
     <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
         <property name="marshaller">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/config/filesystem/example-ggfs.xml
----------------------------------------------------------------------
diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml
index 9f19a42..02a8305 100644
--- a/examples/config/filesystem/example-ggfs.xml
+++ b/examples/config/filesystem/example-ggfs.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    Ignite Spring configuration file to startup grid cache.
+    Ignite Spring configuration file to startup ignite cache.
 
     When starting a standalone node, you need to execute the following command:
     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/filesystem/example-ggfs.xml

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/config/hibernate/example-hibernate-L2-cache.xml
----------------------------------------------------------------------
diff --git a/examples/config/hibernate/example-hibernate-L2-cache.xml b/examples/config/hibernate/example-hibernate-L2-cache.xml
index 0c69248..114b319 100644
--- a/examples/config/hibernate/example-hibernate-L2-cache.xml
+++ b/examples/config/hibernate/example-hibernate-L2-cache.xml
@@ -44,7 +44,7 @@
         <!-- Specify Ignite as L2 cache provider. -->
         <property name="cache.region.factory_class">org.apache.ignite.cache.hibernate.GridHibernateRegionFactory</property>
 
-        <!-- Specify the name of the grid, that will be used for second level caching. -->
+        <!-- Specify the name of the ignite, that will be used for second level caching. -->
         <property name="org.apache.ignite.hibernate.grid_name">hibernate-grid</property>
 
         <!-- Specify connection release mode. -->

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java b/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
index 5098156..871b835 100644
--- a/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
+++ b/examples/src/main/java/org/apache/ignite/examples/ExamplesUtils.java
@@ -72,7 +72,7 @@ public class ExamplesUtils {
 
         if (prjSize < size) {
             System.out.println();
-            System.out.println(">>> Please start at least " + size + " grid nodes to run example.");
+            System.out.println(">>> Please start at least " + size + " cluster nodes to run example.");
             System.out.println();
 
             return false;
@@ -84,7 +84,7 @@ public class ExamplesUtils {
     /**
      * @param ignite Ignite.
      * @param name Streamer name.
-     * @return {@code True} if grid has streamer with given name.
+     * @return {@code True} if ignite has streamer with given name.
      */
     public static boolean hasStreamer(Ignite ignite, String name) {
         if (ignite.configuration().getStreamerConfiguration() != null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java
index b7a2612..beb322e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java
@@ -25,7 +25,7 @@ import org.apache.ignite.resources.*;
 import java.util.*;
 
 /**
- * Demonstrates broadcasting computations within grid projection.
+ * Demonstrates broadcasting computations within projection.
  * <p>
  * Remote nodes should always be started with special configuration file which
  * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java
index 1f50b13..ffb2fad 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java
@@ -24,7 +24,7 @@ import org.apache.ignite.lang.*;
 import java.util.*;
 
 /**
- * Demonstrates using of {@link org.apache.ignite.lang.IgniteCallable} job execution on the grid.
+ * Demonstrates using of {@link org.apache.ignite.lang.IgniteCallable} job execution on the cluster.
  * <p>
  * This example takes a sentence composed of multiple words and counts number of non-space
  * characters in the sentence by having each compute job count characters in each individual
@@ -55,14 +55,14 @@ public class ComputeCallableExample {
                 calls.add(new IgniteCallable<Integer>() {
                     @Override public Integer call() throws Exception {
                         System.out.println();
-                        System.out.println(">>> Printing '" + word + "' on this node from grid job.");
+                        System.out.println(">>> Printing '" + word + "' on this node from igntie job.");
 
                         return word.length();
                     }
                 });
             }
 
-            // Execute collection of callables on the grid.
+            // Execute collection of callables on the ignite.
             Collection<Integer> res = ignite.compute().call(calls);
 
             int sum = 0;
@@ -73,7 +73,7 @@ public class ComputeCallableExample {
 
             System.out.println();
             System.out.println(">>> Total number of characters in the phrase is '" + sum + "'.");
-            System.out.println(">>> Check all nodes for output (this node is also part of the grid).");
+            System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java
index a206a9f..26d959e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java
@@ -24,7 +24,7 @@ import org.apache.ignite.lang.*;
 import java.util.*;
 
 /**
- * Demonstrates a simple use of Ignite grid with reduce closure.
+ * Demonstrates a simple use of Ignite with reduce closure.
  * <p>
  * This example splits a phrase into collection of words, computes their length on different
  * nodes and then computes total amount of non-whitespaces characters in the phrase.
@@ -47,12 +47,12 @@ public class ComputeClosureExample {
             System.out.println();
             System.out.println(">>> Compute closure example started.");
 
-            // Execute closure on all grid nodes.
+            // Execute closure on all cluster nodes.
             Collection<Integer> res = ignite.compute().apply(
                 new IgniteClosure<String, Integer>() {
                     @Override public Integer apply(String word) {
                         System.out.println();
-                        System.out.println(">>> Printing '" + word + "' on this node from grid job.");
+                        System.out.println(">>> Printing '" + word + "' on this node from igntie job.");
 
                         // Return number of letters in the word.
                         return word.length();
@@ -71,7 +71,7 @@ public class ComputeClosureExample {
 
             System.out.println();
             System.out.println(">>> Total number of characters in the phrase is '" + sum + "'.");
-            System.out.println(">>> Check all nodes for output (this node is also part of the grid).");
+            System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java
index ce78041..dbbd41b 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.*;
  * initial {@link org.apache.ignite.compute.ComputeTask#map(List, Object)} method completes.
  * <p>
  * String "Hello Continuous Mapper" is passed as an argument for execution
- * of {@link GridContinuousMapperTask}. As an outcome, participating
+ * of {@link org.apache.ignite.examples.compute.ComputeContinuousMapperExample.ContinuousMapperTask}. As an outcome, participating
  * nodes will print out a single word from the passed in string and return
  * number of characters in that word. However, to demonstrate continuous
  * mapping, next word will be mapped to a node only after the result from
@@ -57,7 +57,7 @@ public class ComputeContinuousMapperExample {
         System.out.println(">>> Compute continuous mapper example started.");
 
         try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) {
-            int phraseLen = ignite.compute().execute(GridContinuousMapperTask.class, "Hello Continuous Mapper");
+            int phraseLen = ignite.compute().execute(ContinuousMapperTask.class, "Hello Continuous Mapper");
 
             System.out.println();
             System.out.println(">>> Total number of characters in the phrase is '" + phraseLen + "'.");
@@ -75,7 +75,7 @@ public class ComputeContinuousMapperExample {
      * and therefore don't need to accumulate them be be processed at reduction step.
      */
     @ComputeTaskNoResultCache
-    private static class GridContinuousMapperTask extends ComputeTaskAdapter<String, Integer> {
+    private static class ContinuousMapperTask extends ComputeTaskAdapter<String, Integer> {
         /** This field will be injected with task continuous mapper. */
         @IgniteTaskContinuousMapperResource
         private ComputeTaskContinuousMapper mapper;
@@ -87,7 +87,7 @@ public class ComputeContinuousMapperExample {
         private final AtomicInteger totalChrCnt = new AtomicInteger(0);
 
         /** {@inheritDoc} */
-        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> grid, String phrase)
+        @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> nodes, String phrase)
             throws IgniteCheckedException {
             if (phrase == null || phrase.isEmpty())
                 throw new IgniteCheckedException("Phrase is empty.");
@@ -140,7 +140,7 @@ public class ComputeContinuousMapperExample {
                         String word = argument(0);
 
                         System.out.println();
-                        System.out.println(">>> Printing '" + word + "' from grid job at time: " + new Date());
+                        System.out.println(">>> Printing '" + word + "' from igntie job at time: " + new Date());
 
                         int cnt = word.length();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java
index 62ab8a4..36079fc 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java
@@ -54,7 +54,7 @@ public final class ComputeExecutorServiceExample {
                 exec.submit(new IgniteRunnable() {
                     @Override public void run() {
                         System.out.println();
-                        System.out.println(">>> Printing '" + word + "' on this node from grid job.");
+                        System.out.println(">>> Printing '" + word + "' on this node from igntie job.");
                     }
                 });
             }
@@ -65,7 +65,7 @@ public final class ComputeExecutorServiceExample {
             exec.awaitTermination(0, TimeUnit.MILLISECONDS);
 
             System.out.println();
-            System.out.println(">>> Check all nodes for output (this node is also part of the grid).");
+            System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java
index 8c5e3a4..c58ff82 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java
@@ -32,7 +32,7 @@ import java.util.*;
 /**
  * This example demonstrates how to use continuation feature of Ignite by
  * performing the distributed recursive calculation of {@code 'Fibonacci'}
- * numbers on the grid. Continuations
+ * numbers on the cluster. Continuations
  * functionality is exposed via {@link org.apache.ignite.compute.ComputeJobContext#holdcc()} and
  * {@link org.apache.ignite.compute.ComputeJobContext#callcc()} method calls in {@link FibonacciClosure} class.
  * <p>
@@ -77,7 +77,7 @@ public final class ComputeFibonacciContinuationExample {
             System.out.println(">>> Fibonacci sequence for input number '" + N + "' is '" + fib + "'.");
             System.out.println(">>> If you re-run this example w/o stopping remote nodes - the performance will");
             System.out.println(">>> increase since intermediate results are pre-cache on remote nodes.");
-            System.out.println(">>> You should see prints out every recursive Fibonacci execution on grid nodes.");
+            System.out.println(">>> You should see prints out every recursive Fibonacci execution on cluster nodes.");
             System.out.println(">>> Check remote nodes for output.");
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java
index a363578..9f54d6d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java
@@ -48,7 +48,7 @@ public class ComputeProjectionExample {
 
             IgniteCluster cluster = ignite.cluster();
 
-            // Say hello to all nodes in the grid, including local node.
+            // Say hello to all nodes in the cluster, including local node.
             sayHello(ignite, cluster);
 
             // Say hello to all remote nodes.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java
index 7aed33e..19a4034 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java
@@ -25,7 +25,7 @@ import java.util.*;
 import java.util.concurrent.atomic.*;
 
 /**
- * Demonstrates a simple use of Ignite grid with reduce closure.
+ * Demonstrates a simple use of Ignite with reduce closure.
  * <p>
  * Phrase is split into words and distributed across nodes where length of each word is
  * calculated. Then total phrase length is calculated using reducer.
@@ -52,7 +52,7 @@ public class ComputeReducerExample {
                 new IgniteClosure<String, Integer>() {
                     @Override public Integer apply(String word) {
                         System.out.println();
-                        System.out.println(">>> Printing '" + word + "' on this node from grid job.");
+                        System.out.println(">>> Printing '" + word + "' on this node from igntie job.");
 
                         // Return number of letters in the word.
                         return word.length();
@@ -83,7 +83,7 @@ public class ComputeReducerExample {
 
             System.out.println();
             System.out.println(">>> Total number of characters in the phrase is '" + sum + "'.");
-            System.out.println(">>> Check all nodes for output (this node is also part of the grid).");
+            System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java
index b6fe8d9..9465779 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java
@@ -56,7 +56,7 @@ public class ComputeRunnableExample {
                 compute.run(new IgniteRunnable() {
                     @Override public void run() {
                         System.out.println();
-                        System.out.println(">>> Printing '" + word + "' on this node from grid job.");
+                        System.out.println(">>> Printing '" + word + "' on this node from igntie job.");
                     }
                 });
 
@@ -69,7 +69,7 @@ public class ComputeRunnableExample {
 
             System.out.println();
             System.out.println(">>> Finished printing words using runnable execution.");
-            System.out.println(">>> Check all nodes for output (this node is also part of the grid).");
+            System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java
index 6cd7fc7..fb1dca1 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java
@@ -26,7 +26,7 @@ import java.util.concurrent.*;
 
 /**
  * Demonstrates a cron-based {@link Runnable} execution scheduling.
- * Test runnable object broadcasts a phrase to all grid nodes every minute
+ * Test runnable object broadcasts a phrase to all cluster nodes every minute
  * three times with initial scheduling delay equal to five seconds.
  * <p>
  * Remote nodes should always be started with special configuration file which

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
index 5127b89..d0ed141 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java
@@ -26,10 +26,10 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 /**
- * Demonstrates a simple use of Ignite grid with
+ * Demonstrates a simple use of Ignite with
  * {@link org.apache.ignite.compute.ComputeTaskAdapter}.
  * <p>
- * Phrase passed as task argument is split into words on map stage and distributed among grid nodes.
+ * Phrase passed as task argument is split into words on map stage and distributed among cluster nodes.
  * Each node computes word length and returns result to master node where total phrase length is
  * calculated on reduce stage.
  * <p>
@@ -51,12 +51,12 @@ public class ComputeTaskMapExample {
             System.out.println();
             System.out.println("Compute task map example started.");
 
-            // Execute task on the grid and wait for its completion.
+            // Execute task on the cluster and wait for its completion.
             int cnt = ignite.compute().execute(CharacterCountTask.class, "Hello Grid Enabled World!");
 
             System.out.println();
             System.out.println(">>> Total number of characters in the phrase is '" + cnt + "'.");
-            System.out.println(">>> Check all nodes for output (this node is also part of the grid).");
+            System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
 
@@ -89,7 +89,7 @@ public class ComputeTaskMapExample {
                 map.put(new ComputeJobAdapter() {
                     @Nullable @Override public Object execute() {
                         System.out.println();
-                        System.out.println(">>> Printing '" + word + "' on this node from grid job.");
+                        System.out.println(">>> Printing '" + word + "' on this node from igntie job.");
 
                         // Return number of letters in the word.
                         return word.length();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java
index cf991c2..614c4e6 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java
@@ -25,10 +25,10 @@ import org.jetbrains.annotations.*;
 import java.util.*;
 
 /**
- * Demonstrates a simple use of Ignite grid with {@link org.apache.ignite.compute.ComputeTaskSplitAdapter}.
+ * Demonstrates a simple use of Ignite with {@link org.apache.ignite.compute.ComputeTaskSplitAdapter}.
  * <p>
  * Phrase passed as task argument is split into jobs each taking one word. Then jobs are distributed among
- * grid nodes. Each node computes word length and returns result to master node where total phrase length
+ * cluster nodes. Each node computes word length and returns result to master node where total phrase length
  * is calculated on reduce stage.
  * <p>
  * Remote nodes should always be started with special configuration file which
@@ -49,12 +49,12 @@ public class ComputeTaskSplitExample {
             System.out.println();
             System.out.println("Compute task split example started.");
 
-            // Execute task on the grid and wait for its completion.
+            // Execute task on the cluster and wait for its completion.
             int cnt = ignite.compute().execute(CharacterCountTask.class, "Hello Grid Enabled World!");
 
             System.out.println();
             System.out.println(">>> Total number of characters in the phrase is '" + cnt + "'.");
-            System.out.println(">>> Check all nodes for output (this node is also part of the grid).");
+            System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
         }
     }
 
@@ -66,19 +66,19 @@ public class ComputeTaskSplitExample {
          * Splits the received string to words, creates a child job for each word, and sends
          * these jobs to other nodes for processing. Each such job simply prints out the received word.
          *
-         * @param gridSize Number of available grid nodes. Note that returned number of
-         *      jobs can be less, equal or greater than this grid size.
+         * @param clusterSize Number of available cluster nodes. Note that returned number of
+         *      jobs can be less, equal or greater than this cluster size.
          * @param arg Task execution argument. Can be {@code null}.
          * @return The list of child jobs.
          */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) {
+        @Override protected Collection<? extends ComputeJob> split(int clusterSize, String arg) {
             Collection<ComputeJob> jobs = new LinkedList<>();
 
             for (final String word : arg.split(" ")) {
                 jobs.add(new ComputeJobAdapter() {
                     @Nullable @Override public Object execute() {
                         System.out.println();
-                        System.out.println(">>> Printing '" + word + "' on this node from grid job.");
+                        System.out.println(">>> Printing '" + word + "' on this node from igntie job.");
 
                         // Return number of letters in the word.
                         return word.length();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java
index 23fbbe9..5471adf 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java
@@ -79,7 +79,7 @@ public class ComputeFailoverExample {
         /**
          * The job will check the checkpoint with key '{@code fail}' and if
          * it's {@code true} it will throw exception to simulate a failure.
-         * Otherwise, it will execute the grid-enabled method.
+         * Otherwise, it will execute enabled method.
          */
         @Override public Integer apply(String phrase) {
             System.out.println();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java
index e8bbf43..5b2ee04 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java
@@ -72,9 +72,9 @@ public final class CreditRiskExample {
             long start = System.currentTimeMillis();
 
             // Calculate credit risk and print it out.
-            // As you can see the grid enabling is completely hidden from the caller
+            // As you can see the ignite enabling is completely hidden from the caller
             // and it is fully transparent to him. In fact, the caller is never directly
-            // aware if method was executed just locally or on the 100s of grid nodes.
+            // aware if method was executed just locally or on the 100s of cluster nodes.
             // Credit risk crdRisk is the minimal amount that creditor has to have
             // available to cover possible defaults.
 
@@ -112,22 +112,22 @@ public final class CreditRiskExample {
     /**
      * Creates closures for calculating credit risks.
      *
-     * @param gridSize Size of the grid.
+     * @param clusterSize Size of the cluster.
      * @param portfolio Portfolio.
      * @param horizon Forecast horizon in days.
      * @param iter Number of Monte-Carlo iterations.
      * @param percentile Percentile.
      * @return Collection of closures.
      */
-    private static Collection<IgniteCallable<Double>> jobs(int gridSize, final Credit[] portfolio,
+    private static Collection<IgniteCallable<Double>> jobs(int clusterSize, final Credit[] portfolio,
         final int horizon, int iter, final double percentile) {
         // Number of iterations should be done by each node.
-        int iterPerNode = Math.round(iter / (float)gridSize);
+        int iterPerNode = Math.round(iter / (float)clusterSize);
 
         // Number of iterations for the last/the only node.
-        int lastNodeIter = iter - (gridSize - 1) * iterPerNode;
+        int lastNodeIter = iter - (clusterSize - 1) * iterPerNode;
 
-        Collection<IgniteCallable<Double>> clos = new ArrayList<>(gridSize);
+        Collection<IgniteCallable<Double>> clos = new ArrayList<>(clusterSize);
 
         // Note that for the purpose of this example we perform a simple homogeneous
         // (non weighted) split assuming that all computing resources in this split
@@ -136,8 +136,8 @@ public final class CreditRiskExample {
         // node in the split will be more efficient. It is fairly easy addition and
         // Ignite comes with convenient Spring-compatible benchmark that can be
         // used for weighted splits.
-        for (int i = 0; i < gridSize; i++) {
-            final int nodeIter = i == gridSize - 1 ? lastNodeIter : iterPerNode;
+        for (int i = 0; i < clusterSize; i++) {
+            final int nodeIter = i == clusterSize - 1 ? lastNodeIter : iterPerNode;
 
             clos.add(new IgniteCallable<Double>() {
                 /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskManager.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskManager.java b/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskManager.java
index 085dac3..3bf7f55 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskManager.java
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskManager.java
@@ -26,7 +26,7 @@ import java.util.*;
 public class CreditRiskManager {
     /**
      * Default randomizer with normal distribution.
-     * Note that since every JVM on the grid will have its own random
+     * Note that since every JVM on the cluster will have its own random
      * generator (independently initialized) the Monte-Carlo simulation
      * will be slightly skewed when performed on the grid due to skewed
      * normal distribution of the sub-jobs comparing to execution on the

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/compute/package.html
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/package.html b/examples/src/main/java/org/apache/ignite/examples/compute/package.html
index 84ae465..5e8d2e2 100644
--- a/examples/src/main/java/org/apache/ignite/examples/compute/package.html
+++ b/examples/src/main/java/org/apache/ignite/examples/compute/package.html
@@ -18,6 +18,6 @@
 <html>
 <body>
     <!-- Package description. -->
-    Basic examples for computational grid functionality.
+    Basic examples for computational ignite functionality.
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
index e75e781..5c7f246 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheAffinityExample.java
@@ -61,10 +61,10 @@ public final class CacheAffinityExample {
             for (int i = 0; i < KEY_CNT; i++)
                 cache.put(i, Integer.toString(i));
 
-            // Co-locates jobs with data using GridCompute.affinityRun(...) method.
+            // Co-locates jobs with data using IgniteCompute.affinityRun(...) method.
             visitUsingAffinityRun();
 
-            // Co-locates jobs with data using Grid.mapKeysToNodes(...) method.
+            // Co-locates jobs with data using IgniteCluster.mapKeysToNodes(...) method.
             visitUsingMapKeysToNodes();
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
index 1aabeb8..52e585e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheEventsExample.java
@@ -27,7 +27,7 @@ import java.util.*;
 import static org.apache.ignite.events.IgniteEventType.*;
 
 /**
- * This examples demonstrates events API. Note that grid events are disabled by default and
+ * This examples demonstrates events API. Note that ignite events are disabled by default and
  * must be specifically enabled, just like in {@code examples/config/example-cache.xml} file.
  * <p>
  * Remote nodes should always be started with special configuration file which

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
index 1dc1246..1e86ca7 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
@@ -39,7 +39,7 @@ public class CachePopularNumbersExample {
     /** Cache name. */
     private static final String CACHE_NAME = "partitioned";
 
-    /** Count of most popular numbers to retrieve from grid. */
+    /** Count of most popular numbers to retrieve from cluster. */
     private static final int POPULAR_NUMBERS_CNT = 10;
 
     /** Random number generator. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 773133c..495fa43 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -27,7 +27,7 @@ import java.io.*;
 import java.util.*;
 
 /**
- * Grid cache queries example. This example demonstrates SQL, TEXT, and FULL SCAN
+ * Cache queries example. This example demonstrates SQL, TEXT, and FULL SCAN
  * queries over cache.
  * <p>
  * Example also demonstrates usage of fields queries that return only required

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
index f6c6662..53274da 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicLongExample.java
@@ -51,17 +51,17 @@ public final class CacheAtomicLongExample {
             System.out.println();
             System.out.println(">>> Cache atomic long example started.");
 
-            // Make name for atomic long (by which it will be known in the grid).
+            // Make name for atomic long (by which it will be known in the cluster).
             String atomicName = UUID.randomUUID().toString();
 
-            // Initialize atomic long in grid.
+            // Initialize atomic long in ignite.
             final CacheAtomicLong atomicLong = ignite.cache(CACHE_NAME).dataStructures().atomicLong(atomicName, 0, true);
 
             System.out.println();
             System.out.println("Atomic long initial value : " + atomicLong.get() + '.');
 
-            // Try increment atomic long from all grid nodes.
-            // Note that this node is also part of the grid.
+            // Try increment atomic long from all cluster nodes.
+            // Note that this node is also part of the cluster.
             ignite.compute(ignite.cluster().forCache(CACHE_NAME)).call(new IgniteCallable<Object>() {
                 @Override
                 public Object call() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
index 9e60c6c..8def696 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicReferenceExample.java
@@ -54,16 +54,16 @@ public final class CacheAtomicReferenceExample {
             // Make value of atomic reference.
             String val = UUID.randomUUID().toString();
 
-            // Initialize atomic reference in grid.
+            // Initialize atomic reference in cluster.
             CacheAtomicReference<String> ref = ignite.cache(CACHE_NAME).dataStructures().
                 atomicReference(refName, val, true);
 
             System.out.println("Atomic reference initial value : " + ref.get() + '.');
 
-            // Make closure for checking atomic reference value on grid.
+            // Make closure for checking atomic reference value on cluster.
             Runnable c = new ReferenceClosure(CACHE_NAME, refName);
 
-            // Check atomic reference on all grid nodes.
+            // Check atomic reference on all clsuter nodes.
             ignite.compute().run(c);
 
             // Make new value of atomic reference.
@@ -73,7 +73,7 @@ public final class CacheAtomicReferenceExample {
 
             ref.compareAndSet("WRONG EXPECTED VALUE", newVal); // Won't change.
 
-            // Check atomic reference on all grid nodes.
+            // Check atomic reference on all cluster nodes.
             // Atomic reference value shouldn't be changed.
             ignite.compute().run(c);
 
@@ -81,14 +81,14 @@ public final class CacheAtomicReferenceExample {
 
             ref.compareAndSet(val, newVal);
 
-            // Check atomic reference on all grid nodes.
+            // Check atomic reference on all cluster nodes.
             // Atomic reference value should be changed.
             ignite.compute().run(c);
         }
 
         System.out.println();
         System.out.println("Finished atomic reference example...");
-        System.out.println("Check all nodes for output (this node is also part of the grid).");
+        System.out.println("Check all nodes for output (this node is also part of the cluster).");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java
index fc82bbb..6317c3f 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicSequenceExample.java
@@ -54,7 +54,7 @@ public final class CacheAtomicSequenceExample {
             // Make name of sequence.
             final String seqName = UUID.randomUUID().toString();
 
-            // Initialize atomic sequence in grid.
+            // Initialize atomic sequence in ignite.
             CacheAtomicSequence seq = ignite.cache(CACHE_NAME).dataStructures().atomicSequence(seqName, 0, true);
 
             // First value of atomic sequence on this node.
@@ -62,7 +62,7 @@ public final class CacheAtomicSequenceExample {
 
             System.out.println("Sequence initial value: " + firstVal);
 
-            // Try increment atomic sequence on all grid nodes. Note that this node is also part of the grid.
+            // Try increment atomic sequence on all cluster nodes. Note that this node is also part of the cluster.
             ignite.compute().run(new SequenceClosure(CACHE_NAME, seqName));
 
             System.out.println("Sequence after incrementing [expected=" + (firstVal + RETRIES) + ", actual=" +
@@ -71,7 +71,7 @@ public final class CacheAtomicSequenceExample {
 
         System.out.println();
         System.out.println("Finished atomic sequence example...");
-        System.out.println("Check all nodes for output (this node is also part of the grid).");
+        System.out.println("Check all nodes for output (this node is also part of the cluster).");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java
index ba611fd..dd54374 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheAtomicStampedExample.java
@@ -63,10 +63,10 @@ public final class CacheAtomicStampedExample {
 
             System.out.println("Atomic stamped initial [value=" + stamped.value() + ", stamp=" + stamped.stamp() + ']');
 
-            // Make closure for checking atomic stamped on grid.
+            // Make closure for checking atomic stamped on ignite.
             Runnable c = new StampedUpdateClosure(CACHE_NAME, stampedName);
 
-            // Check atomic stamped on all grid nodes.
+            // Check atomic stamped on all cluster nodes.
             ignite.compute().run(c);
 
             // Make new value of atomic stamped.
@@ -79,7 +79,7 @@ public final class CacheAtomicStampedExample {
 
             stamped.compareAndSet("WRONG EXPECTED VALUE", newVal, "WRONG EXPECTED STAMP", newStamp);
 
-            // Check atomic stamped on all grid nodes.
+            // Check atomic stamped on all cluster nodes.
             // Atomic stamped value and stamp shouldn't be changed.
             ignite.compute().run(c);
 
@@ -87,14 +87,14 @@ public final class CacheAtomicStampedExample {
 
             stamped.compareAndSet(val, newVal, stamp, newStamp);
 
-            // Check atomic stamped on all grid nodes.
+            // Check atomic stamped on all cluster nodes.
             // Atomic stamped value and stamp should be changed.
             ignite.compute().run(c);
         }
 
         System.out.println();
         System.out.println("Finished atomic stamped example...");
-        System.out.println("Check all nodes for output (this node is also part of the grid).");
+        System.out.println("Check all nodes for output (this node is also part of the cluster).");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java
index 9ddb9d7..3ee9c6a 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheCountDownLatchExample.java
@@ -54,13 +54,13 @@ public class CacheCountDownLatchExample {
             // Make name of count down latch.
             final String latchName = UUID.randomUUID().toString();
 
-            // Initialize count down latch in grid.
+            // Initialize count down latch in ignite.
             CacheCountDownLatch latch = ignite.cache(CACHE_NAME).dataStructures().
                 countDownLatch(latchName, INITIAL_COUNT, false, true);
 
             System.out.println("Latch initial value: " + latch.count());
 
-            // Start waiting on the latch on all grid nodes.
+            // Start waiting on the latch on all cluster nodes.
             for (int i = 0; i < INITIAL_COUNT; i++)
                 ignite.compute().run(new LatchClosure(CACHE_NAME, latchName));
 
@@ -72,7 +72,7 @@ public class CacheCountDownLatchExample {
 
         System.out.println();
         System.out.println("Finished count down latch example...");
-        System.out.println("Check all nodes for output (this node is also part of the grid).");
+        System.out.println("Check all nodes for output (this node is also part of the cluster).");
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java
index d0b4a15..0a08743 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheQueueExample.java
@@ -25,7 +25,7 @@ import org.apache.ignite.lang.*;
 import java.util.*;
 
 /**
- * Grid cache distributed queue example. This example demonstrates {@code FIFO} unbounded
+ * Ignite cache distributed queue example. This example demonstrates {@code FIFO} unbounded
  * cache queue.
  * <p>
  * Remote nodes should always be started with special configuration file which

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java
index da49ea7..0d97a6c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/datastructures/CacheSetExample.java
@@ -25,7 +25,7 @@ import org.apache.ignite.lang.*;
 import java.util.*;
 
 /**
- * Grid cache distributed set example.
+ * Ignite cache distributed set example.
  * <p>
  * Remote nodes should always be started with special configuration file which
  * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-cache.xml'}.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/package.html
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/package.html b/examples/src/main/java/org/apache/ignite/examples/datagrid/package.html
index 0264c57..a21b3ad 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/package.html
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/package.html
@@ -18,6 +18,6 @@
 <html>
 <body>
     <!-- Package description. -->
-    Demonstrates data grid cache usage.
+    Demonstrates data ignite cache usage.
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
index 28cfb4e..8f55bbf 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheNodeWithStoreStartup.java
@@ -46,9 +46,9 @@ public class CacheNodeWithStoreStartup {
     }
 
     /**
-     * Configure grid.
+     * Configure ignite.
      *
-     * @return Grid configuration.
+     * @return Ignite configuration.
      * @throws IgniteCheckedException If failed.
      */
     public static IgniteConfiguration configure() throws IgniteCheckedException {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
index 32bb0e1..e27f4b8 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreExample.java
@@ -44,7 +44,7 @@ public class CacheStoreExample {
     public static void main(String[] args) throws Exception {
         IgniteConfiguration cfg = CacheNodeWithStoreStartup.configure();
 
-        // To start grid with desired configuration uncomment the appropriate line.
+        // To start ignite with desired configuration uncomment the appropriate line.
         try (Ignite ignite = Ignition.start(cfg)) {
             System.out.println();
             System.out.println(">>> Cache store example started.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
index fc91b80..6379140 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
@@ -32,7 +32,7 @@ import java.util.concurrent.*;
  * Dummy cache store implementation.
  */
 public class CacheDummyPersonStore extends CacheStoreAdapter<Long, Person> {
-    /** Auto-inject grid instance. */
+    /** Auto-inject igntie instance. */
     @IgniteInstanceResource
     private Ignite ignite;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java b/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
index 80288cc..6b5a163 100644
--- a/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java
@@ -30,7 +30,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
 
 /**
  * Demonstrates event consume API that allows to register event listeners on remote nodes.
- * Note that grid events are disabled by default and must be specifically enabled,
+ * Note that ignite events are disabled by default and must be specifically enabled,
  * just like in {@code examples/config/example-compute.xml} file.
  * <p>
  * Remote nodes should always be started with configuration: {@code 'ignite.sh examples/config/example-compute.xml'}.
@@ -53,7 +53,7 @@ public class EventsExample {
             // Listen to events happening on local node.
             localListen();
 
-            // Listen to events happening on all grid nodes.
+            // Listen to events happening on all cluster nodes.
             remoteListen();
 
             // Wait for a while while callback is notified about remaining puts.
@@ -95,7 +95,7 @@ public class EventsExample {
     }
 
     /**
-     * Listen to events coming from all grid nodes.
+     * Listen to events coming from all cluster nodes.
      *
      * @throws IgniteCheckedException If failed.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
index f09b10b..c8d6341 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java
@@ -29,7 +29,7 @@ import java.util.concurrent.*;
 /**
  * Example that demonstrates how to exchange messages between nodes. Use such
  * functionality for cases when you need to communicate to other nodes outside
- * of grid task.
+ * of ignite task.
  * <p>
  * To run this example you must have at least one remote node started.
  * <p>
@@ -71,7 +71,7 @@ public final class MessagingExample {
 
             localListen(ignite.message(ignite.cluster().forLocal()), orderedLatch, unorderedLatch);
 
-            // Register listeners on all grid nodes.
+            // Register listeners on all cluster nodes.
             startListening(ignite.message(rmtPrj));
 
             // Send unordered messages to all remote nodes.
@@ -96,7 +96,7 @@ public final class MessagingExample {
     }
 
     /**
-     * Start listening to messages on all grid nodes within passed in projection.
+     * Start listening to messages on all cluster nodes within passed in projection.
      *
      * @param msg Grid messaging.
      * @throws IgniteCheckedException If failed.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
index 67f20ae..a69d21c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java
@@ -46,7 +46,7 @@ public class MessagingPingPongExample {
      * @throws IgniteCheckedException If example execution failed.
      */
     public static void main(String[] args) throws IgniteCheckedException {
-        // Game is played over the default grid.
+        // Game is played over the default ignite.
         try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) {
             if (!ExamplesUtils.checkMinTopologySize(ignite.cluster(), 2))
                 return;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
index 5c9416e..9a745af 100644
--- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java
@@ -44,7 +44,7 @@ public class MessagingPingPongListenActorExample {
      * @throws IgniteCheckedException If example execution failed.
      */
     public static void main(String[] args) throws IgniteCheckedException {
-        // Game is played over the default grid.
+        // Game is played over the default ignite.
         try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) {
             if (!ExamplesUtils.checkMinTopologySize(ignite.cluster(), 2))
                 return;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
index a234ac5..afd6072 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java
@@ -104,10 +104,10 @@ public final class DeploymentExample {
     @ComputeTaskName(TASK_NAME)
     public static class ExampleTask extends ComputeTaskSplitAdapter<String, Object> {
         /** {@inheritDoc} */
-        @Override protected Collection<? extends ComputeJob> split(int gridSize, String arg) throws IgniteCheckedException {
-            Collection<ComputeJob> jobs = new ArrayList<>(gridSize);
+        @Override protected Collection<? extends ComputeJob> split(int clusterSize, String arg) throws IgniteCheckedException {
+            Collection<ComputeJob> jobs = new ArrayList<>(clusterSize);
 
-            for (int i = 0; i < gridSize; i++) {
+            for (int i = 0; i < clusterSize; i++) {
                 jobs.add(new ComputeJobAdapter() {
                     @Nullable @Override public Serializable execute() {
                         System.out.println(">>> Executing deployment example job on this node.");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/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 6462a14..c5e45da 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
@@ -63,7 +63,7 @@ public final class LifecycleExample {
      * Simple {@link org.apache.ignite.lifecycle.LifecycleBean} implementation that outputs event type when it is occurred.
      */
     public static class LifecycleExampleBean implements LifecycleBean {
-        /** Auto-inject grid instance. */
+        /** Auto-inject ignite instance. */
         @IgniteInstanceResource
         private Ignite ignite;
 
@@ -76,14 +76,14 @@ public final class LifecycleExample {
             System.out.println(">>> Grid lifecycle event occurred: " + evt);
             System.out.println(">>> Grid name: " + ignite.name());
 
-            if (evt == AFTER_GRID_START)
+            if (evt == AFTER_IGNITE_START)
                 isStarted = true;
-            else if (evt == AFTER_GRID_STOP)
+            else if (evt == AFTER_IGNITE_STOP)
                 isStarted = false;
         }
 
         /**
-         * @return {@code True} if grid has been started.
+         * @return {@code True} if ignite has been started.
          */
         public boolean isStarted() {
             return isStarted;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
index 96953d6..f233036 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java
@@ -24,16 +24,16 @@ import org.springframework.context.support.*;
 import java.util.concurrent.*;
 
 /**
- * Demonstrates a simple use of Ignite grid configured with Spring.
+ * Demonstrates a simple use of Ignite configured with Spring.
  * <p>
  * String "Hello World." is printed out by Callable passed into
  * the executor service provided by Grid. This statement could be printed
- * out on any node in the grid.
+ * out on any node in the cluster.
  * <p>
- * The major point of this example is to show grid injection by Spring
+ * The major point of this example is to show ignite injection by Spring
  * framework. Grid bean is described in {@code spring-bean.xml} file and instantiated
  * by Spring context. Once application completed its execution Spring will
- * apply grid bean destructor and stop the grid.
+ * apply ignite bean destructor and stop the ignite.
  * <p>
  * Remote nodes should always be started with special configuration file which
  * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}.
@@ -57,7 +57,7 @@ public final class SpringBeanExample {
             new ClassPathXmlApplicationContext("org/apache/ignite/examples/misc/springbean/spring-bean.xml");
 
         try {
-            // Get grid from Spring (note that local grid node is already started).
+            // Get grid from Spring (note that local cluster node is already started).
             Ignite ignite = (Ignite)ctx.getBean("mySpringBean");
 
             // Execute any method on the retrieved grid instance.
@@ -77,11 +77,11 @@ public final class SpringBeanExample {
             System.out.println(">>>");
             System.out.println(">>> Finished executing Grid \"Spring bean\" example.");
             System.out.println(">>> You should see printed out of 'Hello world' on one of the nodes.");
-            System.out.println(">>> Check all nodes for output (this node is also part of the grid).");
+            System.out.println(">>> Check all nodes for output (this node is also part of the cluster).");
             System.out.println(">>>");
         }
         finally {
-            // Stop local grid node.
+            // Stop local cluster node.
             ctx.destroy();
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
index 927f4d6..d5fa33d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
+++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/spring-bean.xml
@@ -18,7 +18,7 @@
   -->
 
 <!--
-    Command line (default) grid configuration.
+    Command line (default) ignite configuration.
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -26,7 +26,7 @@
        xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
-    <description>Main Spring file for grid configuration.</description>
+    <description>Main Spring file for ignite configuration.</description>
 
     <!-- Example of bean definition with given configuration. -->
     <bean id="mySpringBean" class="org.apache.ignite.IgniteSpringBean">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/package.html
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/package.html b/examples/src/main/java/org/apache/ignite/examples/package.html
index 3f503f8..02e148c 100644
--- a/examples/src/main/java/org/apache/ignite/examples/package.html
+++ b/examples/src/main/java/org/apache/ignite/examples/package.html
@@ -19,6 +19,6 @@
 <html>
 <body>
     <!-- Package description. -->
-    Basic examples for grid functionality.
+    Basic examples for ignite functionality.
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
index a126074..347b54d 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java
@@ -55,8 +55,8 @@ import java.util.concurrent.*;
  * {@code 'ignite.{sh|bat} examples/config/example-streamer.xml'}.
  * When starting nodes this way JAR file containing the examples code
  * should be placed to {@code IGNITE_HOME/libs} folder. You can build
- * {@code gridgain-examples.jar} by running {@code mvn package} in
- * {@code IGNITE_HOME/examples} folder. After that {@code gridgain-examples.jar}
+ * {@code ignite-examples.jar} by running {@code mvn package} in
+ * {@code IGNITE_HOME/examples} folder. After that {@code ignite-examples.jar}
  * will be generated by Maven in {@code IGNITE_HOME/examples/target} folder.
  * <p>
  * Alternatively you can run {@link StreamingNodeStartup} in another JVM which will start node

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
index d7421ba..d249c33 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java
@@ -38,15 +38,15 @@ import java.util.*;
  * {@code 'ignite.{sh|bat} examples/config/example-streamer.xml'}.
  * When starting nodes this way JAR file containing the examples code
  * should be placed to {@code IGNITE_HOME/libs} folder. You can build
- * {@code gridgain-examples.jar} by running {@code mvn package} in
- * {@code IGNITE_HOME/examples} folder. After that {@code gridgain-examples.jar}
+ * {@code ignite-examples.jar} by running {@code mvn package} in
+ * {@code IGNITE_HOME/examples} folder. After that {@code ignite-examples.jar}
  * will be generated by Maven in {@code IGNITE_HOME/examples/target} folder.
  * <p>
  * Alternatively you can run {@link StreamingNodeStartup} in another JVM which will start node
  * with {@code examples/config/example-streamer.xml} configuration.
  */
 public class StreamingPopularNumbersExample {
-    /** Count of most popular numbers to retrieve from grid. */
+    /** Count of most popular numbers to retrieve from ignite. */
     private static final int POPULAR_NUMBERS_CNT = 10;
 
     /** Random number generator. */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
index 06a1d17..b654a17 100644
--- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java
@@ -78,7 +78,7 @@ public class StreamingPriceBarsExample {
     public static void main(String[] args) throws Exception {
         Timer timer = new Timer("priceBars");
 
-        // Start grid.
+        // Start ignite.
         final Ignite ignite = Ignition.start("examples/config/example-streamer.xml");
 
         System.out.println();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java b/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
index 71b9946..46bafef 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
@@ -19,11 +19,10 @@ package org.apache.ignite.examples;
 
 import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
-import org.gridgain.grid.*;
 import org.apache.ignite.lang.IgniteCallable;
 
 /**
- * Demonstrates broadcasting and unicasting computations within grid projection.
+ * Demonstrates broadcasting and unicasting computations within cluster projection.
  * <p>
  * Remote nodes should always be started with special configuration file which
  * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}.
@@ -40,13 +39,13 @@ public class ComputeExample {
             System.out.println();
             System.out.println(">>> Compute broadcast example started.");
 
-            // Broadcast closure to all grid nodes.
+            // Broadcast closure to all cluster nodes.
             ignite.compute().broadcast((IgniteRunnable)() -> System.out.println("Hello World")).get();
 
-            // Unicast closure to some grid node picked by load balancer.
+            // Unicast closure to some cluster node picked by load balancer.
             ignite.compute().run((IgniteRunnable)() -> System.out.println("Hello World")).get();
 
-            // Unicast closure to some grid node picked by load balancer and return result.
+            // Unicast closure to some cluster node picked by load balancer and return result.
             int length = ignite.compute().call((IgniteCallable<Integer>)"Hello World"::length).get();
 
             System.out.println();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java b/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
index 89fbdbe..dfe0481 100644
--- a/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
+++ b/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
@@ -26,7 +26,7 @@ import java.util.concurrent.*;
 /**
  * Example that demonstrates how to exchange messages between nodes. Use such
  * functionality for cases when you need to communicate to other nodes outside
- * of grid task.
+ * of ignite task.
  * <p>
  * To run this example you must have at least one remote node started.
  * <p>
@@ -53,7 +53,7 @@ public final class MessagingExample {
         try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) {
             if (ignite.nodes().size() < 2) {
                 System.out.println();
-                System.out.println(">>> Please start at least 2 grid nodes to run example.");
+                System.out.println(">>> Please start at least 2 cluster nodes to run example.");
                 System.out.println();
 
                 return;
@@ -73,7 +73,7 @@ public final class MessagingExample {
 
             localListen(ignite.forLocal(), orderedLatch, unorderedLatch);
 
-            // Register listeners on all grid nodes.
+            // Register listeners on all cluster nodes.
             startListening(rmtPrj);
 
             // Send unordered messages to all remote nodes.
@@ -98,7 +98,7 @@ public final class MessagingExample {
     }
 
     /**
-     * Start listening to messages on all grid nodes within passed in projection.
+     * Start listening to messages on all cluster nodes within passed in projection.
      *
      * @param prj Grid projection.
      * @throws IgniteCheckedException If failed.
@@ -140,7 +140,7 @@ public final class MessagingExample {
     /**
      * Listen for messages from remote nodes.
      *
-     * @param prj Grid projection.
+     * @param prj Projection.
      * @param orderedLatch Latch for ordered messages acks.
      * @param unorderedLatch Latch for unordered messages acks.
      */


[2/3] incubator-ignite git commit: #IGNITE-106: Remove grid from comments.

Posted by sb...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
index c9b0539..d89b987 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample1.scala
@@ -59,12 +59,12 @@ object ScalarCacheAffinityExample1 {
 
             ('A' to 'Z').foreach(keys :+= _.toString)
 
-            populateCache(grid$, keys)
+            populateCache(ignite, keys)
 
             var results = Map.empty[String, String]
 
             keys.foreach(key => {
-                val res = grid$.call$(
+                val res = ignite.call$(
                     new Callable[String] {
                         @CacheAffinityKeyMapped
                         def affinityKey(): String = key
@@ -78,7 +78,7 @@ object ScalarCacheAffinityExample1 {
                             val cache = cache$[String, String](NAME)
 
                             if (!cache.isDefined) {
-                                println(">>> Cache not found [nodeId=" + grid$.cluster().localNode.id +
+                                println(">>> Cache not found [nodeId=" + ignite.cluster().localNode.id +
                                     ", cacheName=" + NAME + ']')
 
                                 "Error"

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
index e12f3bf..3dea5fd 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinityExample2.scala
@@ -53,17 +53,17 @@ object ScalarCacheAffinityExample2 {
 
             ('A' to 'Z').foreach(keys :+= _.toString)
 
-            populateCache(grid$, keys)
+            populateCache(ignite, keys)
 
             // Map all keys to nodes.
-            val mappings = grid$.cluster().mapKeysToNodes(NAME, keys)
+            val mappings = ignite.cluster().mapKeysToNodes(NAME, keys)
 
             mappings.foreach(mapping => {
                 val node = mapping._1
                 val mappedKeys = mapping._2
 
                 if (node != null) {
-                    grid$.cluster().forNode(node) *< (() => {
+                    ignite.cluster().forNode(node) *< (() => {
                         breakable {
                             println(">>> Executing affinity job for keys: " + mappedKeys)
 
@@ -73,7 +73,7 @@ object ScalarCacheAffinityExample2 {
                             // If cache is not defined at this point then it means that
                             // job was not routed by affinity.
                             if (!cache.isDefined)
-                                println(">>> Cache not found [nodeId=" + grid$.cluster().localNode().id() +
+                                println(">>> Cache not found [nodeId=" + ignite.cluster().localNode().id() +
                                     ", cacheName=" + NAME + ']').^^
 
                             // Check cache without loading the value.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
index 12c2f96..f6e12ca 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheAffinitySimpleExample.scala
@@ -53,7 +53,7 @@ object ScalarCacheAffinitySimpleExample extends App {
         // Clean up caches on all nodes before run.
         cache$(NAME).get.globalClearAll(0)
 
-        val c = grid$.cache[Int, String](NAME)
+        val c = ignite.cache[Int, String](NAME)
 
         populate(c)
         visit(c)
@@ -67,7 +67,7 @@ object ScalarCacheAffinitySimpleExample extends App {
      */
     private def visit(c: Cache) {
         (0 until KEY_CNT).foreach(i =>
-            grid$.compute().affinityRun(NAME, i,
+            ignite.compute().affinityRun(NAME, i,
                 () => println("Co-located [key= " + i + ", value=" + c.peek(i) + ']'))
         )
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
index 22ab99e..3855269 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheExample.scala
@@ -126,7 +126,7 @@ object ScalarCacheExample extends App {
      * so we can actually see what happens underneath locally and remotely.
      */
     def registerListener() {
-        val g = grid$
+        val g = ignite
 
         g *< (() => {
             val lsnr = new IgnitePredicate[IgniteEvent] {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
index 0605a8c..f239547 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala
@@ -36,7 +36,7 @@ import scala.util.Random
  * start node with `examples/config/example-cache.xml` configuration.
  * <p>
  * The counts are kept in cache on all remote nodes. Top `10` counts from each node are then grabbed to produce
- * an overall top `10` list within the grid.
+ * an overall top `10` list within the ignite.
  */
 object ScalarCachePopularNumbersExample extends App {
     /** Cache name. */
@@ -58,7 +58,7 @@ object ScalarCachePopularNumbersExample extends App {
         println()
         println(">>> Cache popular numbers example started.")
 
-        val prj = grid$.cluster().forCache(CACHE_NAME)
+        val prj = ignite.cluster().forCache(CACHE_NAME)
 
         if (prj.nodes().isEmpty)
             println("Grid does not have cache configured: " + CACHE_NAME);
@@ -75,7 +75,7 @@ object ScalarCachePopularNumbersExample extends App {
                 query(POPULAR_NUMBERS_CNT)
 
                 // Clean up caches on all nodes after run.
-                grid$.cluster().forCache(CACHE_NAME).bcastRun(() => grid$.cache(CACHE_NAME).clearAll(), null)
+                ignite.cluster().forCache(CACHE_NAME).bcastRun(() => ignite.cache(CACHE_NAME).clearAll(), null)
             }
             finally {
                 popularNumbersQryTimer.cancel()

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
index 61347c3..108c415 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala
@@ -45,7 +45,7 @@ object ScalarCacheQueryExample {
      */
     def main(args: Array[String]) {
         scalar("examples/config/example-cache.xml") {
-            example(grid$)
+            example(ignite)
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala
index fc4b46b..4b37ea0 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarClosureExample.scala
@@ -41,7 +41,7 @@ object ScalarClosureExample extends App {
      * Prints grid topology.
      */
     def topology() {
-        grid$ foreach (n => println("Node: " + nid8$(n)))
+        ignite foreach (n => println("Node: " + nid8$(n)))
     }
 
     /**
@@ -51,31 +51,31 @@ object ScalarClosureExample extends App {
         // Notice the example usage of Java-side closure 'F.println(...)' and method 'scala'
         // that explicitly converts Java side object to a proper Scala counterpart.
         // This method is required since implicit conversion won't be applied here.
-        grid$.run$(for (w <- "Hello World!".split(" ")) yield () => println(w), null)
+        ignite.run$(for (w <- "Hello World!".split(" ")) yield () => println(w), null)
     }
 
     /**
      * Obligatory example - cloud enabled Hello World!
      */
     def helloWorld() {
-        grid$.run$("HELLO WORLD!".split(" ") map (w => () => println(w)), null)
+        ignite.run$("HELLO WORLD!".split(" ") map (w => () => println(w)), null)
     }
 
     /**
      * One way to execute closures on the grid.
      */
     def broadcast() {
-        grid$.bcastRun(() => println("Broadcasting!!!"), null)
+        ignite.bcastRun(() => println("Broadcasting!!!"), null)
     }
 
     /**
      *  Greats all remote nodes only.
      */
     def greetRemotes() {
-        val me = grid$.cluster().localNode.id
+        val me = ignite.cluster().localNode.id
 
         // Note that usage Java-based closure.
-        grid$.cluster().forRemotes() match {
+        ignite.cluster().forRemotes() match {
             case p if p.isEmpty => println("No remote nodes!")
             case p => p.bcastRun(() => println("Greetings from: " + me), null)
         }
@@ -85,11 +85,11 @@ object ScalarClosureExample extends App {
      * Same as previous greetings for all remote nodes but remote projection is created manually.
      */
     def greetRemotesAgain() {
-        val me = grid$.cluster().localNode.id
+        val me = ignite.cluster().localNode.id
 
         // Just show that we can create any projections we like...
         // Note that usage of Java-based closure via 'F' typedef.
-        grid$.cluster().forPredicate((n: ClusterNode) => n.id != me) match {
+        ignite.cluster().forPredicate((n: ClusterNode) => n.id != me) match {
             case p if p.isEmpty => println("No remote nodes!")
             case p => p.bcastRun(() => println("Greetings again from: " + me), null)
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
index 1c1dc46..85dd07e 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarContinuationExample.scala
@@ -48,21 +48,21 @@ object ScalarContinuationExample {
             // Calculate fibonacci for N.
             val N: Long = 100
 
-            val thisNode = grid$.cluster().localNode
+            val thisNode = ignite.cluster().localNode
 
             val start = System.currentTimeMillis
 
             // Projection that excludes this node if others exists.
-            val prj = if (grid$.cluster().nodes().size() > 1) grid$.cluster().forOthers(thisNode) else grid$.cluster().forNode(thisNode)
+            val prj = if (ignite.cluster().nodes().size() > 1) ignite.cluster().forOthers(thisNode) else ignite.cluster().forNode(thisNode)
 
-            val fib = grid$.compute(prj).apply(new FibonacciClosure(thisNode.id()), N)
+            val fib = ignite.compute(prj).apply(new FibonacciClosure(thisNode.id()), N)
 
             val duration = System.currentTimeMillis - start
 
             println(">>>")
             println(">>> Finished executing Fibonacci for '" + N + "' in " + duration + " ms.")
             println(">>> Fibonacci sequence for input number '" + N + "' is '" + fib + "'.")
-            println(">>> You should see prints out every recursive Fibonacci execution on grid nodes.")
+            println(">>> You should see prints out every recursive Fibonacci execution on cluster nodes.")
             println(">>> Check remote nodes for output.")
             println(">>>")
         }
@@ -95,7 +95,7 @@ class FibonacciClosure (
             // Make sure n is not negative.
             val n = math.abs(num)
 
-            val g = grid$
+            val g = ignite
 
             if (n <= 2)
                 return if (n == 0)
@@ -110,12 +110,12 @@ class FibonacciClosure (
             fut1 = store.get(n - 1)
             fut2 = store.get(n - 2)
 
-            val excludeNode = grid$.cluster().node(excludeNodeId)
+            val excludeNode = ignite.cluster().node(excludeNodeId)
 
             // Projection that excludes node with id passed in constructor if others exists.
-            val prj = if (grid$.cluster().nodes().size() > 1) grid$.cluster().forOthers(excludeNode) else grid$.cluster().forNode(excludeNode)
+            val prj = if (ignite.cluster().nodes().size() > 1) ignite.cluster().forOthers(excludeNode) else ignite.cluster().forNode(excludeNode)
 
-            val comp = grid$.compute(prj).withAsync()
+            val comp = ignite.compute(prj).withAsync()
 
             // If future is not cached in node-local store, cache it.
             // Note recursive grid execution!

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
index 65393f7..18b1fb3 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCreditRiskExample.scala
@@ -62,10 +62,10 @@ object ScalarCreditRiskExample {
             // Calculate credit risk and print it out.
             // As you can see the grid enabling is completely hidden from the caller
             // and it is fully transparent to him. In fact, the caller is never directly
-            // aware if method was executed just locally or on the 100s of grid nodes.
+            // aware if method was executed just locally or on the 100s of cluster nodes.
             // Credit risk crdRisk is the minimal amount that creditor has to have
             // available to cover possible defaults.
-            val crdRisk = grid$ @< (closures(grid$.cluster().nodes().size(), portfolio, horizon, iter, percentile),
+            val crdRisk = ignite @< (closures(ignite.cluster().nodes().size(), portfolio, horizon, iter, percentile),
                 (s: Seq[Double]) => s.sum / s.size, null)
 
             println("Credit risk [crdRisk=" + crdRisk + ", duration=" +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
index 12b72b7..44244ac 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPiCalculationExample.scala
@@ -36,9 +36,9 @@ object ScalarPiCalculationExample {
 
     def main(args: Array[String]) {
         scalar("examples/config/example-compute.xml") {
-            val jobs = for (i <- 0 until grid$.cluster().nodes().size()) yield () => calcPi(i * N)
+            val jobs = for (i <- 0 until ignite.cluster().nodes().size()) yield () => calcPi(i * N)
 
-            println("Pi estimate: " + grid$.reduce$[Double, Double](jobs, _.sum, null))
+            println("Pi estimate: " + ignite.reduce$[Double, Double](jobs, _.sum, null))
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
index dbdd9e0..8eb0d8e 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPingPongExample.scala
@@ -41,7 +41,7 @@ object ScalarPingPongExample extends App {
      * Implements Ping Pong example between local and remote node.
      */
     def pingPong() {
-        val g = grid$
+        val g = ignite
 
         if (g.cluster().nodes().size < 2) {
             println(">>>")
@@ -71,7 +71,7 @@ object ScalarPingPongExample extends App {
 
             // Set up local player: configure local node 'loc'
             // to listen for messages from remote node 'rmt'.
-            grid$.message().localListen(null, new MessagingListenActor[String]() {
+            ignite.message().localListen(null, new MessagingListenActor[String]() {
                 def receive(nodeId: UUID, msg: String) {
                     println(msg)
 
@@ -96,7 +96,7 @@ object ScalarPingPongExample extends App {
      * Implements Ping Pong example between two remote nodes.
      */
     def pingPong2() {
-        val g = grid$
+        val g = ignite
 
         if (g.cluster().forRemotes().nodes().size() < 2) {
             println(">>>")

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
index 3a29101..25af7d7 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarPrimeExample.scala
@@ -39,7 +39,7 @@ import scala.util.control.Breaks._
  * output).
  *
  * Note that when running this example on a multi-core box, simply
- * starting additional grid node on the same box will speed up
+ * starting additional cluster node on the same box will speed up
  * prime number calculation by a factor of 2.
  */
 object ScalarPrimeExample {
@@ -58,7 +58,7 @@ object ScalarPrimeExample {
             println(">>>")
             println(">>> Starting to check the following numbers for primes: " + util.Arrays.toString(checkVals))
 
-            val g = grid$
+            val g = ignite
 
             checkVals.foreach(checkVal => {
                 val divisor = g.reduce$[Option[Long], Option[Option[Long]]](

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala
index 299bc0f..05fec2c 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarScheduleExample.scala
@@ -22,7 +22,7 @@ import org.apache.ignite.scalar.scalar._
 
 /**
  * Demonstrates a cron-based `Runnable` execution scheduling.
- * Test runnable object broadcasts a phrase to all grid nodes every minute
+ * Test runnable object broadcasts a phrase to all cluster nodes every minute
  * three times with initial scheduling delay equal to five seconds.
  * <p>
  * Remote nodes should always be started with special configuration file which
@@ -33,12 +33,12 @@ object ScalarScheduleExample extends App {
         println()
         println("Compute schedule example started.")
 
-        val g = grid$
+        val g = ignite
 
         var invocations = 0
 
         // Schedule callable that returns incremented value each time.
-        val fut = grid$.scheduleLocalCall(
+        val fut = ignite.scheduleLocalCall(
             () => {
                 invocations += 1
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
index 87317d0..21c2b95 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarSnowflakeSchemaExample.scala
@@ -77,7 +77,7 @@ object ScalarSnowflakeSchemaExample {
      * `DimStore` and `DimProduct` instances.
      */
     def populateDimensions() {
-        val dimCache = grid$.jcache[Int, Object](REPL_CACHE_NAME)
+        val dimCache = ignite.jcache[Int, Object](REPL_CACHE_NAME)
 
         val store1 = new DimStore(idGen.next(), "Store1", "12345", "321 Chilly Dr, NY")
         val store2 = new DimStore(idGen.next(), "Store2", "54321", "123 Windy Dr, San Francisco")
@@ -99,7 +99,7 @@ object ScalarSnowflakeSchemaExample {
      * `FactPurchase` objects stored in `partitioned` cache.
      */
     def queryStorePurchases() {
-        val factCache = grid$.cache[Int, FactPurchase](PART_CACHE_NAME)
+        val factCache = ignite.cache[Int, FactPurchase](PART_CACHE_NAME)
 
         val storePurchases = factCache.sql(
             "from \"replicated\".DimStore, \"partitioned\".FactPurchase " +
@@ -115,8 +115,8 @@ object ScalarSnowflakeSchemaExample {
      * stored in `partitioned` cache.
      */
     private def queryProductPurchases() {
-        val dimCache = grid$.cache[Int, Object](REPL_CACHE_NAME)
-        val factCache = grid$.cache[Int, FactPurchase](PART_CACHE_NAME)
+        val dimCache = ignite.cache[Int, Object](REPL_CACHE_NAME)
+        val factCache = ignite.cache[Int, FactPurchase](PART_CACHE_NAME)
 
         val prods: CacheProjection[Int, DimProduct] = dimCache.viewByType(classOf[Int], classOf[DimProduct])
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
index fd63601..eac3efd 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarTaskExample.scala
@@ -36,7 +36,7 @@ import scala.collection.JavaConversions._
  */
 object ScalarTaskExample extends App {
     scalar("examples/config/example-compute.xml") {
-        grid$.compute().execute(classOf[GridHelloWorld], "Hello Cloud World!")
+        ignite.compute().execute(classOf[GridHelloWorld], "Hello Cloud World!")
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala
index 8d73cda..ce577ad 100644
--- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala
+++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarWorldShortestMapReduce.scala
@@ -33,7 +33,7 @@ object ScalarWorldShortestMapReduce extends App {
         val input = "World shortest mapreduce application"
 
         println("Non-space characters count: " +
-            grid$.reduce$[Int, Int](for (w <- input.split(" ")) yield () => w.length, _.sum, null)
+            ignite.reduce$[Int, Int](for (w <- input.split(" ")) yield () => w.length, _.sum, null)
         )
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..f2ce6fe
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesMultiNodeSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+/**
+ * Closure examples multi-node self test.
+ */
+public class BasicExamplesMultiNodeSelfTest extends BasicExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        startRemoteNodes();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java
new file mode 100644
index 0000000..e95b0cc
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/BasicExamplesSelfTest.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Closure examples self test.
+ */
+public class BasicExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testBroadcastExample() throws Exception {
+        ComputeBroadcastExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCallableExample() throws Exception {
+        ComputeCallableExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testClosureExample() throws Exception {
+        ComputeClosureExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testExecutorExample() throws Exception {
+        ComputeExecutorServiceExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testReducerExample() throws Exception {
+        ComputeReducerExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testRunnableExample() throws Exception {
+        ComputeRunnableExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testTaskMapExample() throws Exception {
+        ComputeTaskMapExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testTaskSplitExample() throws Exception {
+        ComputeTaskSplitExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..27bac02
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesMultiNodeSelfTest.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+/**
+ * Cache examples multi-node self test.
+ */
+public class CacheExamplesMultiNodeSelfTest extends CacheExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override protected String defaultConfig() {
+        return "examples/config/example-cache.xml";
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        startRemoteNodes();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected long getTestTimeout() {
+        return 10 * 60 * 1000;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void testCacheStoreExample() throws Exception {
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void testCacheStoreLoaderExample() throws Exception {
+        // No-op.
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
new file mode 100644
index 0000000..f541390
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/CacheExamplesSelfTest.java
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.datagrid.*;
+import org.apache.ignite.examples.datagrid.datastructures.*;
+import org.apache.ignite.examples.datagrid.starschema.*;
+import org.apache.ignite.examples.datagrid.store.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Cache examples self test.
+ */
+public class CacheExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheAffinityExample() throws Exception {
+        CacheAffinityExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheAtomicLongExample() throws Exception {
+        CacheAtomicLongExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheAtomicReferenceExample() throws Exception {
+        CacheAtomicReferenceExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheAtomicSequenceExample() throws Exception {
+        CacheAtomicSequenceExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheAtomicStampedExample() throws Exception {
+        CacheAtomicStampedExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheCountDownLatchExample() throws Exception {
+        CacheCountDownLatchExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheQueueExample() throws Exception {
+        CacheQueueExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheSetExample() throws Exception {
+        CacheSetExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheStoreExample() throws Exception {
+        CacheStoreExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheQueryExample() throws Exception {
+        CacheQueryExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheApiExample() throws Exception {
+        CacheApiExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheTransactionExample() throws Exception {
+        CacheTransactionExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheDataLoaderExample() throws Exception {
+        CacheDataLoaderExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testPopularNumbersRealTimeExample() throws Exception {
+        CachePopularNumbersExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheStoreLoaderExample() throws Exception {
+        CacheStoreLoadDataExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCachePutGetExample() throws Exception {
+        CachePutGetExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSnowflakeSchemaExample() throws Exception {
+        CacheStarSchemaExample.main(EMPTY_ARGS);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testCacheContinuousQueryExample() throws Exception {
+        CacheContinuousQueryExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/CacheStoreLoadDataExampleMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheStoreLoadDataExampleMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheStoreLoadDataExampleMultiNodeSelfTest.java
new file mode 100644
index 0000000..dc160c9
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/CacheStoreLoadDataExampleMultiNodeSelfTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.datagrid.store.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ *
+ */
+public class CacheStoreLoadDataExampleMultiNodeSelfTest extends AbstractExamplesTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        for (int i = 0; i < RMT_NODES_CNT; i++)
+            startGrid("node-" + i, CacheNodeWithStoreStartup.configure());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridCacheStoreLoaderExample() throws Exception {
+        CacheStoreLoadDataExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java
new file mode 100644
index 0000000..54e3c22
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/CheckpointExamplesSelfTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.compute.failover.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Checkpoint examples self test.
+ */
+public class CheckpointExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * Starts remote nodes before each test.
+     *
+     * Note: using beforeTestsStarted() to start nodes only once won't work.
+     *
+     * @throws Exception If remote nodes start failed.
+     */
+    @Override protected void beforeTest() throws Exception {
+        for (int i = 0; i < RMT_NODES_CNT; i++)
+            startGrid("node-" + i, ComputeFailoverNodeStartup.configuration());
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridCheckpointExample() throws Exception {
+        ComputeFailoverExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..8b0d305
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesMultiNodeSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+/**
+ * Continuation example multi-node self test.
+ */
+public class ContinuationExamplesMultiNodeSelfTest extends ContinuationExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        startRemoteNodes();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java
new file mode 100644
index 0000000..48ca73e
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuationExamplesSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Continuation example self test.
+ */
+public class ContinuationExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridContinuationExample() throws Exception {
+        ComputeFibonacciContinuationExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..59bc10d
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesMultiNodeSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+/**
+ * GridContinuousMapperExample multi-node self test.
+ */
+public class ContinuousMapperExamplesMultiNodeSelfTest extends ContinuationExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        startRemoteNodes();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
new file mode 100644
index 0000000..cbb79d6
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/ContinuousMapperExamplesSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.compute.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * GridContinuousMapperExample self test.
+ */
+public class ContinuousMapperExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridContinuousMapperExample() throws Exception {
+        ComputeContinuousMapperExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..7141d4c
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesMultiNodeSelfTest.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+/**
+ * Deployment examples multi-node self test.
+ */
+public class DeploymentExamplesMultiNodeSelfTest extends DeploymentExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override public void testGridDeploymentExample() throws Exception {
+        startRemoteNodes();
+
+        super.testGridDeploymentExample();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java
new file mode 100644
index 0000000..8fd4da0
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/DeploymentExamplesSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.misc.deployment.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Deployment examples self test.
+ */
+public class DeploymentExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridDeploymentExample() throws Exception {
+        DeploymentExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java
new file mode 100644
index 0000000..8ce2aad
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesMultiNodeSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+/**
+ * Events examples multi-node self test.
+ */
+public class EventsExamplesMultiNodeSelfTest extends EventsExamplesSelfTest {
+    /** {@inheritDoc} */
+    @Override protected void beforeTest() throws Exception {
+        startRemoteNodes();
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java
new file mode 100644
index 0000000..55341ba
--- /dev/null
+++ b/examples/src/test/java/org/apache/ignite/examples/EventsExamplesSelfTest.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples;
+
+import org.apache.ignite.examples.events.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+/**
+ * Events examples self test.
+ */
+public class EventsExamplesSelfTest extends AbstractExamplesTest {
+    /**
+     * @throws Exception If failed.
+     */
+    public void testGridEventsExample() throws Exception {
+        EventsExample.main(EMPTY_ARGS);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridBasicExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridBasicExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridBasicExamplesMultiNodeSelfTest.java
deleted file mode 100644
index 191018e..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridBasicExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-/**
- * Closure examples multi-node self test.
- */
-public class GridBasicExamplesMultiNodeSelfTest extends GridBasicExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        startRemoteNodes();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridBasicExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridBasicExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridBasicExamplesSelfTest.java
deleted file mode 100644
index 4e4a3e6..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridBasicExamplesSelfTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.compute.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Closure examples self test.
- */
-public class GridBasicExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridBroadcastExample() throws Exception {
-        ComputeBroadcastExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCallableExample() throws Exception {
-        ComputeCallableExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridClosureExample() throws Exception {
-        ComputeClosureExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridExecutorExample() throws Exception {
-        ComputeExecutorServiceExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridReducerExample() throws Exception {
-        ComputeReducerExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridRunnableExample() throws Exception {
-        ComputeRunnableExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridTaskMapExample() throws Exception {
-        ComputeTaskMapExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridTaskSplitExample() throws Exception {
-        ComputeTaskSplitExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridCacheExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridCacheExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridCacheExamplesMultiNodeSelfTest.java
deleted file mode 100644
index 71621e2..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridCacheExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-/**
- * Cache examples multi-node self test.
- */
-public class GridCacheExamplesMultiNodeSelfTest extends GridCacheExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override protected String defaultConfig() {
-        return "examples/config/example-cache.xml";
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        startRemoteNodes();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected long getTestTimeout() {
-        return 10 * 60 * 1000;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void testGridCacheStoreExample() throws Exception {
-        // No-op.
-    }
-
-    /** {@inheritDoc} */
-    @Override public void testGridCacheStoreLoaderExample() throws Exception {
-        // No-op.
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridCacheExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridCacheExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridCacheExamplesSelfTest.java
deleted file mode 100644
index 129b8a5..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridCacheExamplesSelfTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.datagrid.*;
-import org.apache.ignite.examples.datagrid.datastructures.*;
-import org.apache.ignite.examples.datagrid.starschema.*;
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Cache examples self test.
- */
-public class GridCacheExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheAffinityExample() throws Exception {
-        CacheAffinityExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheAtomicLongExample() throws Exception {
-        CacheAtomicLongExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheAtomicReferenceExample() throws Exception {
-        CacheAtomicReferenceExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheAtomicSequenceExample() throws Exception {
-        CacheAtomicSequenceExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheAtomicStampedExample() throws Exception {
-        CacheAtomicStampedExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheCountDownLatchExample() throws Exception {
-        CacheCountDownLatchExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheQueueExample() throws Exception {
-        CacheQueueExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheSetExample() throws Exception {
-        CacheSetExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheStoreExample() throws Exception {
-        CacheStoreExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheQueryExample() throws Exception {
-        CacheQueryExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheApiExample() throws Exception {
-        CacheApiExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheTransactionExample() throws Exception {
-        CacheTransactionExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheDataLoaderExample() throws Exception {
-        CacheDataLoaderExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridPopularNumbersRealTimeExample() throws Exception {
-        CachePopularNumbersExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheStoreLoaderExample() throws Exception {
-        CacheStoreLoadDataExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCachePutGetExample() throws Exception {
-        CachePutGetExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridSnowflakeSchemaExample() throws Exception {
-        CacheStarSchemaExample.main(EMPTY_ARGS);
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheContinuousQueryExample() throws Exception {
-        CacheContinuousQueryExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridCacheStoreLoadDataExampleMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridCacheStoreLoadDataExampleMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridCacheStoreLoadDataExampleMultiNodeSelfTest.java
deleted file mode 100644
index 5edea86..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridCacheStoreLoadDataExampleMultiNodeSelfTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.datagrid.store.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- *
- */
-public class GridCacheStoreLoadDataExampleMultiNodeSelfTest extends GridAbstractExamplesTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        for (int i = 0; i < RMT_NODES_CNT; i++)
-            startGrid("node-" + i, CacheNodeWithStoreStartup.configure());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCacheStoreLoaderExample() throws Exception {
-        CacheStoreLoadDataExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridCheckpointExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridCheckpointExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridCheckpointExamplesSelfTest.java
deleted file mode 100644
index 228b30f..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridCheckpointExamplesSelfTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.compute.failover.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Checkpoint examples self test.
- */
-public class GridCheckpointExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * Starts remote nodes before each test.
-     *
-     * Note: using beforeTestsStarted() to start nodes only once won't work.
-     *
-     * @throws Exception If remote nodes start failed.
-     */
-    @Override protected void beforeTest() throws Exception {
-        for (int i = 0; i < RMT_NODES_CNT; i++)
-            startGrid("node-" + i, ComputeFailoverNodeStartup.configuration());
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridCheckpointExample() throws Exception {
-        ComputeFailoverExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridContinuationExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridContinuationExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridContinuationExamplesMultiNodeSelfTest.java
deleted file mode 100644
index f97ccac..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridContinuationExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-/**
- * Continuation example multi-node self test.
- */
-public class GridContinuationExamplesMultiNodeSelfTest extends GridContinuationExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        startRemoteNodes();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridContinuationExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridContinuationExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridContinuationExamplesSelfTest.java
deleted file mode 100644
index 165d640..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridContinuationExamplesSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.compute.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Continuation example self test.
- */
-public class GridContinuationExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridContinuationExample() throws Exception {
-        ComputeFibonacciContinuationExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridContinuousMapperExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridContinuousMapperExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridContinuousMapperExamplesMultiNodeSelfTest.java
deleted file mode 100644
index 2a549c1..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridContinuousMapperExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-/**
- * GridContinuousMapperExample multi-node self test.
- */
-public class GridContinuousMapperExamplesMultiNodeSelfTest extends GridContinuationExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        startRemoteNodes();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridContinuousMapperExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridContinuousMapperExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridContinuousMapperExamplesSelfTest.java
deleted file mode 100644
index babf8ea..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridContinuousMapperExamplesSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.compute.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * GridContinuousMapperExample self test.
- */
-public class GridContinuousMapperExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridContinuousMapperExample() throws Exception {
-        ComputeContinuousMapperExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridDeploymentExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridDeploymentExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridDeploymentExamplesMultiNodeSelfTest.java
deleted file mode 100644
index 265d44d..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridDeploymentExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-/**
- * Deployment examples multi-node self test.
- */
-public class GridDeploymentExamplesMultiNodeSelfTest extends GridDeploymentExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override public void testGridDeploymentExample() throws Exception {
-        startRemoteNodes();
-
-        super.testGridDeploymentExample();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridDeploymentExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridDeploymentExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridDeploymentExamplesSelfTest.java
deleted file mode 100644
index cdade73..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridDeploymentExamplesSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.misc.deployment.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Deployment examples self test.
- */
-public class GridDeploymentExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridDeploymentExample() throws Exception {
-        DeploymentExample.main(EMPTY_ARGS);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridEventsExamplesMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridEventsExamplesMultiNodeSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridEventsExamplesMultiNodeSelfTest.java
deleted file mode 100644
index e2cb5f7..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridEventsExamplesMultiNodeSelfTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-/**
- * Events examples multi-node self test.
- */
-public class GridEventsExamplesMultiNodeSelfTest extends GridEventsExamplesSelfTest {
-    /** {@inheritDoc} */
-    @Override protected void beforeTest() throws Exception {
-        startRemoteNodes();
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/921fd0c7/examples/src/test/java/org/apache/ignite/examples/GridEventsExamplesSelfTest.java
----------------------------------------------------------------------
diff --git a/examples/src/test/java/org/apache/ignite/examples/GridEventsExamplesSelfTest.java b/examples/src/test/java/org/apache/ignite/examples/GridEventsExamplesSelfTest.java
deleted file mode 100644
index f159f1a..0000000
--- a/examples/src/test/java/org/apache/ignite/examples/GridEventsExamplesSelfTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples;
-
-import org.apache.ignite.examples.events.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-/**
- * Events examples self test.
- */
-public class GridEventsExamplesSelfTest extends GridAbstractExamplesTest {
-    /**
-     * @throws Exception If failed.
-     */
-    public void testGridEventsExample() throws Exception {
-        EventsExample.main(EMPTY_ARGS);
-    }
-}