ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [02/50] [abbrv] incubator-ignite git commit: #IGNITE-106: Remove grid from comments.
Date Wed, 04 Feb 2015 14:13:32 GMT
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);


Mime
View raw message