ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [07/11] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 09:29:49 GMT
# Renaming


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f92f248
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f92f248
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f92f248

Branch: refs/heads/master
Commit: 4f92f248f0c5bde92fdf4cf9ea00c4c8a96c6cb2
Parents: 5dc4b6c
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 5 12:20:59 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 5 12:20:59 2014 +0300

----------------------------------------------------------------------
 .../clients/src/test/resources/spring-cache.xml |   2 +-
 .../src/test/resources/spring-server-node.xml   |   2 +-
 .../test/resources/spring-server-ssl-node.xml   |   2 +-
 .../GridClientConnectionConfiguration.java      | 570 +++++++++++++++++++
 .../grid/GridClientConnectionConfiguration.java | 570 -------------------
 .../processors/rest/GridRestProcessor.java      |   5 +-
 .../rest/protocols/GridRestProtocolAdapter.java |   1 +
 .../node/VisorExecutorServiceConfiguration.java |   1 -
 .../visor/node/VisorRestConfiguration.java      |   1 -
 9 files changed, 577 insertions(+), 577 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/clients/src/test/resources/spring-cache.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-cache.xml b/modules/clients/src/test/resources/spring-cache.xml
index fa4c2fa..cfdce6a 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -64,7 +64,7 @@
 
         <!-- Client configuration. -->
         <property name="clientConnectionConfiguration">
-            <bean class="org.gridgain.grid.GridClientConnectionConfiguration"/>
+            <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration"/>
         </property>
 
         <property name="cacheConfiguration">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/clients/src/test/resources/spring-server-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml
index a9c05f4..819b41a 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -92,7 +92,7 @@
 
         <!-- Client configuration. -->
         <property name="clientConnectionConfiguration">
-            <bean class="org.gridgain.grid.GridClientConnectionConfiguration">
+            <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration">
                 <!-- Configure TCP rest protocol. -->
                 <property name="restTcpPort" value="10080"/>
             </bean>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/clients/src/test/resources/spring-server-ssl-node.xml
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml
index 3c0a688..ae9717f 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -62,7 +62,7 @@
 
         <!-- Client configuration. -->
         <property name="clientConnectionConfiguration">
