ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/6] incubator-ignite git commit: IGNITE-160 TEMP
Date Fri, 06 Feb 2015 14:35:33 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-160 [created] d2f07f56e


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
index b279a88..da5f72c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
@@ -31,29 +31,17 @@ public class VisorExecutorServiceConfiguration implements Serializable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** Executor service. */
-    private String execSvc;
+    /** Public pool size. */
+    private int execPoolSz;
 
-    /** Whether or not GridGain will stop executor service on node shutdown. */
-    private boolean execSvcShutdown;
+    /** System pool size. */
+    private int sysPoolSz;
 
-    /** System executor service. */
-    private String sysExecSvc;
+    /** Peer-to-peer pool size. */
+    private int p2pPoolSz;
 
-    /** Whether or not GridGain will stop system executor service on node shutdown. */
-    private boolean sysExecSvcShutdown;
-
-    /** Peer-to-peer executor service. */
-    private String p2pExecSvc;
-
-    /** Whether or not GridGain will stop peer-to-peer executor service on node shutdown. */
-    private boolean p2pExecSvcShutdown;
-
-    /** REST requests executor service. */
-    private String restExecSvc;
-
-    /** REST executor service shutdown flag. */
-    private boolean restSvcShutdown;
+    /** REST requests pool size. */
+    private int restPoolSz;
 
     /**
      * @param c Grid configuration.
@@ -62,135 +50,75 @@ public class VisorExecutorServiceConfiguration implements Serializable {
     public static VisorExecutorServiceConfiguration from(IgniteConfiguration c) {
         VisorExecutorServiceConfiguration cfg = new VisorExecutorServiceConfiguration();
 
-        cfg.executeService(compactClass(c.getExecutorService()));
-        cfg.executeServiceShutdown(c.getExecutorServiceShutdown());
+        cfg.executeService(c.getExecutorService());
 
-        cfg.systemExecutorService(compactClass(c.getSystemExecutorService()));
-        cfg.systemExecutorServiceShutdown(c.getSystemExecutorServiceShutdown());
+        cfg.systemExecutorService(c.getSystemExecutorService());
 
-        cfg.p2pExecutorService(compactClass(c.getPeerClassLoadingExecutorService()));
-        cfg.p2pExecutorServiceShutdown(c.getSystemExecutorServiceShutdown());
+        cfg.p2pExecutorService(c.getPeerClassLoadingExecutorService());
 
         ClientConnectionConfiguration cc = c.getClientConnectionConfiguration();
 
         if (cc != null) {
-            cfg.restExecutorService(compactClass(cc.getRestExecutorService()));
-            cfg.restExecutorServiceShutdown(cc.isRestExecutorServiceShutdown());
+            cfg.restExecutorService(cc.getRestExecutorService());
         }
 
         return cfg;
     }
 
     /**
-     * @return Executor service.
-     */
-    public String executeService() {
-        return execSvc;
-    }
-
-    /**
-     * @param execSvc New executor service.
-     */
-    public void executeService(String execSvc) {
-        this.execSvc = execSvc;
-    }
-
-    /**
-     * @return Whether or not GridGain will stop executor service on node shutdown.
-     */
-    public boolean executeServiceShutdown() {
-        return execSvcShutdown;
-    }
-
-    /**
-     * @param execSvcShutdown New whether or not GridGain will stop executor service on node shutdown.
-     */
-    public void executeServiceShutdown(boolean execSvcShutdown) {
-        this.execSvcShutdown = execSvcShutdown;
-    }
-
-    /**
-     * @return System executor service.
-     */
-    public String systemExecutorService() {
-        return sysExecSvc;
-    }
-
-    /**
-     * @param sysExecSvc New system executor service.
-     */
-    public void systemExecutorService(String sysExecSvc) {
-        this.sysExecSvc = sysExecSvc;
-    }
-
-    /**
-     * @return Whether or not GridGain will stop system executor service on node shutdown.
-     */
-    public boolean systemExecutorServiceShutdown() {
-        return sysExecSvcShutdown;
-    }
-
-    /**
-     * @param sysExecSvcShutdown New whether or not GridGain will stop system executor service on node shutdown.
-     */
-    public void systemExecutorServiceShutdown(boolean sysExecSvcShutdown) {
-        this.sysExecSvcShutdown = sysExecSvcShutdown;
-    }
-
-    /**
-     * @return Peer-to-peer executor service.
+     * @return Public pool size.
      */
