# IGNITE-128: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d89cfdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d89cfdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d89cfdf Branch: refs/heads/ignite-211 Commit: 3d89cfdf7bf220cc79491479ed6b2be63850374b Parents: 7921784 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Feb 10 15:51:03 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Feb 10 15:51:03 2015 +0300 ---------------------------------------------------------------------- .../configuration/ConnectorConfiguration.java | 6 ++--- .../configuration/IgniteConfiguration.java | 27 +++----------------- .../ignite/internal/GridPluginComponent.java | 2 ++ .../org/apache/ignite/internal/IgnitionEx.java | 5 ++-- .../client/GridClientConfiguration.java | 2 -- 5 files changed, 11 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d89cfdf/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java index 499732c..f0f87dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java @@ -103,7 +103,7 @@ public class ConnectorConfiguration { private int portRange = DFLT_PORT_RANGE; /** REST requests thread pool size. */ - private int execSvcPoolSize = DFLT_REST_CORE_THREAD_CNT; + private int threadPoolSize = DFLT_REST_CORE_THREAD_CNT; /** Client message interceptor. */ private ConnectorMessageInterceptor msgInterceptor; @@ -125,7 +125,7 @@ public class ConnectorConfiguration { assert cfg != null; msgInterceptor = cfg.getMessageInterceptor(); - execSvcPoolSize = cfg.getRestThreadPoolSize(); + threadPoolSize = cfg.getThreadPoolSize(); idleTimeout = cfg.getIdleTimeout(); jettyPath = cfg.getJettyPath(); portRange = cfg.getPortRange(); @@ -478,7 +478,7 @@ public class ConnectorConfiguration { * Sets thread pool size to use for processing of client messages (REST requests). * * @param threadPoolSize Thread pool size to use for processing of client messages. - * @see #getRestThreadPoolSize() + * @see #getThreadPoolSize() */ public void setThreadPoolSize(int threadPoolSize) { this.threadPoolSize = threadPoolSize; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d89cfdf/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index f5c83b7..1b2746c 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -19,20 +19,17 @@ package org.apache.ignite.configuration; import org.apache.ignite.*; import org.apache.ignite.events.*; -import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.managers.eventstorage.*; import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; -import org.apache.ignite.services.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.plugin.*; -import org.apache.ignite.spi.authentication.*; -import org.apache.ignite.spi.indexing.*; -import org.apache.ignite.streamer.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.plugin.segmentation.*; +import org.apache.ignite.services.*; +import org.apache.ignite.spi.authentication.*; import org.apache.ignite.spi.checkpoint.*; import org.apache.ignite.spi.collision.*; import org.apache.ignite.spi.communication.*; @@ -40,9 +37,11 @@ import org.apache.ignite.spi.deployment.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.eventstorage.*; import org.apache.ignite.spi.failover.*; +import org.apache.ignite.spi.indexing.*; import org.apache.ignite.spi.loadbalancing.*; import org.apache.ignite.spi.securesession.*; import org.apache.ignite.spi.swapspace.*; +import org.apache.ignite.streamer.*; import javax.management.*; import java.lang.management.*; @@ -496,24 +495,6 @@ public class IgniteConfiguration { p2pPoolSize = cfg.getPeerClassLoadingThreadPoolSize(); pluginCfgs = cfg.getPluginConfigurations(); qryCfg = cfg.getQueryConfiguration(); - restAccessibleFolders = cfg.getRestAccessibleFolders(); - restEnabled = cfg.isRestEnabled(); - restIdleTimeout = cfg.getRestIdleTimeout(); - restPortRange = cfg.getRestPortRange(); - restSecretKey = cfg.getRestSecretKey(); - restTcpHost = cfg.getRestTcpHost(); - restTcpNoDelay = cfg.isRestTcpNoDelay(); - restTcpDirectBuf = cfg.isRestTcpDirectBuffer(); - restTcpSndBufSize = cfg.getRestTcpSendBufferSize(); - restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize(); - restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit(); - restTcpSelectorCnt = cfg.getRestTcpSelectorCount(); - restTcpPort = cfg.getRestTcpPort(); - restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory(); - restTcpSslEnabled = cfg.isRestTcpSslEnabled(); - restTcpSslClientAuth = cfg.isRestTcpSslClientAuth(); - restExecSvc = cfg.getRestExecutorService(); - restSvcShutdown = cfg.getRestExecutorServiceShutdown(); securityCred = cfg.getSecurityCredentialsProvider(); segChkFreq = cfg.getSegmentCheckFrequency(); segPlc = cfg.getSegmentationPolicy(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d89cfdf/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java index d8995d1..793673c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridPluginComponent.java @@ -60,6 +60,8 @@ public class GridPluginComponent implements GridComponent { /** {@inheritDoc} */ @Override public void onKernalStart() throws IgniteCheckedException { plugin.onIgniteStart(); + + } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d89cfdf/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 5f4f1ae..b635eae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -82,7 +82,6 @@ import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.configuration.ConnectorConfiguration.*; import static org.apache.ignite.configuration.IgniteConfiguration.*; import static org.apache.ignite.internal.IgniteComponentType.*; import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*; @@ -1515,8 +1514,8 @@ public class IgnitionEx { "rest-" + cfg.getGridName(), clientCfg.getThreadPoolSize(), clientCfg.getThreadPoolSize(), - DFLT_REST_KEEP_ALIVE_TIME, - new LinkedBlockingQueue<Runnable>(DFLT_REST_THREADPOOL_QUEUE_CAP) + ConnectorConfiguration.DFLT_KEEP_ALIVE_TIME, + new LinkedBlockingQueue<Runnable>(ConnectorConfiguration.DFLT_THREADPOOL_QUEUE_CAP) ); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d89cfdf/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java index 55b1f3a..cfd780c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java @@ -21,8 +21,6 @@ import org.apache.ignite.internal.client.balancer.*; import org.apache.ignite.internal.client.marshaller.*; import org.apache.ignite.internal.client.marshaller.optimized.*; import org.apache.ignite.internal.client.ssl.*; -import org.apache.ignite.portables.*; -import org.apache.ignite.plugin.security.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.plugin.security.*;