-            <bean class="org.gridgain.grid.GridClientConnectionConfiguration">
+            <bean class="org.apache.ignite.configuration.GridClientConnectionConfiguration">
                 <!-- Configure TCP+SSL rest protocol. -->
                 <property name="restTcpSslEnabled" value="true"/>
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
new file mode 100644
index 0000000..b17d3a3
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/GridClientConnectionConfiguration.java
@@ -0,0 +1,570 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.configuration;
+
+import org.gridgain.client.ssl.*;
+import org.gridgain.grid.*;
+import org.jetbrains.annotations.*;
+
+import java.net.*;
+import java.util.concurrent.*;
+
+/**
+ * REST access configuration.
+ */
+public class GridClientConnectionConfiguration {
+    /** Default TCP server port. */
+    public static final int DFLT_TCP_PORT = 11211;
+
+    /** Default TCP_NODELAY flag. */
+    public static final boolean DFLT_TCP_NODELAY = true;
+
+    /** Default TCP direct buffer flag. */
+    public static final boolean DFLT_REST_TCP_DIRECT_BUF = false;
+
+    /** Default REST idle timeout. */
+    public static final int DFLT_REST_IDLE_TIMEOUT = 7000;
+
+    /** Default rest port range. */
+    public static final int DFLT_REST_PORT_RANGE = 100;
+
+    /** Default size of REST thread pool. */
+    public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+
+    /** Default max size of REST thread pool. */
+    public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
+
+    /** Default max queue capacity of REST thread pool. */
+    public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
+
+    /** Default socket send and receive buffer size. */
+    public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
+
+    /** Jetty XML configuration path. */
+    private String jettyPath;
+
+    /** REST secret key. */
+    private String restSecretKey;
+
+    /** TCP host. */
+    private String restTcpHost;
+
+    /** TCP port. */
+    private int restTcpPort = DFLT_TCP_PORT;
+
+    /** TCP no delay flag. */
+    private boolean restTcpNoDelay = DFLT_TCP_NODELAY;
+
+    /** REST TCP direct buffer flag. */
+    private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF;
+
+    /** REST TCP send buffer size. */
+    private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE;
+
+    /** REST TCP receive buffer size. */
+    private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE;
+
+    /** REST TCP send queue limit. */
+    private int restTcpSndQueueLimit;
+
+    /** REST TCP selector count. */
+    private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors());
+
+    /** Idle timeout. */
+    private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT;
+
+    /** SSL enable flag, default is disabled. */
+    private boolean restTcpSslEnabled;
+
+    /** SSL need client auth flag. */
+    private boolean restTcpSslClientAuth;
+
+    /** SSL context factory for rest binary server. */
+    private GridSslContextFactory restTcpSslCtxFactory;
+
+    /** Port range */
+    private int restPortRange = DFLT_REST_PORT_RANGE;
+
+    /** Folders accessible by REST. */
+    private String[] restAccessibleFolders;
+
+    /** REST requests executor service. */
+    private ExecutorService restExecSvc;
+
+    /** REST executor service shutdown flag. */
+    private boolean restSvcShutdown = true;
+
+    /** Client message interceptor. */
+    private GridClientMessageInterceptor clientMsgInterceptor;
+
+    /**
+     * Creates client connection configuration with all default values.
+     */
+    public GridClientConnectionConfiguration() {
+        // No-op.
+    }
+
+    /**
+     * Creates client connection configuration by copying all properties from
+     * given configuration.
+     *
+     * @param cfg Client configuration.
+     */
+    public GridClientConnectionConfiguration(GridClientConnectionConfiguration cfg) {
+        assert cfg != null;
+
+        clientMsgInterceptor = cfg.getClientMessageInterceptor();
+        restAccessibleFolders = cfg.getRestAccessibleFolders();
+        restExecSvc = cfg.getRestExecutorService();
+        restSvcShutdown = cfg.isRestExecutorServiceShutdown();
+        restIdleTimeout = cfg.getRestIdleTimeout();
+        jettyPath = cfg.getRestJettyPath();
+        restPortRange = cfg.getRestPortRange();
+        restSecretKey = cfg.getRestSecretKey();
+        restTcpDirectBuf = cfg.isRestTcpDirectBuffer();
+        restTcpHost = cfg.getRestTcpHost();
+        restTcpNoDelay = cfg.isRestTcpNoDelay();
+        restTcpPort = cfg.getRestTcpPort();
+        restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize();
+        restTcpSelectorCnt = cfg.getRestTcpSelectorCount();
+        restTcpSndBufSize = cfg.getRestTcpSendBufferSize();
+        restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit();
+        restTcpSslClientAuth = cfg.isRestTcpSslClientAuth();
+        restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory();
+        restTcpSslEnabled = cfg.isRestTcpSslEnabled();
+    }
+
+    /**
+     * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
+     * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
+     * accessing GridGain APIs remotely.
+     *
+     * @param jettyPath Path to {@code JETTY} XML configuration file.
+     */
+    public void setRestJettyPath(String jettyPath) {
+        this.jettyPath = jettyPath;
+    }
+
+    /**
+     * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
+     * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
+     * accessing GridGain APIs remotely.
+     * <p>
+     * If not provided, Jetty instance with default configuration will be started picking
+     * {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT}
+     * as host and port respectively.
+     *
+     * @return Path to {@code JETTY} XML configuration file.
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
+     */
+    public String getRestJettyPath() {
+        return jettyPath;
+    }
+
+    /**
+     * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
+     *
+     * @param restSecretKey REST secret key.
+     */
+    public void setRestSecretKey(@Nullable String restSecretKey) {
+        this.restSecretKey = restSecretKey;
+    }
+
+    /**
+     * Gets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
+     *
+     * @return Secret key.
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
+     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
+     */
+    @Nullable public String getRestSecretKey() {
+        return restSecretKey;
+    }
+
+    /**
+     * Gets host for TCP binary protocol server. This can be either an
+     * IP address or a domain name.
+     * <p>
+     * If not defined, system-wide local address will be used
+     * (see {@link IgniteConfiguration#getLocalHost()}.
+     * <p>
+     * You can also use {@code 0.0.0.0} value to bind to all
+     * locally-available IP addresses.
+     *
+     * @return TCP host.
+     */
+    public String getRestTcpHost() {
+        return restTcpHost;
+    }
+
+    /**
+     * Sets host for TCP binary protocol server.
+     *
+     * @param restTcpHost TCP host.
+     */
+    public void setRestTcpHost(String restTcpHost) {
+        this.restTcpHost = restTcpHost;
+    }
+
+    /**
+     * Gets port for TCP binary protocol server.
+     * <p>
+     * Default is {@link #DFLT_TCP_PORT}.
+     *
+     * @return TCP port.
+     */
+    public int getRestTcpPort() {
+        return restTcpPort;
+    }
+
+    /**
+     * Sets port for TCP binary protocol server.
+     *
+     * @param restTcpPort TCP port.
+     */
+    public void setRestTcpPort(int restTcpPort) {
+        this.restTcpPort = restTcpPort;
+    }
+
+    /**
+     * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections.
+     * Setting this option reduces network latency and should be set to {@code true} in majority of cases.
+     * For more information, see {@link Socket#setTcpNoDelay(boolean)}
+     * <p/>
+     * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
+     *
+     * @return Whether {@code TCP_NODELAY} option should be enabled.
+     */
+    public boolean isRestTcpNoDelay() {
+        return restTcpNoDelay;
+    }
+
+    /**
+     * Sets whether {@code TCP_NODELAY} option should be set for all accepted client connections.
+     *
+     * @param restTcpNoDelay {@code True} if option should be enabled.
+     * @see #isRestTcpNoDelay()
+     */
+    public void setRestTcpNoDelay(boolean restTcpNoDelay) {
+        this.restTcpNoDelay = restTcpNoDelay;
+    }
+
+    /**
+     * Gets flag indicating whether REST TCP server should use direct buffers. A direct buffer is a buffer
+     * that is allocated and accessed using native system calls, without using JVM heap. Enabling direct
+     * buffer <em>may</em> improve performance and avoid memory issues (long GC pauses due to huge buffer
+     * size).
+     *
+     * @return Whether direct buffer should be used.
+     */
+    public boolean isRestTcpDirectBuffer() {
+        return restTcpDirectBuf;
+    }
+
+    /**
+     * Sets whether to use direct buffer for REST TCP server.
+     *
+     * @param restTcpDirectBuf {@code True} if option should be enabled.
+     * @see #isRestTcpDirectBuffer()
+     */
+    public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
+        this.restTcpDirectBuf = restTcpDirectBuf;
+    }
+
+    /**
+     * Gets REST TCP server send buffer size.
+     *
+     * @return REST TCP server send buffer size (0 for default).
+     */
+    public int getRestTcpSendBufferSize() {
+        return restTcpSndBufSize;
+    }
+
+    /**
+     * Sets REST TCP server send buffer size.
+     *
+     * @param restTcpSndBufSize Send buffer size.
+     * @see #getRestTcpSendBufferSize()
+     */
+    public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
+        this.restTcpSndBufSize = restTcpSndBufSize;
+    }
+
+    /**
+     * Gets REST TCP server receive buffer size.
+     *
+     * @return REST TCP server receive buffer size (0 for default).
+     */
+    public int getRestTcpReceiveBufferSize() {
+        return restTcpRcvBufSize;
+    }
+
+    /**
+     * Sets REST TCP server receive buffer size.
+     *
+     * @param restTcpRcvBufSize Receive buffer size.
+     * @see #getRestTcpReceiveBufferSize()
+     */
+    public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
+        this.restTcpRcvBufSize = restTcpRcvBufSize;
+    }
+
+    /**
+     * Gets REST TCP server send queue limit. If the limit exceeds, all successive writes will
+     * block until the queue has enough capacity.
+     *
+     * @return REST TCP server send queue limit (0 for unlimited).
+     */
+    public int getRestTcpSendQueueLimit() {
+        return restTcpSndQueueLimit;
+    }
+
+    /**
+     * Sets REST TCP server send queue limit.
+     *
+     * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
+     * @see #getRestTcpSendQueueLimit()
+     */
+    public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
+        this.restTcpSndQueueLimit = restTcpSndQueueLimit;
+    }
+
+    /**
+     * Gets number of selector threads in REST TCP server. Higher value for this parameter
+     * may increase throughput, but also increases context switching.
+     *
+     * @return Number of selector threads for REST TCP server.
+     */
+    public int getRestTcpSelectorCount() {
+        return restTcpSelectorCnt;
+    }
+
+    /**
+     * Sets number of selector threads for REST TCP server.
+     *
+     * @param restTcpSelectorCnt Number of selector threads for REST TCP server.
+     * @see #getRestTcpSelectorCount()
+     */
+    public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
+        this.restTcpSelectorCnt = restTcpSelectorCnt;
+    }
+
+    /**
+     * Gets idle timeout for REST server.
+     * <p>
+     * This setting is used to reject half-opened sockets. If no packets
+     * come within idle timeout, the connection is closed.
+     *
+     * @return Idle timeout in milliseconds.
+     */
+    public long getRestIdleTimeout() {
+        return restIdleTimeout;
+    }
+
+    /**
+     * Sets idle timeout for REST server.
+     *
+     * @param restIdleTimeout Idle timeout in milliseconds.
+     * @see #getRestIdleTimeout()
+     */
+    public void setRestIdleTimeout(long restIdleTimeout) {
+        this.restIdleTimeout = restIdleTimeout;
+    }
+
+    /**
+     * Whether secure socket layer should be enabled on binary rest server.
+     * <p>
+     * Note that if this flag is set to {@code true}, an instance of {@link GridSslContextFactory}
+     * should be provided, otherwise binary rest protocol will fail to start.
+     *
+     * @return {@code True} if SSL should be enabled.
+     */
+    public boolean isRestTcpSslEnabled() {
+        return restTcpSslEnabled;
+    }
+
+    /**
+     * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
+     * <p/>
+     * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
+     * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
+     *
+     * @param restTcpSslEnabled {@code True} if SSL should be enabled.
+     */
+    public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
+        this.restTcpSslEnabled = restTcpSslEnabled;
+    }
+
+    /**
+     * Gets a flag indicating whether or not remote clients will be required to have a valid SSL certificate which
+     * validity will be verified with trust manager.
+     *
+     * @return Whether or not client authentication is required.
+     */
+    public boolean isRestTcpSslClientAuth() {
+        return restTcpSslClientAuth;
+    }
+
+    /**
+     * Sets flag indicating whether or not SSL client authentication is required.
+     *
+     * @param needClientAuth Whether or not client authentication is required.
+     */
+    public void setRestTcpSslClientAuth(boolean needClientAuth) {
+        restTcpSslClientAuth = needClientAuth;
+    }
+
+    /**
+     * Gets context factory that will be used for creating a secure socket layer of rest binary server.
+     *
+     * @return SslContextFactory instance.
+     * @see GridSslContextFactory
+     */
+    public GridSslContextFactory getRestTcpSslContextFactory() {
+        return restTcpSslCtxFactory;
+    }
+
+    /**
+     * Sets instance of {@link GridSslContextFactory} that will be used to create an instance of {@code SSLContext}
+     * for Secure Socket Layer on TCP binary protocol. This factory will only be used if
+     * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
+     *
+     * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
+     */
+    public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
+        this.restTcpSslCtxFactory = restTcpSslCtxFactory;
+    }
+
+    /**
+     * Gets number of ports to try if configured port is already in use.
+     *
+     * @return Number of ports to try.
+     */
+    public int getRestPortRange() {
+        return restPortRange;
+    }
+
+    /**
+     * Sets number of ports to try if configured one is in use.
+     *
+     * @param restPortRange Port range.
+     */
+    public void setRestPortRange(int restPortRange) {
+        this.restPortRange = restPortRange;
+    }
+
+    /**
+     * Gets list of folders that are accessible for log reading command. When remote client requests
+     * a log file, file path is checked against this list. If requested file is not located in any
+     * sub-folder of these folders, request is not processed.
+     * <p>
+     * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
+     * could not be detected and property is not specified, no restrictions applied.
+     *
+     * @return Array of folders that are allowed be read by remote clients.
+     */
+    public String[] getRestAccessibleFolders() {
+        return restAccessibleFolders;
+    }
+
+    /**
+     * Sets array of folders accessible by REST processor for log reading command.
+     *
+     * @param restAccessibleFolders Array of folder paths.
+     */
+    public void setRestAccessibleFolders(String... restAccessibleFolders) {
+        this.restAccessibleFolders = restAccessibleFolders;
+    }
+
+    /**
+     * Should return an instance of fully configured thread pool to be used for
+     * processing of client messages (REST requests).
+     * <p>
+     * If not provided, new executor service will be created using the following
+     * configuration:
+     * <ul>
+     *     <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li>
+     *     <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li>
+     *     <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li>
+     * </ul>
+     *
+     * @return Thread pool implementation to be used for processing of client
+     *      messages.
+     */
+    public ExecutorService getRestExecutorService() {
+        return restExecSvc;
+    }
+
+    /**
+     * Sets thread pool to use for processing of client messages (REST requests).
+     *
+     * @param restExecSvc Thread pool to use for processing of client messages.
+     * @see IgniteConfiguration#getRestExecutorService()
+     */
+    public void setRestExecutorService(ExecutorService restExecSvc) {
+        this.restExecSvc = restExecSvc;
+    }
+
+    /**
+     * Sets REST executor service shutdown flag.
+     *
+     * @param restSvcShutdown REST executor service shutdown flag.
+     * @see IgniteConfiguration#getRestExecutorService()
+     */
+    public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
+        this.restSvcShutdown = restSvcShutdown;
+    }
+
+    /**
+     * Shutdown flag for REST executor service.
+     * <p>
+     * If not provided, default value {@code true} will be used which will shutdown
+     * executor service when GridGain stops regardless whether it was started before GridGain
+     * or by GridGain.
+     *
+     * @return REST executor service shutdown flag.
+     */
+    public boolean isRestExecutorServiceShutdown() {
+        return restSvcShutdown;
+    }
+
+    /**
+     * Gets interceptor for objects, moving to and from remote clients.
+     * If this method returns {@code null} then no interception will be applied.
+     * <p>
+     * Setting interceptor allows to transform all objects exchanged via REST protocol.
+     * For example if you use custom serialisation on client you can write interceptor
+     * to transform binary representations received from client to Java objects and later
+     * access them from java code directly.
+     * <p>
+     * Default value is {@code null}.
+     *
+     * @see GridClientMessageInterceptor
+     * @return Interceptor.
+     */
+    @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
+        return clientMsgInterceptor;
+    }
+
+    /**
+     * Sets client message interceptor.
+     * <p>
+     * Setting interceptor allows to transform all objects exchanged via REST protocol.
+     * For example if you use custom serialisation on client you can write interceptor
+     * to transform binary representations received from client to Java objects and later
+     * access them from java code directly.
+     *
+     * @param interceptor Interceptor.
+     */
+    public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
+        clientMsgInterceptor = interceptor;
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java
deleted file mode 100644
index 1f02ecf..0000000
--- a/modules/core/src/main/java/org/gridgain/grid/GridClientConnectionConfiguration.java
+++ /dev/null
@@ -1,570 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.gridgain.grid;
-
-import org.apache.ignite.configuration.*;
-import org.gridgain.client.ssl.*;
-import org.jetbrains.annotations.*;
-
-import java.net.*;
-import java.util.concurrent.*;
-
-/**
- * REST access configuration.
- */
-public class GridClientConnectionConfiguration {
-    /** Default TCP server port. */
-    public static final int DFLT_TCP_PORT = 11211;
-
-    /** Default TCP_NODELAY flag. */
-    public static final boolean DFLT_TCP_NODELAY = true;
-
-    /** Default TCP direct buffer flag. */
-    public static final boolean DFLT_REST_TCP_DIRECT_BUF = false;
-
-    /** Default REST idle timeout. */
-    public static final int DFLT_REST_IDLE_TIMEOUT = 7000;
-
-    /** Default rest port range. */
-    public static final int DFLT_REST_PORT_RANGE = 100;
-
-    /** Default size of REST thread pool. */
-    public static final int DFLT_REST_CORE_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
-
-    /** Default max size of REST thread pool. */
-    public static final int DFLT_REST_MAX_THREAD_CNT = IgniteConfiguration.DFLT_PUBLIC_CORE_THREAD_CNT;
-
-    /** Default max queue capacity of REST thread pool. */
-    public static final int DFLT_REST_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
-
-    /** Default socket send and receive buffer size. */
-    public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
-
-    /** Jetty XML configuration path. */
-    private String jettyPath;
-
-    /** REST secret key. */
-    private String restSecretKey;
-
-    /** TCP host. */
-    private String restTcpHost;
-
-    /** TCP port. */
-    private int restTcpPort = DFLT_TCP_PORT;
-
-    /** TCP no delay flag. */
-    private boolean restTcpNoDelay = DFLT_TCP_NODELAY;
-
-    /** REST TCP direct buffer flag. */
-    private boolean restTcpDirectBuf = DFLT_REST_TCP_DIRECT_BUF;
-
-    /** REST TCP send buffer size. */
-    private int restTcpSndBufSize = DFLT_SOCK_BUF_SIZE;
-
-    /** REST TCP receive buffer size. */
-    private int restTcpRcvBufSize = DFLT_SOCK_BUF_SIZE;
-
-    /** REST TCP send queue limit. */
-    private int restTcpSndQueueLimit;
-
-    /** REST TCP selector count. */
-    private int restTcpSelectorCnt = Math.min(4, Runtime.getRuntime().availableProcessors());
-
-    /** Idle timeout. */
-    private long restIdleTimeout = DFLT_REST_IDLE_TIMEOUT;
-
-    /** SSL enable flag, default is disabled. */
-    private boolean restTcpSslEnabled;
-
-    /** SSL need client auth flag. */
-    private boolean restTcpSslClientAuth;
-
-    /** SSL context factory for rest binary server. */
-    private GridSslContextFactory restTcpSslCtxFactory;
-
-    /** Port range */
-    private int restPortRange = DFLT_REST_PORT_RANGE;
-
-    /** Folders accessible by REST. */
-    private String[] restAccessibleFolders;
-
-    /** REST requests executor service. */
-    private ExecutorService restExecSvc;
-
-    /** REST executor service shutdown flag. */
-    private boolean restSvcShutdown = true;
-
-    /** Client message interceptor. */
-    private GridClientMessageInterceptor clientMsgInterceptor;
-
-    /**
-     * Creates client connection configuration with all default values.
-     */
-    public GridClientConnectionConfiguration() {
-        // No-op.
-    }
-
-    /**
-     * Creates client connection configuration by copying all properties from
-     * given configuration.
-     *
-     * @param cfg Client configuration.
-     */
-    public GridClientConnectionConfiguration(GridClientConnectionConfiguration cfg) {
-        assert cfg != null;
-
-        clientMsgInterceptor = cfg.getClientMessageInterceptor();
-        restAccessibleFolders = cfg.getRestAccessibleFolders();
-        restExecSvc = cfg.getRestExecutorService();
-        restSvcShutdown = cfg.isRestExecutorServiceShutdown();
-        restIdleTimeout = cfg.getRestIdleTimeout();
-        jettyPath = cfg.getRestJettyPath();
-        restPortRange = cfg.getRestPortRange();
-        restSecretKey = cfg.getRestSecretKey();
-        restTcpDirectBuf = cfg.isRestTcpDirectBuffer();
-        restTcpHost = cfg.getRestTcpHost();
-        restTcpNoDelay = cfg.isRestTcpNoDelay();
-        restTcpPort = cfg.getRestTcpPort();
-        restTcpRcvBufSize = cfg.getRestTcpReceiveBufferSize();
-        restTcpSelectorCnt = cfg.getRestTcpSelectorCount();
-        restTcpSndBufSize = cfg.getRestTcpSendBufferSize();
-        restTcpSndQueueLimit = cfg.getRestTcpSendQueueLimit();
-        restTcpSslClientAuth = cfg.isRestTcpSslClientAuth();
-        restTcpSslCtxFactory = cfg.getRestTcpSslContextFactory();
-        restTcpSslEnabled = cfg.isRestTcpSslEnabled();
-    }
-
-    /**
-     * Sets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code JETTY}
-     * XML configuration file. {@code JETTY} is used to support REST over HTTP protocol for
-     * accessing GridGain APIs remotely.
-     *
-     * @param jettyPath Path to {@code JETTY} XML configuration file.
-     */
-    public void setRestJettyPath(String jettyPath) {
-        this.jettyPath = jettyPath;
-    }
-
-    /**
-     * Gets path, either absolute or relative to {@code GRIDGAIN_HOME}, to {@code Jetty}
-     * XML configuration file. {@code Jetty} is used to support REST over HTTP protocol for
-     * accessing GridGain APIs remotely.
-     * <p>
-     * If not provided, Jetty instance with default configuration will be started picking
-     * {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST} and {@link org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT}
-     * as host and port respectively.
-     *
-     * @return Path to {@code JETTY} XML configuration file.
-     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
-     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
-     */
-    public String getRestJettyPath() {
-        return jettyPath;
-    }
-
-    /**
-     * Sets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
-     *
-     * @param restSecretKey REST secret key.
-     */
-    public void setRestSecretKey(@Nullable String restSecretKey) {
-        this.restSecretKey = restSecretKey;
-    }
-
-    /**
-     * Gets secret key to authenticate REST requests. If key is {@code null} or empty authentication is disabled.
-     *
-     * @return Secret key.
-     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_HOST
-     * @see org.apache.ignite.IgniteSystemProperties#GG_JETTY_PORT
-     */
-    @Nullable public String getRestSecretKey() {
-        return restSecretKey;
-    }
-
-    /**
-     * Gets host for TCP binary protocol server. This can be either an
-     * IP address or a domain name.
-     * <p>
-     * If not defined, system-wide local address will be used
-     * (see {@link IgniteConfiguration#getLocalHost()}.
-     * <p>
-     * You can also use {@code 0.0.0.0} value to bind to all
-     * locally-available IP addresses.
-     *
-     * @return TCP host.
-     */
-    public String getRestTcpHost() {
-        return restTcpHost;
-    }
-
-    /**
-     * Sets host for TCP binary protocol server.
-     *
-     * @param restTcpHost TCP host.
-     */
-    public void setRestTcpHost(String restTcpHost) {
-        this.restTcpHost = restTcpHost;
-    }
-
-    /**
-     * Gets port for TCP binary protocol server.
-     * <p>
-     * Default is {@link #DFLT_TCP_PORT}.
-     *
-     * @return TCP port.
-     */
-    public int getRestTcpPort() {
-        return restTcpPort;
-    }
-
-    /**
-     * Sets port for TCP binary protocol server.
-     *
-     * @param restTcpPort TCP port.
-     */
-    public void setRestTcpPort(int restTcpPort) {
-        this.restTcpPort = restTcpPort;
-    }
-
-    /**
-     * Gets flag indicating whether {@code TCP_NODELAY} option should be set for accepted client connections.
-     * Setting this option reduces network latency and should be set to {@code true} in majority of cases.
-     * For more information, see {@link Socket#setTcpNoDelay(boolean)}
-     * <p/>
-     * If not specified, default value is {@link #DFLT_TCP_NODELAY}.
-     *
-     * @return Whether {@code TCP_NODELAY} option should be enabled.
-     */
-    public boolean isRestTcpNoDelay() {
-        return restTcpNoDelay;
-    }
-
-    /**
-     * Sets whether {@code TCP_NODELAY} option should be set for all accepted client connections.
-     *
-     * @param restTcpNoDelay {@code True} if option should be enabled.
-     * @see #isRestTcpNoDelay()
-     */
-    public void setRestTcpNoDelay(boolean restTcpNoDelay) {
-        this.restTcpNoDelay = restTcpNoDelay;
-    }
-
-    /**
-     * Gets flag indicating whether REST TCP server should use direct buffers. A direct buffer is a buffer
-     * that is allocated and accessed using native system calls, without using JVM heap. Enabling direct
-     * buffer <em>may</em> improve performance and avoid memory issues (long GC pauses due to huge buffer
-     * size).
-     *
-     * @return Whether direct buffer should be used.
-     */
-    public boolean isRestTcpDirectBuffer() {
-        return restTcpDirectBuf;
-    }
-
-    /**
-     * Sets whether to use direct buffer for REST TCP server.
-     *
-     * @param restTcpDirectBuf {@code True} if option should be enabled.
-     * @see #isRestTcpDirectBuffer()
-     */
-    public void setRestTcpDirectBuffer(boolean restTcpDirectBuf) {
-        this.restTcpDirectBuf = restTcpDirectBuf;
-    }
-
-    /**
-     * Gets REST TCP server send buffer size.
-     *
-     * @return REST TCP server send buffer size (0 for default).
-     */
-    public int getRestTcpSendBufferSize() {
-        return restTcpSndBufSize;
-    }
-
-    /**
-     * Sets REST TCP server send buffer size.
-     *
-     * @param restTcpSndBufSize Send buffer size.
-     * @see #getRestTcpSendBufferSize()
-     */
-    public void setRestTcpSendBufferSize(int restTcpSndBufSize) {
-        this.restTcpSndBufSize = restTcpSndBufSize;
-    }
-
-    /**
-     * Gets REST TCP server receive buffer size.
-     *
-     * @return REST TCP server receive buffer size (0 for default).
-     */
-    public int getRestTcpReceiveBufferSize() {
-        return restTcpRcvBufSize;
-    }
-
-    /**
-     * Sets REST TCP server receive buffer size.
-     *
-     * @param restTcpRcvBufSize Receive buffer size.
-     * @see #getRestTcpReceiveBufferSize()
-     */
-    public void setRestTcpReceiveBufferSize(int restTcpRcvBufSize) {
-        this.restTcpRcvBufSize = restTcpRcvBufSize;
-    }
-
-    /**
-     * Gets REST TCP server send queue limit. If the limit exceeds, all successive writes will
-     * block until the queue has enough capacity.
-     *
-     * @return REST TCP server send queue limit (0 for unlimited).
-     */
-    public int getRestTcpSendQueueLimit() {
-        return restTcpSndQueueLimit;
-    }
-
-    /**
-     * Sets REST TCP server send queue limit.
-     *
-     * @param restTcpSndQueueLimit REST TCP server send queue limit (0 for unlimited).
-     * @see #getRestTcpSendQueueLimit()
-     */
-    public void setRestTcpSendQueueLimit(int restTcpSndQueueLimit) {
-        this.restTcpSndQueueLimit = restTcpSndQueueLimit;
-    }
-
-    /**
-     * Gets number of selector threads in REST TCP server. Higher value for this parameter
-     * may increase throughput, but also increases context switching.
-     *
-     * @return Number of selector threads for REST TCP server.
-     */
-    public int getRestTcpSelectorCount() {
-        return restTcpSelectorCnt;
-    }
-
-    /**
-     * Sets number of selector threads for REST TCP server.
-     *
-     * @param restTcpSelectorCnt Number of selector threads for REST TCP server.
-     * @see #getRestTcpSelectorCount()
-     */
-    public void setRestTcpSelectorCount(int restTcpSelectorCnt) {
-        this.restTcpSelectorCnt = restTcpSelectorCnt;
-    }
-
-    /**
-     * Gets idle timeout for REST server.
-     * <p>
-     * This setting is used to reject half-opened sockets. If no packets
-     * come within idle timeout, the connection is closed.
-     *
-     * @return Idle timeout in milliseconds.
-     */
-    public long getRestIdleTimeout() {
-        return restIdleTimeout;
-    }
-
-    /**
-     * Sets idle timeout for REST server.
-     *
-     * @param restIdleTimeout Idle timeout in milliseconds.
-     * @see #getRestIdleTimeout()
-     */
-    public void setRestIdleTimeout(long restIdleTimeout) {
-        this.restIdleTimeout = restIdleTimeout;
-    }
-
-    /**
-     * Whether secure socket layer should be enabled on binary rest server.
-     * <p>
-     * Note that if this flag is set to {@code true}, an instance of {@link GridSslContextFactory}
-     * should be provided, otherwise binary rest protocol will fail to start.
-     *
-     * @return {@code True} if SSL should be enabled.
-     */
-    public boolean isRestTcpSslEnabled() {
-        return restTcpSslEnabled;
-    }
-
-    /**
-     * Sets whether Secure Socket Layer should be enabled for REST TCP binary protocol.
-     * <p/>
-     * Note that if this flag is set to {@code true}, then a valid instance of {@link GridSslContextFactory}
-     * should be provided in {@code GridConfiguration}. Otherwise, TCP binary protocol will fail to start.
-     *
-     * @param restTcpSslEnabled {@code True} if SSL should be enabled.
-     */
-    public void setRestTcpSslEnabled(boolean restTcpSslEnabled) {
-        this.restTcpSslEnabled = restTcpSslEnabled;
-    }
-
-    /**
-     * Gets a flag indicating whether or not remote clients will be required to have a valid SSL certificate which
-     * validity will be verified with trust manager.
-     *
-     * @return Whether or not client authentication is required.
-     */
-    public boolean isRestTcpSslClientAuth() {
-        return restTcpSslClientAuth;
-    }
-
-    /**
-     * Sets flag indicating whether or not SSL client authentication is required.
-     *
-     * @param needClientAuth Whether or not client authentication is required.
-     */
-    public void setRestTcpSslClientAuth(boolean needClientAuth) {
-        restTcpSslClientAuth = needClientAuth;
-    }
-
-    /**
-     * Gets context factory that will be used for creating a secure socket layer of rest binary server.
-     *
-     * @return SslContextFactory instance.
-     * @see GridSslContextFactory
-     */
-    public GridSslContextFactory getRestTcpSslContextFactory() {
-        return restTcpSslCtxFactory;
-    }
-
-    /**
-     * Sets instance of {@link GridSslContextFactory} that will be used to create an instance of {@code SSLContext}
-     * for Secure Socket Layer on TCP binary protocol. This factory will only be used if
-     * {@link #setRestTcpSslEnabled(boolean)} is set to {@code true}.
-     *
-     * @param restTcpSslCtxFactory Instance of {@link GridSslContextFactory}
-     */
-    public void setRestTcpSslContextFactory(GridSslContextFactory restTcpSslCtxFactory) {
-        this.restTcpSslCtxFactory = restTcpSslCtxFactory;
-    }
-
-    /**
-     * Gets number of ports to try if configured port is already in use.
-     *
-     * @return Number of ports to try.
-     */
-    public int getRestPortRange() {
-        return restPortRange;
-    }
-
-    /**
-     * Sets number of ports to try if configured one is in use.
-     *
-     * @param restPortRange Port range.
-     */
-    public void setRestPortRange(int restPortRange) {
-        this.restPortRange = restPortRange;
-    }
-
-    /**
-     * Gets list of folders that are accessible for log reading command. When remote client requests
-     * a log file, file path is checked against this list. If requested file is not located in any
-     * sub-folder of these folders, request is not processed.
-     * <p>
-     * By default, list consists of a single {@code GRIDGAIN_HOME} folder. If {@code GRIDGAIN_HOME}
-     * could not be detected and property is not specified, no restrictions applied.
-     *
-     * @return Array of folders that are allowed be read by remote clients.
-     */
-    public String[] getRestAccessibleFolders() {
-        return restAccessibleFolders;
-    }
-
-    /**
-     * Sets array of folders accessible by REST processor for log reading command.
-     *
-     * @param restAccessibleFolders Array of folder paths.
-     */
-    public void setRestAccessibleFolders(String... restAccessibleFolders) {
-        this.restAccessibleFolders = restAccessibleFolders;
-    }
-
-    /**
-     * Should return an instance of fully configured thread pool to be used for
-     * processing of client messages (REST requests).
-     * <p>
-     * If not provided, new executor service will be created using the following
-     * configuration:
-     * <ul>
-     *     <li>Core pool size - {@link #DFLT_REST_CORE_THREAD_CNT}</li>
-     *     <li>Max pool size - {@link #DFLT_REST_MAX_THREAD_CNT}</li>
-     *     <li>Queue capacity - {@link #DFLT_REST_THREADPOOL_QUEUE_CAP}</li>
-     * </ul>
-     *
-     * @return Thread pool implementation to be used for processing of client
-     *      messages.
-     */
-    public ExecutorService getRestExecutorService() {
-        return restExecSvc;
-    }
-
-    /**
-     * Sets thread pool to use for processing of client messages (REST requests).
-     *
-     * @param restExecSvc Thread pool to use for processing of client messages.
-     * @see IgniteConfiguration#getRestExecutorService()
-     */
-    public void setRestExecutorService(ExecutorService restExecSvc) {
-        this.restExecSvc = restExecSvc;
-    }
-
-    /**
-     * Sets REST executor service shutdown flag.
-     *
-     * @param restSvcShutdown REST executor service shutdown flag.
-     * @see IgniteConfiguration#getRestExecutorService()
-     */
-    public void setRestExecutorServiceShutdown(boolean restSvcShutdown) {
-        this.restSvcShutdown = restSvcShutdown;
-    }
-
-    /**
-     * Shutdown flag for REST executor service.
-     * <p>
-     * If not provided, default value {@code true} will be used which will shutdown
-     * executor service when GridGain stops regardless whether it was started before GridGain
-     * or by GridGain.
-     *
-     * @return REST executor service shutdown flag.
-     */
-    public boolean isRestExecutorServiceShutdown() {
-        return restSvcShutdown;
-    }
-
-    /**
-     * Gets interceptor for objects, moving to and from remote clients.
-     * If this method returns {@code null} then no interception will be applied.
-     * <p>
-     * Setting interceptor allows to transform all objects exchanged via REST protocol.
-     * For example if you use custom serialisation on client you can write interceptor
-     * to transform binary representations received from client to Java objects and later
-     * access them from java code directly.
-     * <p>
-     * Default value is {@code null}.
-     *
-     * @see GridClientMessageInterceptor
-     * @return Interceptor.
-     */
-    @Nullable public GridClientMessageInterceptor getClientMessageInterceptor() {
-        return clientMsgInterceptor;
-    }
-
-    /**
-     * Sets client message interceptor.
-     * <p>
-     * Setting interceptor allows to transform all objects exchanged via REST protocol.
-     * For example if you use custom serialisation on client you can write interceptor
-     * to transform binary representations received from client to Java objects and later
-     * access them from java code directly.
-     *
-     * @param interceptor Interceptor.
-     */
-    public void setClientMessageInterceptor(GridClientMessageInterceptor interceptor) {
-        clientMsgInterceptor = interceptor;
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
index a62c2bc..f3d5c69 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessor.java
@@ -9,6 +9,7 @@
 
 package org.gridgain.grid.kernal.processors.rest;
 
+import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;
@@ -321,7 +322,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
 
     /**
      * Applies {@link GridClientMessageInterceptor}
-     * from {@link GridClientConnectionConfiguration#getClientMessageInterceptor()}
+     * from {@link org.apache.ignite.configuration.GridClientConnectionConfiguration#getClientMessageInterceptor()}
      * to all user parameters in the request.
      *
      * @param req Client request.
@@ -368,7 +369,7 @@ public class GridRestProcessor extends GridProcessorAdapter {
 
     /**
      * Applies {@link GridClientMessageInterceptor} from
-     * {@link GridClientConnectionConfiguration#getClientMessageInterceptor()}
+     * {@link org.apache.ignite.configuration.GridClientConnectionConfiguration#getClientMessageInterceptor()}
      * to all user objects in the response.
      *
      * @param res Response.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
index b6617ba..b2c662c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/rest/protocols/GridRestProtocolAdapter.java
@@ -10,6 +10,7 @@
 package org.gridgain.grid.kernal.processors.rest.protocols;
 
 import org.apache.ignite.*;
+import org.apache.ignite.configuration.*;
 import org.apache.ignite.lang.*;
 import org.gridgain.grid.*;
 import org.gridgain.grid.kernal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
index b18df29..5a9eb1c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorExecutorServiceConfiguration.java
@@ -10,7 +10,6 @@
 package org.gridgain.grid.kernal.visor.node;
 
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.internal.*;
 
 import java.io.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f92f248/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
index 7df33b4..9f8e460 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorRestConfiguration.java
@@ -10,7 +10,6 @@
 package org.gridgain.grid.kernal.visor.node;
 
 import org.apache.ignite.configuration.*;
-import org.gridgain.grid.*;
 import org.gridgain.grid.util.typedef.internal.*;
 import org.jetbrains.annotations.*;
 


Mime
View raw message