-    public String p2pExecutorService() {
-        return p2pExecSvc;
+    public int executeService() {
+        return execPoolSz;
     }
 
     /**
-     * @param p2pExecSvc New peer-to-peer executor service.
+     * @param execPoolSz Public pool size.
      */
-    public void p2pExecutorService(String p2pExecSvc) {
-        this.p2pExecSvc = p2pExecSvc;
+    public void executeService(int execPoolSz) {
+        this.execPoolSz = execPoolSz;
     }
 
     /**
-     * @return Whether or not GridGain will stop peer-to-peer executor service on node shutdown.
+     * @return System pool size.
      */
-    public boolean p2pExecutorServiceShutdown() {
-        return p2pExecSvcShutdown;
+    public int systemExecutorService() {
+        return sysPoolSz;
     }
 
     /**
-     * @param p2pExecSvcShutdown New whether or not GridGain will stop peer-to-peer executor service on node shutdown.
+     * @param sysExecSvc System pool size.
      */
-    public void p2pExecutorServiceShutdown(boolean p2pExecSvcShutdown) {
-        this.p2pExecSvcShutdown = p2pExecSvcShutdown;
+    public void systemExecutorService(int sysExecSvc) {
+        this.sysPoolSz = sysExecSvc;
     }
 
     /**
-     * @return REST requests executor service.
+     * @return Peer-to-peer pool size.
      */
-    public String restExecutorService() {
-        return restExecSvc;
+    public int p2pExecutorService() {
+        return p2pPoolSz;
     }
 
     /**
-     * @param restExecSvc New REST requests executor service.
+     * @param p2pExecSvc New peer-to-peer pool size.
      */
-    public void restExecutorService(String restExecSvc) {
-        this.restExecSvc = restExecSvc;
+    public void p2pExecutorService(int p2pExecSvc) {
+        this.p2pPoolSz = p2pExecSvc;
     }
 
     /**
-     * @return REST executor service shutdown flag.
+     * @return REST requests pool size.
      */
-    public boolean restExecutorServiceShutdown() {
-        return restSvcShutdown;
+    public int restExecutorService() {
+        return restPoolSz;
     }
 
     /**
-     * @param restSvcShutdown New REST executor service shutdown flag.
+     * @param restExecSvc New REST requests pool size.
      */
-    public void restExecutorServiceShutdown(boolean restSvcShutdown) {
-        this.restSvcShutdown = restSvcShutdown;
+    public void restExecutorService(int restExecSvc) {
+        this.restPoolSz = restExecSvc;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
index 392394c..9c54c9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java
@@ -112,7 +112,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement
 
     /** {@inheritDoc} */
     @Override public final String getGridGainHome() {
-        return ignite.configuration().getGridGainHome();
+        return ignite.configuration().getIgniteHome();
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
index e9a4e8c..598fa2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java
@@ -69,14 +69,7 @@ public class GridCancelUnusedJobSelfTest extends GridCommonAbstractTest {
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT,
-                SPLIT_COUNT,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(SPLIT_COUNT);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
index cc230d0..dc7c5a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridDiscoveryEventSelfTest.java
@@ -75,8 +75,6 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest {
 
         c.setDiscoverySpi(disco);
 
-        c.setRestEnabled(false);
-
         return c;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
index 8645533..5fcc9e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridHomePathSelfTest.java
@@ -47,7 +47,7 @@ public class GridHomePathSelfTest extends GridCommonAbstractTest {
             // Test home override.
             IgniteConfiguration c = getConfiguration(getTestGridName(1));
 
-            c.setGridGainHome("/new/path");
+            c.setIgniteHome("/new/path");
 
             try {
                 G.start(c);
@@ -64,7 +64,7 @@ public class GridHomePathSelfTest extends GridCommonAbstractTest {
             // Test no override.
             IgniteConfiguration c1 = getConfiguration(getTestGridName(1));
 
-            c1.setGridGainHome(System.getProperty(IGNITE_HOME));
+            c1.setIgniteHome(System.getProperty(IGNITE_HOME));
 
             G.start(c1);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
deleted file mode 100644
index b8c16db..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridManagementJobSelfTest.java
+++ /dev/null
@@ -1,167 +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.internal;
-
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.processors.task.*;
-import org.apache.ignite.resources.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.apache.ignite.testframework.junits.common.*;
-import org.jetbrains.annotations.*;
-
-import java.io.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.*;
-
-/**
- * Test whether internal and visor tasks are routed to management pool.
- */
-@GridCommonTest(group = "Kernal Self")
-public class GridManagementJobSelfTest extends GridCommonAbstractTest {
-    /** Amount of nodes in the grid. */
-    private static final int GRID_CNT = 3;
-
-    /** Management pool threads name prefix. */
-    private static final String MGMT_THREAD_PREFIX = "mgmt_thread_";
-
-    /** Name of a regular task. */
-    private static final String TASK_NAME = "task";
-
-    /** IP finder. */
-    private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true);
-
-    /**
-     * Do not start grid initially.
-     */
-    public GridManagementJobSelfTest() {
-        super(false);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
-        IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-        TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
-
-        discoSpi.setIpFinder(ipFinder);
-
-        cfg.setDiscoverySpi(discoSpi);
-
-        ExecutorService mgmtExecutor = Executors.newFixedThreadPool(10, new ThreadFactory() {
-            /** Counter for unique thread names. */
-            private AtomicLong ctr = new AtomicLong();
-
-            /** {@inheritDoc} */
-            @SuppressWarnings("NullableProblems")
-            @Override public Thread newThread(Runnable r) {
-                Thread t = new Thread(r);
-
-                t.setName(MGMT_THREAD_PREFIX + ctr.getAndIncrement());
-
-                return t;
-            }
-        });
-
-        cfg.setManagementExecutorService(mgmtExecutor);
-
-        cfg.setManagementExecutorServiceShutdown(true);
-
-        return cfg;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void beforeTestsStarted() throws Exception {
-        startGridsMultiThreaded(GRID_CNT);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected void afterTestsStopped() throws Exception {
-        stopAllGrids();
-    }
-
-    /**
-     * Ensure that regular tasks are executed within public pool while Visor and internal
-     * taskss are executed in management pool on remote nodes.
-     *
-     * @throws Exception If failed.
-     */
-    public void testNamedTasks() throws Exception {
-        runJob(TASK_NAME, new TestJob());
-    }
-
-    /**
-     * Ensure that jobs annotated with {@link GridInternal} are always executed in
-     * management pool irrespective of task name.
-     *
-     * @throws Exception If failed.
-     */
-    public void testAnnotatedTasks() throws Exception {
-        runJob(TASK_NAME, new TestJobInternal());
-    }
-
-    /**
-     * Execute the TestJob on remote nodes.
-     *
-     * @param taskName Name of the task in which context this job will be executed.
-     * @param job Job.
-     * @throws Exception If failed.
-     */
-    private void runJob(String taskName, Callable<Object> job) throws Exception {
-        // We run a task on remote nodes because on local node jobs will be executed in system pool anyway.
-        compute(grid(0).forRemotes()).withName(taskName).call(job);
-    }
-
-    /**
-     *  Test job which ensures that its executor thread is from management pool in case
-     *  task name corresponds to either internal or Visor task.
-     */
-    private static class TestJob implements Callable<Object>, Serializable {
-        /** Task session. */
-        @IgniteTaskSessionResource
-        protected ComputeTaskSession ses;
-
-        /** {@inheritDoc} */
-        @Nullable @Override public Object call() throws IgniteCheckedException {
-            String threadName = Thread.currentThread().getName();
-
-            assertFalse(threadName.startsWith(MGMT_THREAD_PREFIX));
-
-            return null;
-        }
-    }
-
-    /**
-     * Test job which ensures that it is always executed in management pool irrespectively
-     * of task name due to presence of {@link GridInternal} annotation.
-     */
-    @GridInternal
-    private static class TestJobInternal implements Callable<Object>, Serializable {
-        /** {@inheritDoc} */
-        @Nullable @Override public Object call() throws IgniteCheckedException {
-            String threadName = Thread.currentThread().getName();
-
-            assertTrue(threadName.startsWith(MGMT_THREAD_PREFIX));
-
-            return null;
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
index 0601cc4..52ff8cb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridStartStopSelfTest.java
@@ -53,8 +53,6 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
     public void testStartStop() throws Exception {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setRestEnabled(false);
-
         info("Grid start-stop test count: " + COUNT);
 
         for (int i = 0; i < COUNT; i++) {
@@ -75,8 +73,6 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
     public void _testStopWhileInUse() throws Exception {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setRestEnabled(false);
-
         cfg.setGridName(getTestGridName(0));
 
         CacheConfiguration cc = new CacheConfiguration();
@@ -137,8 +133,6 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest {
     public void testStoppedState() throws Exception {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setRestEnabled(false);
-
         Ignite ignite = G.start(cfg);
 
         assert ignite != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
index 2aad0d7..4f0190d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDaemonNodeAbstractSelfTest.java
@@ -64,8 +64,6 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst
 
         c.setDiscoverySpi(disco);
 
-        c.setRestEnabled(false);
-
         CacheConfiguration cc = defaultCacheConfiguration();
 
         cc.setCacheMode(cacheMode());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index c413403..7875b9f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -91,8 +91,6 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(disco);
 
-        cfg.setRestEnabled(false);
-
         cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         return cfg;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
index 63922a0..82c507f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
@@ -63,7 +63,6 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest {
         cfg.setDiscoverySpi(disco);
 
         cfg.setIncludeEventTypes();
-        cfg.setRestEnabled(false);
 
         CacheConfiguration cacheCfg1 = defaultCacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
index f3b0dec..665b49b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java
@@ -92,23 +92,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(gridName);
 
-        cfg.setExecutorService(
-            new ThreadPoolExecutor(
-                RETRIES * 2,
-                RETRIES * 2,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        cfg.setExecutorServiceShutdown(true);
-
-        cfg.setSystemExecutorService(
-            new ThreadPoolExecutor(
-                RETRIES * 2,
-                RETRIES * 2,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        cfg.setSystemExecutorServiceShutdown(true);
+        cfg.setExecutorService(RETRIES * 2);
+
+        cfg.setSystemExecutorService(RETRIES * 2);
 
         cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
index 023d576..78afdb9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java
@@ -234,7 +234,6 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra
         cfg.setDiscoverySpi(discoSpi);
         cfg.setLocalHost("127.0.0.1");
         cfg.setCacheConfiguration(ccfg);
-        cfg.setRestEnabled(false);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
index b6a9e21..394e8f8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java
@@ -81,15 +81,14 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb
         c.setIncludeProperties();
         c.setDeploymentMode(IgniteDeploymentMode.SHARED);
         c.setNetworkTimeout(10000);
-        c.setRestEnabled(false);
         c.setMarshaller(new IgniteOptimizedMarshaller(false));
 
 //        c.setPeerClassLoadingLocalClassPathExclude(GridCachePreloadLifecycleAbstractTest.class.getName(),
 //            MyValue.class.getName());
 
-        c.setExecutorService(new IgniteThreadPoolExecutor(10, 10, 0, new LinkedBlockingQueue<Runnable>()));
-        c.setSystemExecutorService(new IgniteThreadPoolExecutor(10, 10, 0, new LinkedBlockingQueue<Runnable>()));
-        c.setPeerClassLoadingExecutorService(new IgniteThreadPoolExecutor(3, 3, 0, new LinkedBlockingQueue<Runnable>()));
+        c.setExecutorService(10);
+        c.setSystemExecutorService(10);
+        c.setPeerClassLoadingExecutorService(3);
 
         c.setLifecycleBeans(lifecycleBean);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
index 352faea..f3bfa1c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReaderPreloadSelfTest.java
@@ -139,7 +139,6 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest {
         cfg.setDiscoverySpi(spi);
         cfg.setCacheConfiguration(ccfg);
         cfg.setIncludeProperties();
-        cfg.setRestEnabled(false);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
index 603f592..ea890f2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
@@ -72,8 +72,6 @@ public class GridDataLoaderPerformanceTest extends GridCommonAbstractTest {
 
         cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED);
 
-        cfg.setRestEnabled(false);
-
         cfg.setPeerClassLoadingEnabled(true);
 
         if (useCache) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
index 340bb4d..8174b22 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
@@ -133,7 +133,6 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
         cfg.setGgfsConfiguration(ggfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         Ignite g = G.start(cfg);
 
@@ -191,7 +190,6 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm
         cfg.setGgfsConfiguration(ggfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         Ignite g = G.start(cfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java
index efe6d17..a749bf6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsAbstractSelfTest.java
@@ -228,7 +228,6 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes
         cfg.setGgfsConfiguration(ggfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         return G.start(cfg);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
index 503f1f2..246d8ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsModesSelfTest.java
@@ -131,7 +131,6 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
         cfg.setGgfsConfiguration(ggfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         grid = (IgniteEx)G.start(cfg);
 
@@ -188,7 +187,6 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest {
         cfg.setGgfsConfiguration(ggfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         ggfsSecondary = (GridGgfsImpl)G.start(cfg).fileSystem("ggfs-secondary");
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index 2a55227..b5099ce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -62,7 +62,6 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest {
         IgniteConfiguration cfg = super.getConfiguration();
 
         cfg.setLocalHost("localhost");
-        cfg.setRestEnabled(true);
         cfg.setDiscoverySpi(disco);
         cfg.setCacheConfiguration(cacheCfg); // Add 'null' cache configuration.
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
index 36769db..3c09d7a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/GridStartupWithUndefinedGridGainHomeSelfTest.java
@@ -90,7 +90,6 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase {
             // Default console logger is used
             cfg.setGridLogger(log);
             cfg.setDiscoverySpi(disc);
-            cfg.setRestEnabled(false);
 
             try (Ignite g = G.start(cfg)) {
                 assert g != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
index b45ba0a..2ef9f10 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/future/GridFutureAdapterSelfTest.java
@@ -168,8 +168,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
     public void testListenAsyncNotify() throws Exception {
         GridTestKernalContext ctx = new GridTestKernalContext(log);
 
-        ctx.config().setExecutorService(Executors.newFixedThreadPool(1));
-        ctx.config().setSystemExecutorService(Executors.newFixedThreadPool(1));
+        ctx.setExecutorService(Executors.newFixedThreadPool(1));
+        ctx.setSystemExecutorService(Executors.newFixedThreadPool(1));
 
         ctx.add(new GridClosureProcessor(ctx));
 
@@ -243,8 +243,8 @@ public class GridFutureAdapterSelfTest extends GridCommonAbstractTest {
 
         final GridTestKernalContext ctx = new GridTestKernalContext(log);
 
-        ctx.config().setExecutorService(Executors.newFixedThreadPool(1));
-        ctx.config().setSystemExecutorService(Executors.newFixedThreadPool(1));
+        ctx.setExecutorService(Executors.newFixedThreadPool(1));
+        ctx.setSystemExecutorService(Executors.newFixedThreadPool(1));
 
         ctx.add(new GridClosureProcessor(ctx));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java
index 9df16dd..e380d05 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java
@@ -122,9 +122,8 @@ public class GridCacheSingleNodeLoadTest {
 
         c.setCollisionSpi(cols);
 
-        c.setExecutorService(new IgniteThreadPoolExecutor(THREADS / 2, THREADS / 2, 0L, new LinkedBlockingQueue<Runnable>()));
-        c.setSystemExecutorService(new IgniteThreadPoolExecutor(THREADS * 2, THREADS * 2, 0L,
-            new LinkedBlockingQueue<Runnable>()));
+        c.setExecutorService(THREADS / 2);
+        c.setSystemExecutorService(THREADS * 2);
 
         CacheConfiguration cc = new CacheConfiguration();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
index 25bba93..2388107 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsLoadTest.java
@@ -62,8 +62,6 @@ public class GridMultiSplitsLoadTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        ((ThreadPoolExecutor)cfg.getExecutorService()).prestartAllCoreThreads();
-
         return cfg;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
index d2efef0..7ff0ca3 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/multisplit/GridMultiSplitsRedeployLoadTest.java
@@ -46,8 +46,6 @@ public class GridMultiSplitsRedeployLoadTest extends GridCommonAbstractTest {
     @Override protected IgniteConfiguration getConfiguration() throws Exception {
         IgniteConfiguration cfg = super.getConfiguration();
 
-        ((ThreadPoolExecutor)cfg.getExecutorService()).prestartAllCoreThreads();
-
         return cfg;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java
index 8c53588..c7f4b95 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java
@@ -59,12 +59,7 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo
 
         cfg.setMetricsHistorySize(1000);
 
-        // Set up new executor service because we have 1 per test and thus all
-        // nodes have the same executor service. As soon as node get stopped
-        // it stops executor service and may fail active nodes.
-        cfg.setExecutorService(new IgniteThreadPoolExecutor());
-
-        ((ThreadPoolExecutor)cfg.getExecutorService()).prestartAllCoreThreads();
+        cfg.setExecutorService(100);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
index 7099f59..af15091 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java
@@ -57,8 +57,6 @@ public class GridSingleSplitsRedeployLoadTest extends GridCommonAbstractTest {
 
         cfg.setDiscoverySpi(discoSpi);
 
-        ((ThreadPoolExecutor)cfg.getExecutorService()).prestartAllCoreThreads();
-
         cfg.setDeploymentMode(IgniteDeploymentMode.CONTINUOUS);
 
         return cfg;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java
index e40a293..4b05a1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java
@@ -73,14 +73,7 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT * EXEC_COUNT,
-                SPLIT_COUNT * EXEC_COUNT,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService( SPLIT_COUNT * EXEC_COUNT);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java
index 53f5d15..7ef388b 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java
@@ -72,14 +72,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT * EXEC_COUNT,
-                SPLIT_COUNT * EXEC_COUNT,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(SPLIT_COUNT * EXEC_COUNT);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java
index fe9611f..1dfecba 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java
@@ -72,14 +72,7 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT * EXEC_COUNT,
-                SPLIT_COUNT * EXEC_COUNT,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(SPLIT_COUNT * EXEC_COUNT);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java
index 3e4f0f5..713ce4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java
@@ -59,14 +59,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT * EXEC_COUNT,
-                SPLIT_COUNT * EXEC_COUNT,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(SPLIT_COUNT * EXEC_COUNT);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java
index 9abc31e..767d531 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java
@@ -65,14 +65,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT * EXEC_COUNT,
-                SPLIT_COUNT * EXEC_COUNT,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(SPLIT_COUNT * EXEC_COUNT);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
index 20326c5..7b926b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java
@@ -65,14 +65,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT * 2,
-                SPLIT_COUNT * 2,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(SPLIT_COUNT * 2);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java
index 5c07e19..818c2e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java
@@ -59,14 +59,7 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest {
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT * EXEC_COUNT,
-                SPLIT_COUNT * EXEC_COUNT,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(SPLIT_COUNT * EXEC_COUNT);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
index 5b1c1c4..bd1f5ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java
@@ -59,14 +59,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                SPLIT_COUNT * 2,
-                SPLIT_COUNT * 2,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(SPLIT_COUNT * 2);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java
index a2416fe..61595af 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java
@@ -83,14 +83,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest {
 
         c.setDiscoverySpi(discoSpi);
 
-        c.setExecutorService(
-            new ThreadPoolExecutor(
-                JOB_NUM * 2,
-                JOB_NUM * 2,
-                0, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>()));
-
-        c.setExecutorServiceShutdown(true);
+        c.setExecutorService(JOB_NUM * 2);
 
         return c;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java
index 07449bb..c36179a 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java
@@ -97,7 +97,6 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest {
         spi.setLocalPortRange(1);
         cfg.setDiscoverySpi(spi);
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
         cfg.setMarshaller(new IgniteOptimizedMarshaller(false));
 
         TcpCommunicationSpi commSpi = new TcpCommunicationSpi() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java
index 8b6f59a..99035a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java
@@ -109,8 +109,6 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest {
             spi.setHeartbeatFrequency(40000);
         }
 
-        cfg.setRestEnabled(false);
-
         if (nodeId != null)
             cfg.setNodeId(nodeId);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java
index f0f4ded..7cc6bd1 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySnapshotHistoryTest.java
@@ -41,7 +41,6 @@ public class GridTcpDiscoverySnapshotHistoryTest extends GridCommonAbstractTest
         cfg.setDiscoverySpi(new TcpDiscoverySpi());
         cfg.setCacheConfiguration();
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 4c9285c..3a96956 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1057,7 +1057,7 @@ public abstract class GridAbstractTest extends TestCase {
         cfg.setGridLogger(rsrcs.getLogger());
         cfg.setMarshaller(rsrcs.getMarshaller());
         cfg.setNodeId(rsrcs.getNodeId());
-        cfg.setGridGainHome(rsrcs.getGridgainHome());
+        cfg.setIgniteHome(rsrcs.getGridgainHome());
         cfg.setMBeanServer(rsrcs.getMBeanServer());
         cfg.setPeerClassLoadingEnabled(true);
         cfg.setMetricsLogFrequency(0);
@@ -1109,8 +1109,6 @@ public abstract class GridAbstractTest extends TestCase {
 
         cfg.setCheckpointSpi(cpSpi);
 
-        cfg.setRestEnabled(false);
-
         cfg.setIncludeEventTypes(IgniteEventType.EVTS_ALL);
 
         return cfg;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
index f07fa98..f4901b6 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java
@@ -24,6 +24,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.testframework.*;
 
 import java.util.*;
+import java.util.concurrent.ExecutorService;
 
 /**
  * Test context.
@@ -38,6 +39,12 @@ public class GridTestKernalContext extends GridKernalContextImpl {
             new IgniteConfiguration(),
             new GridKernalGatewayImpl(null),
             null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
             false);
 
         GridTestUtils.setFieldValue(grid(), "cfg", config());
@@ -82,4 +89,18 @@ public class GridTestKernalContext extends GridKernalContextImpl {
     @Override public String toString() {
         return S.toString(GridTestKernalContext.class, this, super.toString());
     }
+
+    public void setSystemExecutorService(ExecutorService systemExecutorService) {
+        this.sysExecSvc = systemExecutorService;
+    }
+
+
+    /**
+     * Sets executor service.
+     *
+     * @param execSvc Executor service
+     */
+    public void setExecutorService(ExecutorService execSvc){
+        this.execSvc = execSvc;
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
index 9297995..5b0d89a 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteMock.java
@@ -83,7 +83,7 @@ public class IgniteMock implements Ignite {
         cfg.setMarshaller(marshaller);
         cfg.setNodeId(nodeId);
         cfg.setMBeanServer(jmx);
-        cfg.setGridGainHome(home);
+        cfg.setIgniteHome(home);
         cfg.setLocalHost(locHost);
 
         return cfg;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index efe7e5f..906782e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -76,7 +76,6 @@ public class IgniteComputeGridTestSuite {
         suite.addTestSuite(GridCommunicationManagerListenersSelfTest.class);
         suite.addTestSuite(IgniteExecutorServiceTest.class);
         suite.addTestSuite(GridTaskInstantiationSelfTest.class);
-        suite.addTestSuite(GridManagementJobSelfTest.class);
         suite.addTestSuite(GridMultipleJobsSelfTest.class);
         suite.addTestSuite(GridCheckpointManagerSelfTest.class);
         suite.addTestSuite(GridCheckpointTaskSelfTest.class);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
index 61c5717..9070a71 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutor.java
@@ -95,7 +95,7 @@ public class GridHadoopExternalTaskExecutor extends GridHadoopTaskExecutorAdapte
             UUID.randomUUID(),
             ctx.kernalContext().config().getMarshaller(),
             log,
-            ctx.kernalContext().config().getSystemExecutorService(),
+            ctx.kernalContext().getSystemExecutorService(),
             ctx.kernalContext().gridName());
 
         comm.setListener(new MessageListener());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
index 9a325ce..ce270de 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java
@@ -169,7 +169,6 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
         cfg.setGgfsConfiguration(ggfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         return G.start(cfg);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
index 45b3872..55c1725 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
@@ -192,7 +192,6 @@ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbs
         IgniteConfiguration cfg = super.getConfiguration(dfltGridName ? null : GRID_NAME);
 
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
index ecada0c..2a18d7b 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
@@ -119,7 +119,6 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA
         cfg.setGgfsConfiguration(ggfsCfg);
 
         cfg.setLocalHost("127.0.0.1");
-        cfg.setRestEnabled(false);
 
         Ignite g = G.start(cfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
index 30f13ac..c4a3059 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java
@@ -101,8 +101,11 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest
         }
 
         if (restEnabled()) {
-            cfg.setRestEnabled(true);
-            cfg.setRestTcpPort(restPort++);
+            ClientConnectionConfiguration clnCfg = new ClientConnectionConfiguration();
+
+            clnCfg.setRestTcpPort(restPort++);
+
+            cfg.setClientConnectionConfiguration(clnCfg);
         }
 
         cfg.setLocalHost("127.0.0.1");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
----------------------------------------------------------------------
diff --git a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
index 7f33f90..bfb6320 100644
--- a/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
+++ b/modules/log4j/src/test/java/org/apache/ignite/logger/log4j/GridLog4jCorrectFileNameTest.java
@@ -105,7 +105,6 @@ public class GridLog4jCorrectFileNameTest extends TestCase {
 
         cfg.setGridName(gridName);
         cfg.setGridLogger(new IgniteLog4jLogger());
-        cfg.setRestEnabled(false);
 
         return cfg;
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/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 c4ccf59..349f53d 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
@@ -152,8 +152,6 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
         cfg.setLifecycleBeans(bean1, bean2);
         cfg.setGridName(gridName);
 
-        cfg.setRestEnabled(false);
-
         try (Ignite g = IgniteSpring.start(cfg, new GenericApplicationContext())) {
             bean1.checkState(gridName, true);
             bean2.checkState(gridName, true);
@@ -268,8 +266,6 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
                         try {
                             IgniteConfiguration cfg = new IgniteConfiguration();
 
-                            cfg.setRestEnabled(false);
-
                             G.start(cfg);
                         }
                         catch (Throwable t) {
@@ -306,7 +302,6 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
                             IgniteConfiguration cfg = new IgniteConfiguration();
 
                             cfg.setGridName("TEST_NAME");
-                            cfg.setRestEnabled(false);
 
                             G.start(cfg);
                         }
@@ -431,8 +426,6 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
                 @Nullable @Override public Object call() throws Exception {
                     IgniteConfiguration cfg = new IgniteConfiguration();
 
-                    cfg.setRestEnabled(false);
-
                     cfg.setDiscoverySpi(new TcpDiscoverySpi() {
                         @Override public void spiStart(String gridName) throws IgniteSpiException {
                             throw new IgniteSpiException("This SPI will never start.");
@@ -749,8 +742,6 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
     public void testStopCancel() throws Exception {
         IgniteConfiguration cfg = new IgniteConfiguration();
 
-        cfg.setRestEnabled(false);
-
         Ignite ignite = G.start(cfg);
 
         ignite.compute().execute(TestTask.class, null);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
index 17c29c9..2db1881 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridSpringBeanSerializationSelfTest.java
@@ -66,8 +66,6 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest
 
         cfg.setUserAttributes(F.asMap(ATTR_KEY, true));
 
-        cfg.setRestEnabled(false);
-
         return cfg;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
index 29d7636..227e6e9 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java
@@ -339,7 +339,7 @@ public class GridResourceProcessorSelfTest extends GridCommonAbstractTest {
                     @Override public void run() {
                         assert ignite != null;
                         assert ignite.configuration() != null;
-                        assert ignite.configuration().getGridGainHome() != null;
+                        assert ignite.configuration().getIgniteHome() != null;
                     }
                 };
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index 3a76a5a..24a8453 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -326,13 +326,9 @@ class VisorConfigurationCommand {
             val execCfg = cfg.executeService()
 
             execSvcT += ("Executor service", safe(execCfg.executeService(), DFLT))
-            execSvcT += ("Executor service shutdown", bool2Str(execCfg.executeServiceShutdown()))
             execSvcT += ("System executor service", safe(execCfg.systemExecutorService(), DFLT))
-            execSvcT += ("System executor service shutdown", bool2Str(execCfg.systemExecutorServiceShutdown()))
             execSvcT += ("Peer-to-Peer executor service", safe(execCfg.p2pExecutorService(), DFLT))
-            execSvcT += ("Peer-to-Peer executor service shutdown", bool2Str(execCfg.p2pExecutorServiceShutdown()))
             execSvcT += ("REST Executor Service", safe(execCfg.restExecutorService(), DFLT))
-            execSvcT += ("REST Executor Service Shutdown", bool2Str(execCfg.restExecutorServiceShutdown()))
 
             execSvcT.render()
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/015745ad/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 3b39821..3160af0 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -1520,12 +1520,10 @@ object visor extends VisorTag {
 
                 cfg.setClientConnectionConfiguration(null)
 
-                def createExecutor = new IgniteThreadPoolExecutor(cpuCnt, cpuCnt, Long.MaxValue, new LinkedBlockingQueue[Runnable])
-
                 // All thread pools are overridden to have size equal to number of CPUs.
-                cfg.setExecutorService(createExecutor)
-                cfg.setSystemExecutorService(createExecutor)
-                cfg.setPeerClassLoadingExecutorService(createExecutor)
+                cfg.setExecutorService(cpuCnt)
+                cfg.setSystemExecutorService(cpuCnt)
+                cfg.setPeerClassLoadingExecutorService(cpuCnt)
 
                 var ioSpi = cfg.getCommunicationSpi
 


Mime
View raw message