#IGNITE-160 Removed restEnabled property from xml.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a05fb665 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a05fb665 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a05fb665 Branch: refs/heads/ignite-sql-tests Commit: a05fb66505a63e64baf3325abb6c54930eb2bb86 Parents: 14fd47c Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Feb 9 10:54:00 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Feb 9 10:54:00 2015 +0300 ---------------------------------------------------------------------- .../src/test/resources/spring-server-node.xml | 3 -- .../test/resources/spring-server-ssl-node.xml | 3 -- .../org/apache/ignite/internal/IgnitionEx.java | 38 ++++++++++---------- .../test/config/default-spring-url-testing.xml | 2 -- modules/core/src/test/config/example-cache.xml | 2 -- .../src/test/config/io-manager-benchmark.xml | 1 - .../src/test/config/job-loadtest/client.xml | 2 -- .../src/test/config/job-loadtest/server.xml | 2 -- modules/core/src/test/config/jobs-load-base.xml | 2 -- .../src/test/config/load/cache-benchmark.xml | 2 -- .../test/config/load/cache-client-benchmark.xml | 2 -- .../core/src/test/config/load/dsi-load-base.xml | 2 -- .../src/test/config/load/merge-sort-base.xml | 2 -- .../test/config/loaders/grid-cfg-2-grids.xml | 4 --- .../core/src/test/config/loaders/grid-cfg.xml | 5 --- .../config/spring-cache-put-remove-load.xml | 2 -- .../src/test/config/spring-start-nodes-attr.xml | 2 -- .../core/src/test/config/spring-start-nodes.xml | 2 -- .../config/streamer/spring-streamer-base.xml | 2 -- .../test/config/websession/spring-cache-1.xml | 2 -- .../test/config/websession/spring-cache-2.xml | 2 -- .../test/config/websession/spring-cache-3.xml | 2 -- modules/yardstick/config/ignite-base-config.xml | 2 -- .../yardstick/config/ignite-store-config.xml | 2 -- 24 files changed, 19 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 3b7fb06..83d9114 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -63,9 +63,6 @@ <!-- Set to local host address. --> <property name="localHost" value="127.0.0.1"/> - <!-- Enable rest protocol. --> - <property name="restEnabled" value="true"/> - <!-- Configure to skip all events for better performance. --> <property name="includeEventTypes"> <list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 f0da77c..f396798 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -63,9 +63,6 @@ <!-- Set to local host address. --> <property name="localHost" value="127.0.0.1"/> - <!-- Enable rest protocol. --> - <property name="restEnabled" value="true"/> - <!-- Client configuration. --> <property name="clientConnectionConfiguration"> <bean class="org.apache.ignite.configuration.ClientConnectionConfiguration"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 90b2561..ac8aa14 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 @@ -1394,25 +1394,25 @@ public class IgnitionEx { ClientConnectionConfiguration clientCfg = cfg.getClientConnectionConfiguration(); if (clientCfg == null) { - clientCfg = new ClientConnectionConfiguration(); - - clientCfg.setClientMessageInterceptor(cfg.getClientMessageInterceptor()); - clientCfg.setRestAccessibleFolders(cfg.getRestAccessibleFolders()); - clientCfg.setRestIdleTimeout(cfg.getRestIdleTimeout()); - clientCfg.setRestJettyPath(cfg.getRestJettyPath()); - clientCfg.setRestPortRange(cfg.getRestPortRange()); - clientCfg.setRestSecretKey(cfg.getRestSecretKey()); - clientCfg.setRestTcpDirectBuffer(cfg.isRestTcpDirectBuffer()); - clientCfg.setRestTcpHost(cfg.getRestTcpHost()); - clientCfg.setRestTcpNoDelay(cfg.isRestTcpNoDelay()); - clientCfg.setRestTcpPort(cfg.getRestTcpPort()); - clientCfg.setRestTcpReceiveBufferSize(cfg.getRestTcpReceiveBufferSize()); - clientCfg.setRestTcpSelectorCount(cfg.getRestTcpSelectorCount()); - clientCfg.setRestTcpSendBufferSize(cfg.getRestTcpSendBufferSize()); - clientCfg.setRestTcpSendQueueLimit(cfg.getRestTcpSendQueueLimit()); - clientCfg.setRestTcpSslClientAuth(cfg.isRestTcpSslClientAuth()); - clientCfg.setRestTcpSslContextFactory(cfg.getRestTcpSslContextFactory()); - clientCfg.setRestTcpSslEnabled(cfg.isRestTcpSslEnabled()); + clientCfg = new ClientConnectionConfiguration(); + + clientCfg.setClientMessageInterceptor(cfg.getClientMessageInterceptor()); + clientCfg.setRestAccessibleFolders(cfg.getRestAccessibleFolders()); + clientCfg.setRestIdleTimeout(cfg.getRestIdleTimeout()); + clientCfg.setRestJettyPath(cfg.getRestJettyPath()); + clientCfg.setRestPortRange(cfg.getRestPortRange()); + clientCfg.setRestSecretKey(cfg.getRestSecretKey()); + clientCfg.setRestTcpDirectBuffer(cfg.isRestTcpDirectBuffer()); + clientCfg.setRestTcpHost(cfg.getRestTcpHost()); + clientCfg.setRestTcpNoDelay(cfg.isRestTcpNoDelay()); + clientCfg.setRestTcpPort(cfg.getRestTcpPort()); + clientCfg.setRestTcpReceiveBufferSize(cfg.getRestTcpReceiveBufferSize()); + clientCfg.setRestTcpSelectorCount(cfg.getRestTcpSelectorCount()); + clientCfg.setRestTcpSendBufferSize(cfg.getRestTcpSendBufferSize()); + clientCfg.setRestTcpSendQueueLimit(cfg.getRestTcpSendQueueLimit()); + clientCfg.setRestTcpSslClientAuth(cfg.isRestTcpSslClientAuth()); + clientCfg.setRestTcpSslContextFactory(cfg.getRestTcpSslContextFactory()); + clientCfg.setRestTcpSslEnabled(cfg.isRestTcpSslEnabled()); } else clientCfg = new ClientConnectionConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 9185e04..6564f10 100644 --- a/modules/core/src/test/config/default-spring-url-testing.xml +++ b/modules/core/src/test/config/default-spring-url-testing.xml @@ -37,7 +37,5 @@ Specify grid instance name. --> <property name="gridName" value="grid_with_url_config"/> - - <property name="restEnabled" value="false" /> </bean> </beans> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 ab40d1f..d809d71 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -35,8 +35,6 @@ 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"/> - <!-- 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/a05fb665/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 a53ff55..a5a4ca9 100644 --- a/modules/core/src/test/config/io-manager-benchmark.xml +++ b/modules/core/src/test/config/io-manager-benchmark.xml @@ -47,7 +47,6 @@ <!-- Various optimisations. --> <property name="peerClassLoadingEnabled" value="false"/> - <property name="restEnabled" value="false"/> <property name="cacheSanityCheckEnabled" value="false"/> <property name="includeEventTypes"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 a273367..e96c4db 100644 --- a/modules/core/src/test/config/job-loadtest/client.xml +++ b/modules/core/src/test/config/job-loadtest/client.xml @@ -36,8 +36,6 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> - <property name="deploymentMode" value="CONTINUOUS"/> <property name="failoverSpi"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 e709e82..0d002c7 100644 --- a/modules/core/src/test/config/job-loadtest/server.xml +++ b/modules/core/src/test/config/job-loadtest/server.xml @@ -36,8 +36,6 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> - <property name="deploymentMode" value="CONTINUOUS"/> <property name="executorService"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 ce985ef..bfd78bb 100644 --- a/modules/core/src/test/config/jobs-load-base.xml +++ b/modules/core/src/test/config/jobs-load-base.xml @@ -77,8 +77,6 @@ <property name="peerClassLoadingEnabled" value="false"/> - <property name="restEnabled" value="false"/> - <property name="cacheConfiguration"> <list/> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 53c3a13..3f67dfd 100644 --- a/modules/core/src/test/config/load/cache-benchmark.xml +++ b/modules/core/src/test/config/load/cache-benchmark.xml @@ -60,8 +60,6 @@ </list> </property> - <property name="restEnabled" value="false"/> - <property name="includeEventTypes"> <list> <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FAILED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 4576694..3d367e4 100644 --- a/modules/core/src/test/config/load/cache-client-benchmark.xml +++ b/modules/core/src/test/config/load/cache-client-benchmark.xml @@ -60,8 +60,6 @@ </list> </property> - <property name="restEnabled" value="false"/> - <property name="includeEventTypes"> <list> <util:constant static-field="org.apache.ignite.events.EventType.EVT_TASK_FAILED"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 7299de5..fe32f1b 100644 --- a/modules/core/src/test/config/load/dsi-load-base.xml +++ b/modules/core/src/test/config/load/dsi-load-base.xml @@ -72,8 +72,6 @@ <property name="peerClassLoadingEnabled" value="false"/> - <property name="restEnabled" value="false"/> - <property name="deploymentMode" value="CONTINUOUS"/> <property name="executorService"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 63eaab2..65bdcf0 100644 --- a/modules/core/src/test/config/load/merge-sort-base.xml +++ b/modules/core/src/test/config/load/merge-sort-base.xml @@ -27,8 +27,6 @@ <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="localHost" value="127.0.0.1"/> <property name="networkTimeout" value="20000"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 2875bd4..aa7fb06 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 @@ -31,8 +31,6 @@ <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="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> @@ -48,8 +46,6 @@ <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="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 4980946..7252ecf 100644 --- a/modules/core/src/test/config/loaders/grid-cfg.xml +++ b/modules/core/src/test/config/loaders/grid-cfg.xml @@ -30,9 +30,6 @@ --> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" singleton="true"> <!-- Grid with default name. --> - - <property name="restEnabled" value="false" /> - <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> @@ -48,8 +45,6 @@ <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="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 9673e22..6383582 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,8 +41,6 @@ </list> </property> - <property name="restEnabled" value="false"/> - <property name="includeEventTypes"> <list/> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 d396d2d..422b1a4 100644 --- a/modules/core/src/test/config/spring-start-nodes-attr.xml +++ b/modules/core/src/test/config/spring-start-nodes-attr.xml @@ -34,8 +34,6 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> - <property name="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> <property name="requireSerializable" value="false"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 c3f4538..93469f8 100644 --- a/modules/core/src/test/config/spring-start-nodes.xml +++ b/modules/core/src/test/config/spring-start-nodes.xml @@ -28,8 +28,6 @@ <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="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> <property name="requireSerializable" value="false"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 7ef7946..60ce701 100644 --- a/modules/core/src/test/config/streamer/spring-streamer-base.xml +++ b/modules/core/src/test/config/streamer/spring-streamer-base.xml @@ -43,8 +43,6 @@ <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="localHost" ref="localHost"/> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 cc09d81..fd0073b 100644 --- a/modules/core/src/test/config/websession/spring-cache-1.xml +++ b/modules/core/src/test/config/websession/spring-cache-1.xml @@ -27,8 +27,6 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> - <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 c7d61ba..bbb371e 100644 --- a/modules/core/src/test/config/websession/spring-cache-2.xml +++ b/modules/core/src/test/config/websession/spring-cache-2.xml @@ -27,8 +27,6 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> - <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 f94f65a..293733b 100644 --- a/modules/core/src/test/config/websession/spring-cache-3.xml +++ b/modules/core/src/test/config/websession/spring-cache-3.xml @@ -27,8 +27,6 @@ <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> - <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 638b893..61f66d8 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -184,8 +184,6 @@ </list> </property> - <property name="restEnabled" value="false"/> - <property name="includeEventTypes"> <list/> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05fb665/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 32619ce..b107621 100644 --- a/modules/yardstick/config/ignite-store-config.xml +++ b/modules/yardstick/config/ignite-store-config.xml @@ -156,8 +156,6 @@ </list> </property> - <property name="restEnabled" value="false"/> - <property name="includeEventTypes"> <list/> </property>
