ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [37/50] [abbrv] incubator-ignite git commit: # IGNITE-128: Minors in Ignite.
Date Wed, 11 Feb 2015 01:35:06 GMT
# IGNITE-128: Minors in Ignite.


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

Branch: refs/heads/ignite-82
Commit: 3853effe1e9ee4da6ef88e9cd602ad216e13b977
Parents: f394d95
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Feb 10 17:05:44 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Feb 10 17:05:44 2015 +0300

----------------------------------------------------------------------
 modules/clients/src/test/resources/spring-cache.xml          | 5 -----
 modules/clients/src/test/resources/spring-server-node.xml    | 2 +-
 .../clients/src/test/resources/spring-server-ssl-node.xml    | 8 ++++----
 .../internal/client/router/GridTcpRouterConfiguration.java   | 2 +-
 .../ignite/internal/processors/rest/GridRestProcessor.java   | 8 ++++----
 .../org/apache/ignite/internal/util/nio/GridNioServer.java   | 2 +-
 6 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3853effe/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 053cd8a..a9fe31a 100644
--- a/modules/clients/src/test/resources/spring-cache.xml
+++ b/modules/clients/src/test/resources/spring-cache.xml
@@ -47,11 +47,6 @@
         <!-- Set to local host address just for examples. -->
         <property name="localHost" value="127.0.0.1"/>
 
-        <!-- Client configuration. -->
-        <property name="connectorConfiguration">
-            <bean class="org.apache.ignite.configuration.ConnectorConfiguration"/>
-        </property>
-
         <property name="cacheConfiguration">
             <!--
                 Specify list of cache configurations here. Any property from

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3853effe/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 f31b760..459353c 100644
--- a/modules/clients/src/test/resources/spring-server-node.xml
+++ b/modules/clients/src/test/resources/spring-server-node.xml
@@ -97,7 +97,7 @@
         <property name="connectorConfiguration">
             <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
                 <!-- Configure TCP rest protocol. -->
-                <property name="restTcpPort" value="10080"/>
+                <property name="port" value="10080"/>
             </bean>
         </property>
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3853effe/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 cfc64d6..bf2aa00 100644
--- a/modules/clients/src/test/resources/spring-server-ssl-node.xml
+++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml
@@ -67,12 +67,12 @@
         <property name="connectorConfiguration">
             <bean class="org.apache.ignite.configuration.ConnectorConfiguration">
                 <!-- Configure TCP+SSL rest protocol. -->
-                <property name="restTcpSslEnabled" value="true"/>
+                <property name="sslEnabled" value="true"/>
 
                 <!-- Sets flag indicating whether or not SSL client authentication is
required. -->
-                <property name="restTcpSslClientAuth" value="true"/>
+                <property name="sslClientAuth" value="true"/>
 
-                <property name="restTcpSslContextFactory">
+                <property name="sslContextFactory">
                     <bean class="org.apache.ignite.internal.client.ssl.GridSslBasicContextFactory">
                         <property name="keyStoreFilePath" value="${CLIENTS_MODULE_PATH}/src/test/keystore/server.jks"/>
                         <property name="keyStorePassword" value="123456"/>
@@ -81,7 +81,7 @@
                     </bean>
                 </property>
 
-                <property name="restTcpPort" value="10443"/>
+                <property name="port" value="10443"/>
             </bean>
         </property>
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3853effe/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 9092520..9e3c22a 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
@@ -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 org.apache.ignite.configuration.ConnectorConfiguration#DFLT_IDLE_TIMEOUT}.
+     * If not specified, default value is {@link ConnectorConfiguration#DFLT_IDLE_TIMEOUT}.
      *
      * @return Idle timeout.
      */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3853effe/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 b40f303..8023f70 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,8 +327,8 @@ public class GridRestProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * Applies {@link ClientMessageInterceptor}
-     * from {@link ClientConnectionConfiguration#getClientMessageInterceptor()}
+     * Applies {@link ConnectorMessageInterceptor}
+     * from {@link ConnectorConfiguration#getMessageInterceptor()} ()}
      * to all user parameters in the request.
      *
      * @param req Client request.
@@ -374,8 +374,8 @@ public class GridRestProcessor extends GridProcessorAdapter {
     }
 
     /**
-     * Applies {@link ClientMessageInterceptor} from
-     * {@link ClientConnectionConfiguration#getClientMessageInterceptor()}
+     * Applies {@link ConnectorMessageInterceptor} from
+     * {@link ConnectorConfiguration#getMessageInterceptor()}
      * to all user objects in the response.
      *
      * @param res Response.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3853effe/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 ed91f89..e22a723 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
@@ -513,7 +513,7 @@ public class GridNioServer<T> {
 
     /**
      * Gets configurable idle timeout for this session. If not set, default value is
-     * {@link org.apache.ignite.configuration.ConnectorConfiguration#DFLT_IDLE_TIMEOUT}.
+     * {@link ConnectorConfiguration#DFLT_IDLE_TIMEOUT}.
      *
      * @return Idle timeout in milliseconds.
      */


Mime
View raw message