Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 6127f17b5 -> 269142161
IGNITE-94 localhost deleted, finder changed to multicast Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92054759 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92054759 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92054759 Branch: refs/heads/sprint-1 Commit: 92054759e958eef7685cbddb2ab0ceb7f20a3115 Parents: 1a2e7d4 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Jan 20 15:40:48 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Jan 20 15:40:48 2015 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 9 +++---- examples/config/example-compute.xml | 9 +++---- examples/config/example-streamer.xml | 9 +++---- examples/config/filesystem/example-ggfs.xml | 9 +++---- .../examples/misc/springbean/spring-bean.xml | 9 +++---- .../clients/src/test/resources/spring-cache.xml | 8 +++---- .../src/test/resources/spring-server-node.xml | 7 +++--- .../test/resources/spring-server-ssl-node.xml | 7 +++--- .../spring-cache-client-benchmark-1.xml | 7 +++--- .../spring-cache-client-benchmark-2.xml | 7 +++--- .../spring-cache-client-benchmark-3.xml | 7 +++--- modules/core/src/test/config/example-cache.xml | 9 +++---- modules/core/src/test/config/ggfs-loopback.xml | 24 +++---------------- .../core/src/test/config/ggfs-no-endpoint.xml | 25 +++----------------- modules/core/src/test/config/ggfs-shmem.xml | 24 +++---------------- .../src/test/config/io-manager-benchmark.xml | 6 ++--- .../src/test/config/job-loadtest/client.xml | 6 ++--- .../src/test/config/job-loadtest/server.xml | 6 ++--- modules/core/src/test/config/jobs-load-base.xml | 6 ++--- .../src/test/config/load/cache-benchmark.xml | 6 ++--- .../test/config/load/cache-client-benchmark.xml | 6 ++--- .../core/src/test/config/load/dsi-load-base.xml | 7 +++--- .../src/test/config/load/merge-sort-base.xml | 6 ++--- .../core/src/test/config/spring-cache-load.xml | 6 ++--- .../config/spring-cache-put-remove-load.xml | 6 ++--- .../core/src/test/config/spring-cache-swap.xml | 6 ++--- .../src/test/config/spring-cache-teststore.xml | 6 ++--- .../core/src/test/config/spring-multicache.xml | 7 +++--- .../src/test/config/spring-start-nodes-attr.xml | 6 ++--- .../core/src/test/config/spring-start-nodes.xml | 6 ++--- .../test/config/websession/spring-cache-1.xml | 6 ++--- .../test/config/websession/spring-cache-2.xml | 6 ++--- .../test/config/websession/spring-cache-3.xml | 6 ++--- .../capacity/spring-capacity-cache.xml | 7 +++--- .../loadtests/colocation/spring-colocation.xml | 7 +++--- .../core/src/test/webapp/META-INF/gg-config.xml | 22 +++-------------- .../scalar/src/test/resources/spring-cache.xml | 6 ++--- .../test/resources/spring-ping-pong-partner.xml | 22 +++-------------- 38 files changed, 114 insertions(+), 230 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/examples/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index 397c2cf..9f66905 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/example-cache.xml @@ -35,9 +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"> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Set to true to enable grid-aware class loading for examples, default is false. --> <property name="peerClassLoadingEnabled" value="true"/> @@ -113,9 +110,9 @@ instead os static IP based discovery. For information on all options refer to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery --> - <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> - <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/examples/config/example-compute.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-compute.xml b/examples/config/example-compute.xml index ffd0492..af32d1b 100644 --- a/examples/config/example-compute.xml +++ b/examples/config/example-compute.xml @@ -29,9 +29,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"> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Set to true to enable grid-aware class loading for examples, default is false. --> <property name="peerClassLoadingEnabled" value="true"/> @@ -56,9 +53,9 @@ instead os static IP based discovery. For information on all options refer to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery --> - <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> - <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/examples/config/example-streamer.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml index 05bf1ca..139f9ec 100644 --- a/examples/config/example-streamer.xml +++ b/examples/config/example-streamer.xml @@ -46,9 +46,6 @@ Configuration below demonstrates how to setup caches within grid nodes. --> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <property name="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <!-- Set to false to allow non-serializable objects in examples, default is true. --> @@ -279,9 +276,9 @@ instead os static IP based discovery. For information on all options refer to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery --> - <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> - <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/examples/config/filesystem/example-ggfs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml index 4e0a23d..ebfd334 100644 --- a/examples/config/filesystem/example-ggfs.xml +++ b/examples/config/filesystem/example-ggfs.xml @@ -53,9 +53,6 @@ Configuration below demonstrates how to setup a GGFS node with file data. --> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <!-- Explicitly set to local host address. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Set to true to enable grid-aware class loading for examples, default is false. --> <property name="peerClassLoadingEnabled" value="true"/> @@ -151,9 +148,9 @@ instead os static IP based discovery. For information on all options refer to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery --> - <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> - <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml index 4eed607..b49cfe1 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml +++ b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml @@ -32,9 +32,6 @@ <bean id="mySpringBean" class="org.gridgain.grid.GridSpringBean"> <property name="configuration"> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Set to true to enable grid-aware class loading for examples, default is false. --> <property name="peerClassLoadingEnabled" value="true"/> @@ -54,9 +51,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> - <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 116ebfe..ef23147 100644 --- a/modules/clients/src/test/resources/spring-cache.xml +++ b/modules/clients/src/test/resources/spring-cache.xml @@ -43,10 +43,6 @@ --> <property name="peerClassLoadingEnabled" value="true"/> - - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Client configuration. --> <property name="clientConnectionConfiguration"> <bean class="org.apache.ignite.configuration.ClientConnectionConfiguration"/> @@ -203,7 +199,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.GridTcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 8cb61b7..2d918ef 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -60,9 +60,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="gridName" value="node"/> - <!-- Set to local host address. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Enable rest protocol. --> <property name="restEnabled" value="true"/> @@ -294,7 +291,9 @@ <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 5f5ca5d..78f2674 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -60,9 +60,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="gridName" value="sslnode"/> - <!-- Set to local host address. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Enable rest protocol. --> <property name="restEnabled" value="true"/> @@ -261,7 +258,9 @@ <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.GridTcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml index 2da75ec..556405d 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-1.xml @@ -45,9 +45,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="peerClassLoadingEnabled" value="false"/> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <property name="restTcpPort" value="11211"/> <!--<property name="peerClassLoadingEnabled" value="false"/>--> @@ -104,7 +101,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml index 903d131..5198d8d 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-2.xml @@ -43,9 +43,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="peerClassLoadingEnabled" value="false"/> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <property name="restTcpPort" value="11212"/> <!--<property name="peerClassLoadingEnabled" value="false"/>--> @@ -94,7 +91,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml index d1cac65..648ffc0 100644 --- a/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml +++ b/modules/core/src/test/config/benchmark/spring-cache-client-benchmark-3.xml @@ -43,9 +43,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="peerClassLoadingEnabled" value="false"/> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <property name="restTcpPort" value="11213"/> <!--<property name="peerClassLoadingEnabled" value="false"/>--> @@ -94,7 +91,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 25aba6b..6238ed2 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -37,9 +37,6 @@ <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"/> - <!-- Set to true to enable grid-aware class loading for examples, default is false. --> <property name="peerClassLoadingEnabled" value="true"/> @@ -110,9 +107,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> - <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/ggfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml index f96f9c0..f5fdd23 100644 --- a/modules/core/src/test/config/ggfs-loopback.xml +++ b/modules/core/src/test/config/ggfs-loopback.xml @@ -144,18 +144,15 @@ </property> <!-- - Explicitly set to local host address. - --> - <property name="localHost" value="127.0.0.1"/> - - <!-- TCP discovery SPI (uses VM-shared IP-finder). --> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- @@ -176,21 +173,6 @@ </list> </property> </bean> - <!-- - Uncomment this to provide IP finder using multicast for nodes discovery. - In addition to addresses received via multicast this finder can work with pre-configured - list of addresses. - --> - <!-- - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder"> - <property name="addresses"> - <list> - <value>host1:port1</value> - <value>host2:port2</value> - </list> - </property> - </bean> - --> </property> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/ggfs-no-endpoint.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml index 435e688..0505437 100644 --- a/modules/core/src/test/config/ggfs-no-endpoint.xml +++ b/modules/core/src/test/config/ggfs-no-endpoint.xml @@ -144,18 +144,15 @@ </property> <!-- - Explicitly set to local host address. - --> - <property name="localHost" value="127.0.0.1"/> - - <!-- TCP discovery SPI (uses VM-shared IP-finder). --> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- @@ -176,22 +173,6 @@ </list> </property> </bean> - - <!-- - Uncomment this to provide IP finder using multicast for nodes discovery. - In addition to addresses received via multicast this finder can work with pre-configured - list of addresses. - --> - <!-- - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder"> - <property name="addresses"> - <list> - <value>host1:port1</value> - <value>host2:port2</value> - </list> - </property> - </bean> - --> </property> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 907b852..820a95a 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -144,18 +144,15 @@ </property> <!-- - Explicitly set to local host address. - --> - <property name="localHost" value="127.0.0.1"/> - - <!-- TCP discovery SPI (uses VM-shared IP-finder). --> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <!-- Override default IP-finder.--> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- @@ -176,21 +173,6 @@ </list> </property> </bean> - <!-- - Uncomment this to provide IP finder using multicast for nodes discovery. - In addition to addresses received via multicast this finder can work with pre-configured - list of addresses. - --> - <!-- - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder"> - <property name="addresses"> - <list> - <value>host1:port1</value> - <value>host2:port2</value> - </list> - </property> - </bean> - --> </property> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 a2a8574..7cc0613 100644 --- a/modules/core/src/test/config/io-manager-benchmark.xml +++ b/modules/core/src/test/config/io-manager-benchmark.xml @@ -23,8 +23,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="communicationSpi"> <bean class="org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi"> <property name="sharedMemoryPort" value="-1"/> @@ -64,7 +62,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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..7a247b8 100644 --- a/modules/core/src/test/config/job-loadtest/client.xml +++ b/modules/core/src/test/config/job-loadtest/client.xml @@ -33,8 +33,6 @@ </util:map> </property> - <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> <property name="deploymentMode" value="CONTINUOUS"/> @@ -103,7 +101,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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..3203c42 100644 --- a/modules/core/src/test/config/job-loadtest/server.xml +++ b/modules/core/src/test/config/job-loadtest/server.xml @@ -33,8 +33,6 @@ </util:map> </property> - <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> <property name="deploymentMode" value="CONTINUOUS"/> @@ -76,7 +74,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 18c8e60..d10b4ce 100644 --- a/modules/core/src/test/config/jobs-load-base.xml +++ b/modules/core/src/test/config/jobs-load-base.xml @@ -27,8 +27,6 @@ </description> <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <property name="classNames"> @@ -48,7 +46,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 0d3b6a0..6201562 100644 --- a/modules/core/src/test/config/load/cache-benchmark.xml +++ b/modules/core/src/test/config/load/cache-benchmark.xml @@ -27,8 +27,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 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="localHost" value="127.0.0.1"/> - <property name="cacheConfiguration"> <list> <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> @@ -74,7 +72,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 95eb6e2..e74581b 100644 --- a/modules/core/src/test/config/load/cache-client-benchmark.xml +++ b/modules/core/src/test/config/load/cache-client-benchmark.xml @@ -27,8 +27,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd 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="localHost" value="127.0.0.1"/> - <property name="cacheConfiguration"> <list> <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> @@ -74,7 +72,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 ebde53c..d3b11af 100644 --- a/modules/core/src/test/config/load/dsi-load-base.xml +++ b/modules/core/src/test/config/load/dsi-load-base.xml @@ -30,8 +30,6 @@ <bean abstract="true" id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="gridName" value="dsi"/> - <property name="localHost" value="127.0.0.1"/> - <property name="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller"> <property name="classNames"> @@ -51,8 +49,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean - class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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..531e895 100644 --- a/modules/core/src/test/config/load/merge-sort-base.xml +++ b/modules/core/src/test/config/load/merge-sort-base.xml @@ -29,8 +29,6 @@ <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"/> <!-- @@ -114,7 +112,9 @@ <property name="statisticsPrintFrequency" value="60000"/> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/spring-cache-load.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-load.xml b/modules/core/src/test/config/spring-cache-load.xml index 52ab280..70d6107 100644 --- a/modules/core/src/test/config/spring-cache-load.xml +++ b/modules/core/src/test/config/spring-cache-load.xml @@ -45,8 +45,6 @@ GridJobStealingCollisionSpi and GridJobStealingFailoverSPI. --> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="cacheConfiguration"> <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> <property name="cacheMode" value="PARTITIONED"/> @@ -65,7 +63,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 974c71c..85b6500 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 @@ -25,8 +25,6 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="peerClassLoadingEnabled" value="false"/> <property name="cacheConfiguration"> @@ -62,7 +60,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/spring-cache-swap.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-swap.xml b/modules/core/src/test/config/spring-cache-swap.xml index 5b45e3d..bb43ec7 100644 --- a/modules/core/src/test/config/spring-cache-swap.xml +++ b/modules/core/src/test/config/spring-cache-swap.xml @@ -26,8 +26,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="cacheConfiguration"> <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> <property name="cacheMode" value="LOCAL"/> @@ -55,7 +53,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/spring-cache-teststore.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-cache-teststore.xml b/modules/core/src/test/config/spring-cache-teststore.xml index cc53c85..196a902 100644 --- a/modules/core/src/test/config/spring-cache-teststore.xml +++ b/modules/core/src/test/config/spring-cache-teststore.xml @@ -26,8 +26,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="cacheConfiguration"> <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> <property name="cacheMode" value="PARTITIONED"/> @@ -51,7 +49,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/config/spring-multicache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml index a90169f..213dc8d 100644 --- a/modules/core/src/test/config/spring-multicache.xml +++ b/modules/core/src/test/config/spring-multicache.xml @@ -49,9 +49,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="deploymentMode" value="CONTINUOUS"/> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <property name="cacheConfiguration"> <!-- Specify list of cache configurations here. Any property from @@ -247,7 +244,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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..7605966 100644 --- a/modules/core/src/test/config/spring-start-nodes-attr.xml +++ b/modules/core/src/test/config/spring-start-nodes-attr.xml @@ -32,8 +32,6 @@ </map> </property> - <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> <property name="marshaller"> @@ -45,7 +43,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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..7a10e02 100644 --- a/modules/core/src/test/config/spring-start-nodes.xml +++ b/modules/core/src/test/config/spring-start-nodes.xml @@ -26,8 +26,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <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"> @@ -39,7 +37,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 eeb6cab..3d16efa 100644 --- a/modules/core/src/test/config/websession/spring-cache-1.xml +++ b/modules/core/src/test/config/websession/spring-cache-1.xml @@ -25,8 +25,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="gridName" value="grid-1"/> - <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> <property name="cacheConfiguration"> @@ -86,7 +84,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 b22e71f..57113f4 100644 --- a/modules/core/src/test/config/websession/spring-cache-2.xml +++ b/modules/core/src/test/config/websession/spring-cache-2.xml @@ -25,8 +25,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="gridName" value="grid-2"/> - <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> <property name="cacheConfiguration"> @@ -86,7 +84,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/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 f907221..25d1149 100644 --- a/modules/core/src/test/config/websession/spring-cache-3.xml +++ b/modules/core/src/test/config/websession/spring-cache-3.xml @@ -25,8 +25,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="gridName" value="grid-3"/> - <property name="localHost" value="127.0.0.1"/> - <property name="restEnabled" value="false"/> <property name="cacheConfiguration"> @@ -86,7 +84,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml index 7ca639b..5310b2f 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/capacity/spring-capacity-cache.xml @@ -43,9 +43,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="deploymentMode" value="SHARED"/> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <property name="cacheConfiguration"> <!-- Specify list of cache configurations here. Any property from @@ -96,7 +93,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml index 2e80553..b6757fa 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml @@ -46,9 +46,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="deploymentMode" value="SHARED"/> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <property name="marshalLocalJobs" value="false"/> <property name="collisionSpi"> @@ -154,7 +151,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/core/src/test/webapp/META-INF/gg-config.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/webapp/META-INF/gg-config.xml b/modules/core/src/test/webapp/META-INF/gg-config.xml index b4e8651..a11ebd1 100644 --- a/modules/core/src/test/webapp/META-INF/gg-config.xml +++ b/modules/core/src/test/webapp/META-INF/gg-config.xml @@ -65,9 +65,6 @@ </bean> </property> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Configure REST TCP server address. --> <property name="restTcpHost" value="127.0.0.1"/> @@ -302,7 +299,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- @@ -323,21 +322,6 @@ </list> </property> </bean> - <!-- - Uncomment this to provide IP finder using multicast for nodes discovery. - In addition to addresses received via multicast this finder can work with pre-configured - list of addresses. - --> - <!-- - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder"> - <property name="addresses"> - <list> - <value>host1:port1</value> - <value>host2:port2</value> - </list> - </property> - </bean> - --> </property> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/scalar/src/test/resources/spring-cache.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/resources/spring-cache.xml b/modules/scalar/src/test/resources/spring-cache.xml index 895e4f6..61cd343 100644 --- a/modules/scalar/src/test/resources/spring-cache.xml +++ b/modules/scalar/src/test/resources/spring-cache.xml @@ -21,8 +21,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="localHost" value="127.0.0.1"/> - <property name="cacheConfiguration"> <bean class="org.gridgain.grid.cache.GridCacheConfiguration"> <property name="cacheMode" value="PARTITIONED"/> @@ -38,7 +36,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <value>127.0.0.1:47500</value> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92054759/modules/scalar/src/test/resources/spring-ping-pong-partner.xml ---------------------------------------------------------------------- diff --git a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml index cb13b80..09f5bfc 100644 --- a/modules/scalar/src/test/resources/spring-ping-pong-partner.xml +++ b/modules/scalar/src/test/resources/spring-ping-pong-partner.xml @@ -31,9 +31,6 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="gridName" value="partner"/> - <!-- Set to local host address just for examples. --> - <property name="localHost" value="127.0.0.1"/> - <!-- Set deployment mode to be able to deploy jobs and tasks on that node. --> <property name="deploymentMode" value="SHARED"/> @@ -83,7 +80,9 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> + <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> <property name="addresses"> <list> <!-- @@ -104,21 +103,6 @@ </list> </property> </bean> - <!-- - Uncomment this to provide IP finder using multicast for nodes discovery. - In addition to addresses received via multicast this finder can work with pre-configured - list of addresses. - --> - <!-- - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder"> - <property name="addresses"> - <list> - <value>host1:port1</value> - <value>host2:port2</value> - </list> - </property> - </bean> - --> </property> </bean> </property>
