http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java new file mode 100644 index 0000000..e11f6fa --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorMessageInterceptor.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.configuration; + +import org.jetbrains.annotations.*; + +/** + * Interface for user-defined object interceptors. + * <p> + * Interceptors allow user to transform objects send and received via REST protocols. + * For example they could be used for customized multi-language marshalling by + * converting binary object representation received from client to java object. + */ +public interface ConnectorMessageInterceptor { + /** + * Intercepts received objects. + * + * @param obj Original incoming object. + * @return Object which should replace original in later processing. + */ + @Nullable public Object onReceive(@Nullable Object obj); + + /** + * Intercepts received objects. + * + * @param obj Original incoming object. + * @return Object which should be send to remote client instead of original. + */ + @Nullable public Object onSend(Object obj); +}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 a46be60..2b63da3 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 @@ -426,7 +426,7 @@ public class IgniteConfiguration { private GridHadoopConfiguration hadoopCfg; /** Client access configuration. */ - private ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); + private ConnectorConfiguration connectorCfg = new ConnectorConfiguration(); /** Portable configuration. */ private PortableConfiguration portableCfg; @@ -477,7 +477,7 @@ public class IgniteConfiguration { daemon = cfg.isDaemon(); cacheCfg = cfg.getCacheConfiguration(); cacheSanityCheckEnabled = cfg.isCacheSanityCheckEnabled(); - clientCfg = cfg.getClientConnectionConfiguration(); + connectorCfg = cfg.getConnectorConfiguration(); clockSyncFreq = cfg.getClockSyncFrequency(); clockSyncSamples = cfg.getClockSyncSamples(); deployMode = cfg.getDeploymentMode(); @@ -2390,17 +2390,17 @@ public class IgniteConfiguration { } /** - * @return Client connection configuration. + * @return Connector configuration. */ - public ClientConnectionConfiguration getClientConnectionConfiguration() { - return clientCfg; + public ConnectorConfiguration getConnectorConfiguration() { + return connectorCfg; } /** - * @param clientCfg Client connection configuration. + * @param connectorCfg Connector configuration. */ - public void setClientConnectionConfiguration(ClientConnectionConfiguration clientCfg) { - this.clientCfg = clientCfg; + public void setConnectorConfiguration(ConnectorConfiguration connectorCfg) { + this.connectorCfg = connectorCfg; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 9408844..f95d0f1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1363,8 +1363,8 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit add(attrs, ATTR_RESTART_ENABLED, Boolean.toString(isRestartEnabled())); // Save port range, port numbers will be stored by rest processor at runtime. - if (cfg.getClientConnectionConfiguration() != null) - add(attrs, ATTR_REST_PORT_RANGE, cfg.getClientConnectionConfiguration().getPortRange()); + if (cfg.getConnectorConfiguration() != null) + add(attrs, ATTR_REST_PORT_RANGE, cfg.getConnectorConfiguration().getPortRange()); try { AuthenticationSpi authSpi = cfg.getAuthenticationSpi(); @@ -1483,7 +1483,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit mgmtExecSvcMBean = registerExecutorMBean(cfg.getManagementExecutorService(), "GridManagementExecutor"); p2PExecSvcMBean = registerExecutorMBean(cfg.getPeerClassLoadingExecutorService(), "GridClassLoadingExecutor"); - ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration(); + ConnectorConfiguration clientCfg = cfg.getConnectorConfiguration(); if (clientCfg != null) { restExecSvcMBean = clientCfg.getExecutorService() != null ? @@ -1620,7 +1620,7 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit private boolean isRestEnabled() { assert cfg != null; - return cfg.getClientConnectionConfiguration() != null; + return cfg.getConnectorConfiguration() != null; } /** @@ -2433,9 +2433,9 @@ public class IgniteKernal extends ClusterGroupAdapter implements IgniteEx, Ignit if (!F.isEmpty(cfg.getSegmentationResolvers())) F.copy(objs, cfg.getSegmentationResolvers()); - if (cfg.getClientConnectionConfiguration() != null) - F.copy(objs, cfg.getClientConnectionConfiguration().getMessageInterceptor(), - cfg.getClientConnectionConfiguration().getSslContextFactory()); + if (cfg.getConnectorConfiguration() != null) + F.copy(objs, cfg.getConnectorConfiguration().getMessageInterceptor(), + cfg.getConnectorConfiguration().getSslContextFactory()); F.copy(objs, cfg.getMarshaller(), cfg.getGridLogger(), cfg.getMBeanServer()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 96dfd28..288d621 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 @@ -85,7 +85,7 @@ 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.ClientConnectionConfiguration.*; +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.*; @@ -1430,10 +1430,10 @@ public class IgnitionEx { myCfg.setTransactionsConfiguration(new TransactionsConfiguration(cfg.getTransactionsConfiguration())); myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); - ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration(); + ConnectorConfiguration clientCfg = cfg.getConnectorConfiguration(); if (clientCfg != null) - clientCfg = new ClientConnectionConfiguration(clientCfg); + clientCfg = new ConnectorConfiguration(clientCfg); String ntfStr = IgniteSystemProperties.getString(IGNITE_LIFECYCLE_EMAIL_NOTIFY); @@ -1767,7 +1767,7 @@ public class IgnitionEx { myCfg.setAdminEmails(cfg.getAdminEmails()); // REST configuration. - myCfg.setClientConnectionConfiguration(clientCfg); + myCfg.setConnectorConfiguration(clientCfg); // Portable configuration. myCfg.setPortableConfiguration(cfg.getPortableConfiguration()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java index 9e3a544..9092520 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/GridTcpRouterConfiguration.java @@ -68,7 +68,7 @@ public class GridTcpRouterConfiguration { private boolean noDelay = DFLT_TCP_NODELAY; /** Idle timeout. */ - private long idleTimeout = ClientConnectionConfiguration.DFLT_IDLE_TIMEOUT; + private long idleTimeout = ConnectorConfiguration.DFLT_IDLE_TIMEOUT; /** Client auth. */ private boolean sslClientAuth; @@ -138,7 +138,7 @@ public class GridTcpRouterConfiguration { * Gets timeout in milliseconds to consider connection idle. If no messages sent by client * within this interval router closes idling connection. * <p/> - * If not specified, default value is {@link ClientConnectionConfiguration#DFLT_IDLE_TIMEOUT}. + * If not specified, default value is {@link org.apache.ignite.configuration.ConnectorConfiguration#DFLT_IDLE_TIMEOUT}. * * @return Idle timeout. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java index fd17021..53953b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java @@ -327,14 +327,14 @@ public class GridRestProcessor extends GridProcessorAdapter { } /** - * Applies {@link org.apache.ignite.configuration.ClientMessageInterceptor} - * from {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getMessageInterceptor()} + * Applies {@link org.apache.ignite.configuration.ConnectorMessageInterceptor} + * from {@link org.apache.ignite.configuration.ConnectorConfiguration#getMessageInterceptor()} * to all user parameters in the request. * * @param req Client request. */ private void interceptRequest(GridRestRequest req) { - ClientMessageInterceptor interceptor = config().getMessageInterceptor(); + ConnectorMessageInterceptor interceptor = config().getMessageInterceptor(); if (interceptor == null) return; @@ -374,15 +374,15 @@ public class GridRestProcessor extends GridProcessorAdapter { } /** - * Applies {@link org.apache.ignite.configuration.ClientMessageInterceptor} from - * {@link org.apache.ignite.configuration.ClientConnectionConfiguration#getMessageInterceptor()} + * Applies {@link org.apache.ignite.configuration.ConnectorMessageInterceptor} from + * {@link org.apache.ignite.configuration.ConnectorConfiguration#getMessageInterceptor()} * to all user objects in the response. * * @param res Response. * @param req Request. */ private void interceptResponse(GridRestResponse res, GridRestRequest req) { - ClientMessageInterceptor interceptor = config().getMessageInterceptor(); + ConnectorMessageInterceptor interceptor = config().getMessageInterceptor(); if (interceptor != null && res.getResponse() != null) { switch (req.command()) { @@ -426,7 +426,7 @@ public class GridRestProcessor extends GridProcessorAdapter { * @param interceptor Interceptor to apply. * @return Intercepted object. */ - private static Object interceptSendObject(Object obj, ClientMessageInterceptor interceptor) { + private static Object interceptSendObject(Object obj, ConnectorMessageInterceptor interceptor) { if (obj instanceof Map) { Map<Object, Object> original = (Map<Object, Object>)obj; @@ -609,7 +609,7 @@ public class GridRestProcessor extends GridProcessorAdapter { * @return Whether or not REST is enabled. */ private boolean isRestEnabled() { - return !ctx.config().isDaemon() && ctx.config().getClientConnectionConfiguration() != null; + return !ctx.config().isDaemon() && ctx.config().getConnectorConfiguration() != null; } /** @@ -664,8 +664,8 @@ public class GridRestProcessor extends GridProcessorAdapter { /** * @return Client configuration. */ - private ClientConnectionConfiguration config() { - return ctx.config().getClientConnectionConfiguration(); + private ConnectorConfiguration config() { + return ctx.config().getConnectorConfiguration(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java index 4e45c46..bb68633 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/GridRestProtocolAdapter.java @@ -61,13 +61,13 @@ public abstract class GridRestProtocolAdapter implements GridRestProtocol { @SuppressWarnings({"OverriddenMethodCallDuringObjectConstruction"}) protected GridRestProtocolAdapter(GridKernalContext ctx) { assert ctx != null; - assert ctx.config().getClientConnectionConfiguration() != null; + assert ctx.config().getConnectorConfiguration() != null; this.ctx = ctx; log = ctx.log(getClass()); - secretKey = ctx.config().getClientConnectionConfiguration().getSecretKey(); + secretKey = ctx.config().getConnectorConfiguration().getSecretKey(); } /** @@ -144,8 +144,8 @@ public abstract class GridRestProtocolAdapter implements GridRestProtocol { /** * @return Client configuration. */ - protected ClientConnectionConfiguration config() { - return ctx.config().getClientConnectionConfiguration(); + protected ConnectorConfiguration config() { + return ctx.config().getConnectorConfiguration(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java index 8457618..ecc681d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestProtocol.java @@ -154,7 +154,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { @Override public void start(final GridRestProtocolHandler hnd) throws IgniteCheckedException { assert hnd != null; - ClientConnectionConfiguration cfg = ctx.config().getClientConnectionConfiguration(); + ConnectorConfiguration cfg = ctx.config().getConnectorConfiguration(); assert cfg != null; @@ -238,7 +238,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { * @throws IOException If failed to resolve REST host. */ private InetAddress resolveRestTcpHost(IgniteConfiguration cfg) throws IOException { - String host = cfg.getClientConnectionConfiguration().getHost(); + String host = cfg.getConnectorConfiguration().getHost(); if (host == null) host = cfg.getLocalHost(); @@ -259,7 +259,7 @@ public class GridTcpRestProtocol extends GridRestProtocolAdapter { * server was unable to start. */ private boolean startTcpServer(InetAddress hostAddr, int port, GridNioServerListener<GridClientMessage> lsnr, - GridNioParser parser, @Nullable SSLContext sslCtx, ClientConnectionConfiguration cfg) { + GridNioParser parser, @Nullable SSLContext sslCtx, ConnectorConfiguration cfg) { try { GridNioFilter codec = new GridNioCodecFilter(parser, log, true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index 0bfa504..a454331 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -113,7 +113,7 @@ public class GridNioServer<T> { private volatile long writeTimeout = DFLT_SES_WRITE_TIMEOUT; /** Idle timeout. */ - private volatile long idleTimeout = ClientConnectionConfiguration.DFLT_IDLE_TIMEOUT; + private volatile long idleTimeout = ConnectorConfiguration.DFLT_IDLE_TIMEOUT; /** For test purposes only. */ @SuppressWarnings("UnusedDeclaration") @@ -515,7 +515,7 @@ public class GridNioServer<T> { /** * Gets configurable idle timeout for this session. If not set, default value is - * {@link ClientConnectionConfiguration#DFLT_IDLE_TIMEOUT}. + * {@link org.apache.ignite.configuration.ConnectorConfiguration#DFLT_IDLE_TIMEOUT}. * * @return Idle timeout in milliseconds. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 86b4106..cf5185d 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 @@ -71,7 +71,7 @@ public class VisorExecutorServiceConfiguration implements Serializable { cfg.p2pExecutorService(compactClass(c.getPeerClassLoadingExecutorService())); cfg.p2pExecutorServiceShutdown(c.getSystemExecutorServiceShutdown()); - ClientConnectionConfiguration cc = c.getClientConnectionConfiguration(); + ConnectorConfiguration cc = c.getConnectorConfiguration(); if (cc != null) { cfg.restExecutorService(compactClass(cc.getExecutorService())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java index a3185d1..2f5a47c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java @@ -68,7 +68,7 @@ public class VisorRestConfiguration implements Serializable { public static VisorRestConfiguration from(IgniteConfiguration c) { VisorRestConfiguration cfg = new VisorRestConfiguration(); - ClientConnectionConfiguration clnCfg = c.getClientConnectionConfiguration(); + ConnectorConfiguration clnCfg = c.getConnectorConfiguration(); boolean restEnabled = clnCfg != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java index 9847089..f563db3 100644 --- a/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java +++ b/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java @@ -339,7 +339,7 @@ public class BasicWarmupClosure implements IgniteInClosure<IgniteConfiguration> IgniteConfiguration cp = new IgniteConfiguration(); - cp.setClientConnectionConfiguration(null); + cp.setConnectorConfiguration(null); Collection<CacheConfiguration> reduced = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/default-spring-url-testing.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/default-spring-url-testing.xml b/modules/core/src/test/config/default-spring-url-testing.xml index 52ffefc..645acf8 100644 --- a/modules/core/src/test/config/default-spring-url-testing.xml +++ b/modules/core/src/test/config/default-spring-url-testing.xml @@ -38,6 +38,6 @@ --> <property name="gridName" value="grid_with_url_config"/> - <property name="restEnabled" value="false" /> + <property name="connectorConfiguration"><null/></property> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml index b97f23f..2c5df5a 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -35,7 +35,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <!-- Set to local host address just for examples. --> <property name="localHost" value="127.0.0.1"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/io-manager-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/io-manager-benchmark.xml b/modules/core/src/test/config/io-manager-benchmark.xml index f08bf59..0912b54 100644 --- a/modules/core/src/test/config/io-manager-benchmark.xml +++ b/modules/core/src/test/config/io-manager-benchmark.xml @@ -47,7 +47,7 @@ <!-- Various optimisations. --> <property name="peerClassLoadingEnabled" value="false"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="cacheSanityCheckEnabled" value="false"/> <property name="includeEventTypes"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/job-loadtest/client.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/job-loadtest/client.xml b/modules/core/src/test/config/job-loadtest/client.xml index 7f09225..91ddb5d 100644 --- a/modules/core/src/test/config/job-loadtest/client.xml +++ b/modules/core/src/test/config/job-loadtest/client.xml @@ -35,7 +35,7 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="deploymentMode" value="CONTINUOUS"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/job-loadtest/server.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/job-loadtest/server.xml b/modules/core/src/test/config/job-loadtest/server.xml index 65aa0aa..fafd612 100644 --- a/modules/core/src/test/config/job-loadtest/server.xml +++ b/modules/core/src/test/config/job-loadtest/server.xml @@ -35,7 +35,7 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="deploymentMode" value="CONTINUOUS"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/jobs-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/jobs-load-base.xml b/modules/core/src/test/config/jobs-load-base.xml index a4f0947..9c54acd 100644 --- a/modules/core/src/test/config/jobs-load-base.xml +++ b/modules/core/src/test/config/jobs-load-base.xml @@ -75,7 +75,7 @@ <property name="peerClassLoadingEnabled" value="false"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="cacheConfiguration"> <list/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/load/cache-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-benchmark.xml b/modules/core/src/test/config/load/cache-benchmark.xml index 5447e83..80d4254 100644 --- a/modules/core/src/test/config/load/cache-benchmark.xml +++ b/modules/core/src/test/config/load/cache-benchmark.xml @@ -60,7 +60,7 @@ </list> </property> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="includeEventTypes"> <list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/load/cache-client-benchmark.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/cache-client-benchmark.xml b/modules/core/src/test/config/load/cache-client-benchmark.xml index 717bd7a..39bc2a9 100644 --- a/modules/core/src/test/config/load/cache-client-benchmark.xml +++ b/modules/core/src/test/config/load/cache-client-benchmark.xml @@ -60,7 +60,7 @@ </list> </property> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="includeEventTypes"> <list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/load/dsi-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml index 1e5ba3d..5f75f33 100644 --- a/modules/core/src/test/config/load/dsi-load-base.xml +++ b/modules/core/src/test/config/load/dsi-load-base.xml @@ -72,7 +72,7 @@ <property name="peerClassLoadingEnabled" value="false"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="deploymentMode" value="CONTINUOUS"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 0476feb..4f9b561 100644 --- a/modules/core/src/test/config/load/merge-sort-base.xml +++ b/modules/core/src/test/config/load/merge-sort-base.xml @@ -27,7 +27,7 @@ <description>Main Spring file for Worker grid configuration.</description> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="localHost" value="127.0.0.1"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml b/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml index aa1943e..6ecc661 100644 --- a/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml +++ b/modules/core/src/test/config/loaders/grid-cfg-2-grids.xml @@ -29,7 +29,7 @@ <bean id="grid.cfg.1" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> <property name="gridName" value="grid-factory-test-1"/> - <property name="restEnabled" value="false" /> + <property name="connectorConfiguration"><null/></property> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> @@ -46,7 +46,7 @@ <bean id="grid.cfg.2" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> <property name="gridName" value="grid-factory-test-2"/> - <property name="restEnabled" value="false" /> + <property name="connectorConfiguration"><null/></property> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/loaders/grid-cfg.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/loaders/grid-cfg.xml b/modules/core/src/test/config/loaders/grid-cfg.xml index c3c9cd3..81464f4 100644 --- a/modules/core/src/test/config/loaders/grid-cfg.xml +++ b/modules/core/src/test/config/loaders/grid-cfg.xml @@ -29,7 +29,7 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> <!-- Grid with default name. --> - <property name="restEnabled" value="false" /> + <property name="connectorConfiguration"><null/></property> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> @@ -46,7 +46,7 @@ <bean id="grid.cfg.2" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> <property name="gridName" value="gridName2"/> - <property name="restEnabled" value="false" /> + <property name="connectorConfiguration"><null/></property> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/spring-cache-put-remove-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-put-remove-load.xml b/modules/core/src/test/config/spring-cache-put-remove-load.xml index eeaa74e..51bd8f4 100644 --- a/modules/core/src/test/config/spring-cache-put-remove-load.xml +++ b/modules/core/src/test/config/spring-cache-put-remove-load.xml @@ -41,7 +41,7 @@ </list> </property> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="includeEventTypes"> <list/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/spring-start-nodes-attr.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-start-nodes-attr.xml b/modules/core/src/test/config/spring-start-nodes-attr.xml index 3c18ed0..5043ddd 100644 --- a/modules/core/src/test/config/spring-start-nodes-attr.xml +++ b/modules/core/src/test/config/spring-start-nodes-attr.xml @@ -34,7 +34,7 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/spring-start-nodes.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-start-nodes.xml b/modules/core/src/test/config/spring-start-nodes.xml index 38a6188..f0001cf 100644 --- a/modules/core/src/test/config/spring-start-nodes.xml +++ b/modules/core/src/test/config/spring-start-nodes.xml @@ -28,7 +28,7 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/streamer/spring-streamer-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/streamer/spring-streamer-base.xml b/modules/core/src/test/config/streamer/spring-streamer-base.xml index 3cfe8cb..7eb64f4 100644 --- a/modules/core/src/test/config/streamer/spring-streamer-base.xml +++ b/modules/core/src/test/config/streamer/spring-streamer-base.xml @@ -43,7 +43,7 @@ <bean id="base.grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" abstract="true"> <property name="deploymentMode" value="SHARED"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="localHost" ref="localHost"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/websession/spring-cache-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-1.xml b/modules/core/src/test/config/websession/spring-cache-1.xml index e72bec3..a38eabe 100644 --- a/modules/core/src/test/config/websession/spring-cache-1.xml +++ b/modules/core/src/test/config/websession/spring-cache-1.xml @@ -27,7 +27,7 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="cacheConfiguration"> <list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/websession/spring-cache-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-2.xml b/modules/core/src/test/config/websession/spring-cache-2.xml index a7bf14d..8d63d12 100644 --- a/modules/core/src/test/config/websession/spring-cache-2.xml +++ b/modules/core/src/test/config/websession/spring-cache-2.xml @@ -27,7 +27,7 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="cacheConfiguration"> <list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/config/websession/spring-cache-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/spring-cache-3.xml b/modules/core/src/test/config/websession/spring-cache-3.xml index 3efd55b..c6db62b 100644 --- a/modules/core/src/test/config/websession/spring-cache-3.xml +++ b/modules/core/src/test/config/websession/spring-cache-3.xml @@ -27,7 +27,7 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="cacheConfiguration"> <list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 a9eaa40..fd926b7 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,7 +75,7 @@ public class GridDiscoveryEventSelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setClientConnectionConfiguration(null); + c.setConnectorConfiguration(null); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java index 60b8da1..f14d713 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleAwareSelfTest.java @@ -35,11 +35,11 @@ import javax.net.ssl.*; public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTest { /** */ - private static class TestClientMessageInterceptor extends TestLifecycleAware - implements ClientMessageInterceptor { + private static class TestConnectorMessageInterceptor extends TestLifecycleAware + implements ConnectorMessageInterceptor { /** */ - TestClientMessageInterceptor() { + TestConnectorMessageInterceptor() { super(null); } @@ -151,13 +151,13 @@ public class GridLifecycleAwareSelfTest extends GridAbstractLifecycleAwareSelfTe @Override protected final IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TestClientMessageInterceptor interceptor = new TestClientMessageInterceptor(); + TestConnectorMessageInterceptor interceptor = new TestConnectorMessageInterceptor(); - ClientConnectionConfiguration clientCfg = new ClientConnectionConfiguration(); + ConnectorConfiguration clientCfg = new ConnectorConfiguration(); clientCfg.setMessageInterceptor(interceptor); - cfg.setClientConnectionConfiguration(clientCfg); + cfg.setConnectorConfiguration(clientCfg); lifecycleAwares.add(interceptor); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 e7b26a5..f1c2139 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,7 +53,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { public void testStartStop() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); info("Grid start-stop test count: " + COUNT); @@ -75,7 +75,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { public void _testStopWhileInUse() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); cfg.setGridName(getTestGridName(0)); @@ -137,7 +137,7 @@ public class GridStartStopSelfTest extends GridCommonAbstractTest { public void testStoppedState() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); Ignite ignite = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 fa2047c..741cbff 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,7 +64,7 @@ public abstract class GridCacheDaemonNodeAbstractSelfTest extends GridCommonAbst c.setDiscoverySpi(disco); - c.setClientConnectionConfiguration(null); + c.setConnectorConfiguration(null); CacheConfiguration cc = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 f5a6fd2..3d99be5 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,7 +91,7 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 dacc05e..8831cd7 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,7 @@ public class GridCacheLuceneQueryIndexTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); cfg.setIncludeEventTypes(); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); CacheConfiguration cacheCfg1 = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 6deac12..d3f0cd0 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 @@ -110,7 +110,7 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends GridCommon spi.setIpFinder(ipFinder); cfg.setDiscoverySpi(spi); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); cfg.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 c8a8253..b9fc1d9 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,7 @@ public class GridCacheMultithreadedFailoverAbstractTest extends GridCommonAbstra cfg.setDiscoverySpi(discoSpi); cfg.setLocalHost("127.0.0.1"); cfg.setCacheConfiguration(ccfg); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 f383762..96ff0a6 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,7 +81,7 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb c.setIncludeProperties(); c.setDeploymentMode(IgniteDeploymentMode.SHARED); c.setNetworkTimeout(10000); - c.setClientConnectionConfiguration(null); + c.setConnectorConfiguration(null); c.setMarshaller(new IgniteOptimizedMarshaller(false)); // c.setPeerClassLoadingLocalClassPathExclude(GridCachePreloadLifecycleAbstractTest.class.getName(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 2deaf89..4af2f32 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,7 @@ public class GridCacheNearReaderPreloadSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(spi); cfg.setCacheConfiguration(ccfg); cfg.setIncludeProperties(); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java index 5a79a5b..3e25150 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java @@ -64,7 +64,7 @@ public class GridCachePartitionedLockSelfTest extends GridCacheLockAbstractTest IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setGridName(getTestGridName(0)); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); cfg.setCacheConfiguration(new CacheConfiguration()); final Ignite g0 = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 a145806..728ff5e 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,7 +72,7 @@ public class GridDataLoaderPerformanceTest extends GridCommonAbstractTest { cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); cfg.setPeerClassLoadingEnabled(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 79b145b..eeeb786 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,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); Ignite g = G.start(cfg); @@ -191,7 +191,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); Ignite g = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 bbf7004..f1eb5b3 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,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); return G.start(cfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 20c38d3..6889ee1 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,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); grid = (IgniteEx)G.start(cfg); @@ -188,7 +188,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); ggfsSecondary = (GridGgfsImpl)G.start(cfg).fileSystem("ggfs-secondary"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 1f10cce..f23557e 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,7 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(); cfg.setLocalHost("localhost"); - cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); + cfg.setConnectorConfiguration(new ConnectorConfiguration()); cfg.setDiscoverySpi(disco); cfg.setCacheConfiguration(cacheCfg); // Add 'null' cache configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 a6df1bc..0e495ac 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,7 @@ public class GridStartupWithUndefinedGridGainHomeSelfTest extends TestCase { // Default console logger is used cfg.setGridLogger(log); cfg.setDiscoverySpi(disc); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); try (Ignite g = G.start(cfg)) { assert g != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 ecfba0e..48400cf 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,7 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { spi.setLocalPortRange(1); cfg.setDiscoverySpi(spi); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); TcpCommunicationSpi commSpi = new TcpCommunicationSpi() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 f89ea4a..ebbf0fe 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,7 +109,7 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { spi.setHeartbeatFrequency(40000); } - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); if (nodeId != null) cfg.setNodeId(nodeId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 ed8d623..f4fae0c 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,7 @@ public class GridTcpDiscoverySnapshotHistoryTest extends GridCommonAbstractTest cfg.setDiscoverySpi(new TcpDiscoverySpi()); cfg.setCacheConfiguration(); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 2ccdf3b..b6d8446 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 @@ -1109,7 +1109,7 @@ public abstract class GridAbstractTest extends TestCase { cfg.setCheckpointSpi(cpSpi); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); cfg.setIncludeEventTypes(IgniteEventType.EVTS_ALL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 c9959c0..3e14eca 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,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); return G.start(cfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 dc257bb..4326510 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,7 @@ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbs IgniteConfiguration cfg = super.getConfiguration(dfltGridName ? null : GRID_NAME); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 258500d..ea6c7ae 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,7 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA cfg.setGgfsConfiguration(ggfsCfg); cfg.setLocalHost("127.0.0.1"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); Ignite g = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 406b2f8..e2eddf8 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,9 +101,9 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest } if (restEnabled()) { - cfg.setClientConnectionConfiguration(new ClientConnectionConfiguration()); + cfg.setConnectorConfiguration(new ConnectorConfiguration()); - cfg.getClientConnectionConfiguration().setPort(restPort++); + cfg.getConnectorConfiguration().setPort(restPort++); } cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 9f15b28..f74bfce 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,7 @@ public class GridLog4jCorrectFileNameTest extends TestCase { cfg.setGridName(gridName); cfg.setGridLogger(new IgniteLog4jLogger()); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java index 067a48c..a7a96c7 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java @@ -103,7 +103,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter { /** {@inheritDoc} */ @SuppressWarnings("BusyWait") @Override public void start(GridRestProtocolHandler hnd) throws IgniteCheckedException { - assert ctx.config().getClientConnectionConfiguration() != null; + assert ctx.config().getConnectorConfiguration() != null; InetAddress locHost; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 9db12cf..b79154b 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,7 +152,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { cfg.setLifecycleBeans(bean1, bean2); cfg.setGridName(gridName); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); try (Ignite g = IgniteSpring.start(cfg, new GenericApplicationContext())) { bean1.checkState(gridName, true); @@ -268,7 +268,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { try { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); G.start(cfg); } @@ -306,7 +306,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg = new IgniteConfiguration(); cfg.setGridName("TEST_NAME"); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); G.start(cfg); } @@ -431,7 +431,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { @Nullable @Override public Object call() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); cfg.setDiscoverySpi(new TcpDiscoverySpi() { @Override public void spiStart(String gridName) throws IgniteSpiException { @@ -749,7 +749,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest { public void testStopCancel() throws Exception { IgniteConfiguration cfg = new IgniteConfiguration(); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); Ignite ignite = G.start(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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 1bf7f87..2298cdd 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,7 +66,7 @@ public class GridSpringBeanSerializationSelfTest extends GridCommonAbstractTest cfg.setUserAttributes(F.asMap(ATTR_KEY, true)); - cfg.setClientConnectionConfiguration(null); + cfg.setConnectorConfiguration(null); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/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..9857362 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 @@ -1518,7 +1518,7 @@ object visor extends VisorTag { if (cpuCnt < 4) cpuCnt = 4 - cfg.setClientConnectionConfiguration(null) + cfg.setConnectorConfiguration(null) def createExecutor = new IgniteThreadPoolExecutor(cpuCnt, cpuCnt, Long.MaxValue, new LinkedBlockingQueue[Runnable]) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/yardstick/config/ignite-base-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml index f9c3771..f80f562 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -184,7 +184,7 @@ </list> </property> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="includeEventTypes"> <list/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/yardstick/config/ignite-store-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-store-config.xml b/modules/yardstick/config/ignite-store-config.xml index ee6515a..274f0a1 100644 --- a/modules/yardstick/config/ignite-store-config.xml +++ b/modules/yardstick/config/ignite-store-config.xml @@ -157,7 +157,7 @@ </list> </property> - <property name="restEnabled" value="false"/> + <property name="connectorConfiguration"><null/></property> <property name="includeEventTypes"> <list/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4126b60e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index 325d46b..32982d0 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -86,14 +86,14 @@ public class IgniteNode implements BenchmarkServer { cc.setBackups(args.backups()); if (args.restTcpPort() != 0) { - ClientConnectionConfiguration ccc = new ClientConnectionConfiguration(); + ConnectorConfiguration ccc = new ConnectorConfiguration(); ccc.setPort(args.restTcpPort()); if (args.restTcpHost() != null) ccc.setHost(args.restTcpHost()); - c.setClientConnectionConfiguration(ccc); + c.setConnectorConfiguration(ccc); } if (args.isOffHeap()) {
