http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/config/load/merge-sort-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/merge-sort-base.xml b/modules/core/src/test/config/load/merge-sort-base.xml index 130bfe3..a105f99 100644 --- a/modules/core/src/test/config/load/merge-sort-base.xml +++ b/modules/core/src/test/config/load/merge-sort-base.xml @@ -57,7 +57,7 @@ <!-- Disable pools --> <property name="executorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="100"/> <constructor-arg type="int" value="100"/> <constructor-arg type="long"> @@ -70,7 +70,7 @@ </property> <property name="systemExecutorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="100"/> <constructor-arg type="int" value="100"/> <constructor-arg type="long"> @@ -83,7 +83,7 @@ </property> <property name="peerClassLoadingExecutorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="100"/> <constructor-arg type="int" value="100"/> <constructor-arg type="long">
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/config/load/mongo-multinode-foster.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/mongo-multinode-foster.xml b/modules/core/src/test/config/load/mongo-multinode-foster.xml index 3235a6f..e4ebf4f 100644 --- a/modules/core/src/test/config/load/mongo-multinode-foster.xml +++ b/modules/core/src/test/config/load/mongo-multinode-foster.xml @@ -115,7 +115,7 @@ <property name="peerClassLoadingEnabled" value="false"/> <property name="executorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors() * 2}"/> <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors() * 2}"/> <constructor-arg type="long"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/config/spring-multicache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml index c60c6b3..4819bdc 100644 --- a/modules/core/src/test/config/spring-multicache.xml +++ b/modules/core/src/test/config/spring-multicache.xml @@ -288,7 +288,7 @@ All threads are pre-started and are available for use. --> <property name="executorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="10"/> <constructor-arg type="int" value="10"/> <constructor-arg type="long"> @@ -306,7 +306,7 @@ Threads are not started unless used. --> <property name="systemExecutorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="10"/> <constructor-arg type="int" value="10"/> <constructor-arg type="long"> @@ -324,7 +324,7 @@ Threads are not started unless used. --> <property name="peerClassLoadingExecutorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="2"/> <constructor-arg type="int" value="2"/> <constructor-arg type="long"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index 2bfefff..e9f88cc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -12,12 +12,12 @@ package org.gridgain.grid.kernal.processors.cache.distributed; import org.apache.ignite.configuration.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.marshaller.optimized.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java index af48d70..d1e4e15 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java @@ -15,9 +15,9 @@ import org.apache.ignite.compute.*; import org.apache.ignite.logger.java.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.jdk.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.managers.loadbalancer.*; -import org.gridgain.grid.thread.*; import org.springframework.context.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java index 469014b..3a3ad17 100644 --- a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java @@ -9,6 +9,7 @@ package org.gridgain.grid.thread; +import org.apache.ignite.thread.*; import org.gridgain.testframework.junits.common.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java index f99ceae..17d12a4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java @@ -9,12 +9,13 @@ package org.gridgain.grid.thread; +import org.apache.ignite.thread.*; import org.gridgain.testframework.junits.common.*; import java.util.*; /** - * Test for {@link IgniteThread}. + * Test for {@link org.apache.ignite.thread.IgniteThread}. */ @GridCommonTest(group = "Utils") public class GridThreadTest extends GridCommonAbstractTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java index 2264ced..0904502 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java @@ -10,12 +10,12 @@ package org.gridgain.loadtests.cache; import org.apache.ignite.configuration.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.lru.*; import org.gridgain.grid.spi.collision.fifoqueue.*; import org.gridgain.grid.spi.discovery.tcp.*; import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java index 900e418..37b7373 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java @@ -12,9 +12,9 @@ package org.gridgain.loadtests.colocation; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.*; import org.springframework.beans.factory.*; import org.springframework.context.support.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml index e0c8cc8..f52bd2a 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml @@ -70,7 +70,7 @@ All threads are pre-started and are available for use. --> <property name="executorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="400"/> <constructor-arg type="int" value="400"/> <constructor-arg type="long"> @@ -88,7 +88,7 @@ Threads are not started unless used. --> <property name="systemExecutorService"> - <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> + <bean class="org.apache.ignite.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="400"/> <constructor-arg type="int" value="400"/> <constructor-arg type="long"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java index 4c3dc2f..e23a224 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java @@ -12,10 +12,10 @@ package org.gridgain.loadtests.direct.newnodes; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.loadtest.*; import org.gridgain.grid.spi.communication.tcp.*; import org.gridgain.grid.spi.discovery.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.config.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java index bea8f4c..7ce5bc1 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java @@ -13,9 +13,9 @@ import org.apache.ignite.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.resource.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.config.*; import org.gridgain.testframework.junits.logger.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java ---------------------------------------------------------------------- diff --git a/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java b/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java index c5403d4..f25755d 100644 --- a/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java +++ b/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java @@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.email; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.worker.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java index 533f939..e0af2fa 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java @@ -11,11 +11,11 @@ package org.gridgain.grid.kernal.processors.hadoop.shuffle; import org.apache.ignite.*; import org.apache.ignite.lang.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; import org.gridgain.grid.kernal.processors.hadoop.counter.*; import org.gridgain.grid.kernal.processors.hadoop.shuffle.collections.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.io.*; import org.gridgain.grid.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java index bd4fb1b..dde9850 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java @@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor; import org.apache.ignite.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.*; import org.gridgain.grid.hadoop.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.worker.*; import org.jdk8.backport.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java index b9fc2ca..2997d46 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java @@ -11,10 +11,10 @@ package org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.communi import org.apache.ignite.*; import org.apache.ignite.marshaller.*; +import org.apache.ignite.thread.*; import org.gridgain.grid.*; import org.gridgain.grid.kernal.processors.hadoop.message.*; import org.gridgain.grid.kernal.processors.hadoop.taskexecutor.external.*; -import org.gridgain.grid.thread.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.ipc.*; import org.gridgain.grid.util.ipc.shmem.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6781a1c/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala index 8f67380..d752de4 100644 --- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala @@ -11,6 +11,7 @@ package org.gridgain.visor +import org.apache.ignite.thread.IgniteThreadPoolExecutor import org.apache.ignite.{IgniteState, Ignition} import org.apache.ignite.cluster.{ClusterGroup, ClusterMetrics, ClusterNode} import org.apache.ignite.configuration.IgniteConfiguration
