Repository: ignite Updated Branches: refs/heads/ignite-2.0 837bae683 -> 9dc64fead
IGNITE-4576 .NET: Rename IgniteConfiguration.GridName to IgniteInstanceName This closes #1639 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9dc64fea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9dc64fea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9dc64fea Branch: refs/heads/ignite-2.0 Commit: 9dc64feade44d91e5cbe44f3b26b272c05b6718e Parents: 837bae6 Author: Pavel Tupitsyn <ptupit...@apache.org> Authored: Mon Mar 20 11:41:50 2017 +0300 Committer: Pavel Tupitsyn <ptupit...@apache.org> Committed: Mon Mar 20 11:42:21 2017 +0300 ---------------------------------------------------------------------- .../Apache.Ignite.AspNet.Tests/App.config | 6 ++--- .../IgniteOutputCacheProviderTest.cs | 2 +- .../IgniteSessionStateStoreProviderTest.cs | 2 +- .../Apache.Ignite.AspNet/Impl/ConfigUtil.cs | 4 ++-- .../Binary/BinaryBuilderSelfTest.cs | 2 +- .../Cache/Affinity/AffinityFieldTest.cs | 2 +- .../Cache/Affinity/AffinityFunctionTest.cs | 4 ++-- .../Cache/Affinity/AffinityTest.cs | 2 +- .../Cache/CacheAbstractTest.cs | 2 +- .../Cache/CacheConfigurationTest.cs | 2 +- .../Cache/CacheDynamicStartTest.cs | 2 +- .../Cache/CacheMetricsTest.cs | 2 +- .../Cache/CacheNearTest.cs | 4 ++-- .../Cache/Query/CacheLinqTest.cs | 2 +- .../Cache/Query/CacheQueriesTest.cs | 2 +- .../Continuous/ContinuousQueryAbstractTest.cs | 4 ++-- .../Continuous/ContinuousQueryJavaFilterTest.cs | 2 +- .../Cache/Store/CacheStoreSessionTest.cs | 2 +- .../Cache/Store/CacheStoreTest.cs | 2 +- .../Compute/ComputeApiTest.cs | 2 +- .../Cache/Affinity/affinity-function2.xml | 2 +- .../Config/Compute/compute-grid1.xml | 2 +- .../Config/Compute/compute-grid2.xml | 2 +- .../Config/Compute/compute-grid3.xml | 2 +- .../Config/Lifecycle/lifecycle-beans.xml | 2 +- .../Config/Lifecycle/lifecycle-no-beans.xml | 2 +- .../Config/start-test-grid1.xml | 2 +- .../Config/start-test-grid2.xml | 2 +- .../ConsoleRedirectTest.cs | 2 +- .../Dataload/DataStreamerTest.cs | 2 +- .../Dataload/DataStreamerTestTopologyChange.cs | 2 +- .../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 2 +- .../IgniteConfigurationSectionTest.cs | 2 +- .../IgniteConfigurationSerializerTest.cs | 19 +++++++++------- .../IgniteConfigurationTest.cs | 10 ++++---- .../Log/CustomLoggerTest.cs | 2 +- .../Plugin/Cache/CachePluginTest.cs | 4 ++-- .../Apache.Ignite.Core.Tests/ReconnectTest.cs | 2 +- .../SerializationTest.cs | 2 +- .../dotnet/Apache.Ignite.Core.Tests/app.config | 4 ++-- .../Apache.Ignite.Core.Tests/custom_app.config | 2 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 24 +++++++++++++++++--- .../IgniteConfigurationSection.xsd | 2 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 2 +- .../Common/IgniteConfigurationXmlSerializer.cs | 14 ++++++++++-- .../App.config | 4 ++-- .../EntityFrameworkCacheInitializationTest.cs | 2 +- .../EntityFrameworkCacheTest.cs | 2 +- .../IgniteDbConfiguration.cs | 4 ++-- .../Misc/ClientReconnectExample.cs | 2 +- 50 files changed, 105 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config index 7d2c1d0..016078e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/App.config @@ -29,7 +29,7 @@ <gcServer enabled="true"/> </runtime> - <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"; gridName="myGrid1"> + <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"; igniteInstanceName="myGrid1"> <discoverySpi type="TcpDiscoverySpi"> <ipFinder type="TcpDiscoveryStaticIpFinder"> <endpoints> @@ -43,7 +43,7 @@ </cacheConfiguration> </igniteConfiguration> - <igniteConfiguration2 gridName="myGrid2" localhost="127.0.0.1"> + <igniteConfiguration2 igniteInstanceName="myGrid2" localhost="127.0.0.1"> <discoverySpi type="TcpDiscoverySpi"> <ipFinder type="TcpDiscoveryStaticIpFinder"> <endpoints> @@ -57,7 +57,7 @@ </cacheConfiguration> </igniteConfiguration2> - <igniteConfiguration3 gridName="myGrid3" localhost="127.0.0.1"> + <igniteConfiguration3 igniteInstanceName="myGrid3" localhost="127.0.0.1"> <discoverySpi type="TcpDiscoverySpi"> <ipFinder type="TcpDiscoveryStaticIpFinder"> <endpoints> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteOutputCacheProviderTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteOutputCacheProviderTest.cs b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteOutputCacheProviderTest.cs index bf2fd7e..017b48d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteOutputCacheProviderTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteOutputCacheProviderTest.cs @@ -51,7 +51,7 @@ namespace Apache.Ignite.AspNet.Tests [TestFixtureSetUp] public void TestFixtureSetUp() { - Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) {GridName = GridName}); + Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) {IgniteInstanceName = GridName}); } /// <summary> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteSessionStateStoreProviderTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteSessionStateStoreProviderTest.cs b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteSessionStateStoreProviderTest.cs index c6e3b30..25700c6 100644 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteSessionStateStoreProviderTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/IgniteSessionStateStoreProviderTest.cs @@ -64,7 +64,7 @@ namespace Apache.Ignite.AspNet.Tests [TestFixtureSetUp] public void TestFixtureSetUp() { - Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) { GridName = GridName }); + Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) { IgniteInstanceName = GridName }); } /// <summary> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.AspNet/Impl/ConfigUtil.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.AspNet/Impl/ConfigUtil.cs b/modules/platforms/dotnet/Apache.Ignite.AspNet/Impl/ConfigUtil.cs index b967518..bad1470 100644 --- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Impl/ConfigUtil.cs +++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Impl/ConfigUtil.cs @@ -93,10 +93,10 @@ namespace Apache.Ignite.AspNet.Impl typeof(IgniteConfigurationSection).Name, sectionName)); } else - config = new IgniteConfiguration {GridName = gridName}; + config = new IgniteConfiguration {IgniteInstanceName = gridName}; // Check if already started. - var ignite = Ignition.TryGetIgnite(config.GridName); + var ignite = Ignition.TryGetIgnite(config.IgniteInstanceName); if (ignite != null) return ignite; http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs index 7475f5a..e9ca852 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryBuilderSelfTest.cs @@ -1718,7 +1718,7 @@ namespace Apache.Ignite.Core.Tests.Binary var cfg = new IgniteConfiguration(TestUtils.GetTestConfiguration()) { - GridName = "grid2", + IgniteInstanceName = "grid2", BinaryConfiguration = new BinaryConfiguration { CompactFooter = GetCompactFooter() http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFieldTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFieldTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFieldTest.cs index ceb04cd..71883b1 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFieldTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFieldTest.cs @@ -159,7 +159,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Affinity { return new IgniteConfiguration(TestUtils.GetTestConfiguration()) { - GridName = gridName, + IgniteInstanceName = gridName, BinaryConfiguration = new BinaryConfiguration { TypeConfigurations = new[] http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs index d4b6680..9348449 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityFunctionTest.cs @@ -90,7 +90,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Affinity _ignite = Ignition.Start(cfg); - _ignite2 = Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) {GridName = "grid2"}); + _ignite2 = Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) {IgniteInstanceName = "grid2"}); } /// <summary> @@ -218,7 +218,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Affinity using (var ignite = Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) { - GridName = "grid3", + IgniteInstanceName = "grid3", })) { expectedNodeId = ignite.GetCluster().GetLocalNode().Id; http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityTest.cs index e38668b..9bd639b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Affinity/AffinityTest.cs @@ -42,7 +42,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Affinity JvmClasspath = TestUtils.CreateTestClasspath(), JvmOptions = TestUtils.TestJavaOptions(), SpringConfigUrl = "config\\native-client-test-cache-affinity.xml", - GridName = "grid-" + i + IgniteInstanceName = "grid-" + i }; Ignition.Start(cfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs index 1bc0f02..f97741a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs @@ -306,7 +306,7 @@ namespace Apache.Ignite.Core.Tests.Cache cfg.SpringConfigUrl = "config\\native-client-test-cache.xml"; for (int i = 0; i < GridCount(); i++) { - cfg.GridName = "grid-" + i; + cfg.IgniteInstanceName = "grid-" + i; Ignition.Start(cfg); } http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs index 118e115..02c0fc3 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs @@ -65,7 +65,7 @@ namespace Apache.Ignite.Core.Tests.Cache GetCustomCacheConfiguration(), GetCustomCacheConfiguration2() }, - GridName = CacheName, + IgniteInstanceName = CacheName, BinaryConfiguration = new BinaryConfiguration(typeof (Entity)) }; http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheDynamicStartTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheDynamicStartTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheDynamicStartTest.cs index 7c18a34..5f07c3a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheDynamicStartTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheDynamicStartTest.cs @@ -92,7 +92,7 @@ namespace Apache.Ignite.Core.Tests.Cache portCfg.TypeConfigurations = portTypeCfgs; - cfg.GridName = name; + cfg.IgniteInstanceName = name; cfg.BinaryConfiguration = portCfg; cfg.JvmClasspath = TestUtils.CreateTestClasspath(); cfg.JvmOptions = TestUtils.TestJavaOptions(); http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs index 9da037c..9c29fbf 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheMetricsTest.cs @@ -41,7 +41,7 @@ namespace Apache.Ignite.Core.Tests.Cache public void FixtureSetUp() { Ignition.Start(TestUtils.GetTestConfiguration()); - Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) {GridName = SecondGridName }); + Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) {IgniteInstanceName = SecondGridName }); } /// <summary> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheNearTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheNearTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheNearTest.cs index f5a1337..24dc971 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheNearTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheNearTest.cs @@ -115,7 +115,7 @@ namespace Apache.Ignite.Core.Tests.Cache var cfg = new IgniteConfiguration(TestUtils.GetTestConfiguration()) { ClientMode = true, - GridName = "clientGrid" + IgniteInstanceName = "clientGrid" }; using (var clientGrid = Ignition.Start(cfg)) @@ -139,7 +139,7 @@ namespace Apache.Ignite.Core.Tests.Cache var cfg = new IgniteConfiguration(TestUtils.GetTestConfiguration()) { ClientMode = true, - GridName = "clientGrid", + IgniteInstanceName = "clientGrid", IncludedEventTypes = new[] {EventType.CacheEntryCreated} }; http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheLinqTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheLinqTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheLinqTest.cs index 931fdd4..8730e37 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheLinqTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheLinqTest.cs @@ -125,7 +125,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query { BinaryConfiguration = new BinaryConfiguration(typeof(Person), typeof(Organization), typeof(Address), typeof(Role), typeof(RoleKey), typeof(Numerics)), - GridName = gridName + IgniteInstanceName = gridName }; } http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs index 20fd93a..4061ac2 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/CacheQueriesTest.cs @@ -76,7 +76,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query for (int i = 0; i < GridCnt; i++) { - cfg.GridName = "grid-" + i; + cfg.IgniteInstanceName = "grid-" + i; Ignition.Start(cfg); } http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs index 270c3fc..40d8525 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryAbstractTest.cs @@ -111,11 +111,11 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous cfg.JvmOptions = TestUtils.TestJavaOptions(); cfg.SpringConfigUrl = "config\\cache-query-continuous.xml"; - cfg.GridName = "grid-1"; + cfg.IgniteInstanceName = "grid-1"; grid1 = Ignition.Start(cfg); cache1 = grid1.GetCache<int, BinarizableEntry>(cacheName); - cfg.GridName = "grid-2"; + cfg.IgniteInstanceName = "grid-2"; grid2 = Ignition.Start(cfg); cache2 = grid2.GetCache<int, BinarizableEntry>(cacheName); } http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryJavaFilterTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryJavaFilterTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryJavaFilterTest.cs index de829e2..4b5db93 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryJavaFilterTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Query/Continuous/ContinuousQueryJavaFilterTest.cs @@ -91,7 +91,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Query.Continuous JvmClasspath = TestUtils.CreateTestClasspath(), JvmOptions = jvmOpts, SpringConfigUrl = SpringConfig2, - GridName = "dotNet2" + IgniteInstanceName = "dotNet2" }); // Java-only node http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreSessionTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreSessionTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreSessionTest.cs index 54e0414..d01726a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreSessionTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreSessionTest.cs @@ -56,7 +56,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Store IgniteConfiguration cfg = new IgniteConfiguration { - GridName = IgniteName, + IgniteInstanceName = IgniteName, JvmClasspath = TestUtils.CreateTestClasspath(), JvmOptions = TestUtils.TestJavaOptions(), SpringConfigUrl = @"config\cache\store\cache-store-session.xml" http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs index a66aea8..4b13b9f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/Store/CacheStoreTest.cs @@ -52,7 +52,7 @@ namespace Apache.Ignite.Core.Tests.Cache.Store { var cfg = new IgniteConfiguration { - GridName = GridName, + IgniteInstanceName = GridName, JvmClasspath = TestUtils.CreateTestClasspath(), JvmOptions = TestUtils.TestJavaOptions(), SpringConfigUrl = "config\\native-client-test-cache-store.xml", http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs index 0125466..e82e238 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Compute/ComputeApiTest.cs @@ -545,7 +545,7 @@ namespace Apache.Ignite.Core.Tests.Compute using (var ignite = Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) { SpringConfigUrl = GetConfigs().Item1, - GridName = "daemonGrid", + IgniteInstanceName = "daemonGrid", IsDaemon = true }) ) http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Cache/Affinity/affinity-function2.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Cache/Affinity/affinity-function2.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Cache/Affinity/affinity-function2.xml index cab34b5..5b320a3 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Cache/Affinity/affinity-function2.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Cache/Affinity/affinity-function2.xml @@ -28,7 +28,7 @@ <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="gridName" value="grid2" /> + <property name="igniteInstanceName" value="grid2" /> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml index e627b54..f01bd57 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid1.xml @@ -28,7 +28,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="gridName" value="grid1"/> + <property name="igniteInstanceName" value="grid1"/> <property name="metricsUpdateFrequency" value="1000"/> <property name="metricsLogFrequency" value="0"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid2.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid2.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid2.xml index 3ed8042..d7f86f4 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid2.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid2.xml @@ -25,7 +25,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="gridName" value="grid2"/> + <property name="igniteInstanceName" value="grid2"/> <property name="metricsUpdateFrequency" value="1000"/> <property name="metricsLogFrequency" value="0"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid3.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid3.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid3.xml index a93e01a..f61f281 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid3.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Compute/compute-grid3.xml @@ -27,7 +27,7 @@ <property name="clientMode" value="true"/> - <property name="gridName" value="grid3"/> + <property name="igniteInstanceName" value="grid3"/> <property name="metricsUpdateFrequency" value="1000"/> <property name="metricsLogFrequency" value="0"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-beans.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-beans.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-beans.xml index 71b7072..5c2cfd2 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-beans.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-beans.xml @@ -25,7 +25,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="gridName" value="grid"/> + <property name="igniteInstanceName" value="grid"/> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-no-beans.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-no-beans.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-no-beans.xml index e83c4e8..1e74a77 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-no-beans.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Lifecycle/lifecycle-no-beans.xml @@ -25,7 +25,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="gridName" value="grid"/> + <property name="igniteInstanceName" value="grid"/> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid1.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid1.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid1.xml index c61ecde..6f113e9 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid1.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid1.xml @@ -25,7 +25,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="gridName" value="grid1"/> + <property name="igniteInstanceName" value="grid1"/> <property name="cacheConfiguration"> <list> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid2.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid2.xml b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid2.xml index 432d318..9b7ae31 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid2.xml +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/start-test-grid2.xml @@ -25,7 +25,7 @@ <property name="localHost" value="127.0.0.1"/> <property name="connectorConfiguration"><null/></property> - <property name="gridName" value="grid2"/> + <property name="igniteInstanceName" value="grid2"/> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ConsoleRedirectTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ConsoleRedirectTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ConsoleRedirectTest.cs index 3884cab..5a59a37 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ConsoleRedirectTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ConsoleRedirectTest.cs @@ -168,7 +168,7 @@ namespace Apache.Ignite.Core.Tests { var ignite = Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) { - GridName = "newDomainGrid" + IgniteInstanceName = "newDomainGrid" }); Ignition.Stop(ignite.Name, true); } http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs index f5a04c1..33c7704 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTest.cs @@ -465,7 +465,7 @@ namespace Apache.Ignite.Core.Tests.Dataload { return new IgniteConfiguration { - GridName = gridName, + IgniteInstanceName = gridName, SpringConfigUrl = "config\\native-client-test-cache.xml", JvmClasspath = TestUtils.CreateTestClasspath(), BinaryConfiguration = new BinaryConfiguration http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTestTopologyChange.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTestTopologyChange.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTestTopologyChange.cs index 9e80c08..5e9f892 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTestTopologyChange.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Dataload/DataStreamerTestTopologyChange.cs @@ -37,7 +37,7 @@ namespace Apache.Ignite.Core.Tests.Dataload var cacheNodeCfg = new IgniteConfiguration(TestUtils.GetTestConfiguration()) { SpringConfigUrl = @"Config\cache-local-node.xml", - GridName = "cacheGrid" + IgniteInstanceName = "cacheGrid" }; using (var gridNoCache = Ignition.Start(TestUtils.GetTestConfiguration())) http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs index 7afb10f..7217e1a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ExceptionsTest.cs @@ -421,7 +421,7 @@ namespace Apache.Ignite.Core.Tests SpringConfigUrl = "config\\native-client-test-cache.xml", JvmOptions = TestUtils.TestJavaOptions(), JvmClasspath = TestUtils.CreateTestClasspath(), - GridName = gridName, + IgniteInstanceName = gridName, BinaryConfiguration = new BinaryConfiguration { TypeConfigurations = new[] http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs index 13bd9a2..fc43f46 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSectionTest.cs @@ -36,7 +36,7 @@ namespace Apache.Ignite.Core.Tests { var section = (IgniteConfigurationSection) ConfigurationManager.GetSection("igniteConfiguration"); - Assert.AreEqual("myGrid1", section.IgniteConfiguration.GridName); + Assert.AreEqual("myGrid1", section.IgniteConfiguration.IgniteInstanceName); Assert.AreEqual("cacheName", section.IgniteConfiguration.CacheConfiguration.Single().Name); } http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs index 95c0289..2f9366e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs @@ -294,6 +294,9 @@ namespace Apache.Ignite.Core.Tests if (!prop.CanWrite) continue; // Read-only properties are not configured in XML. + if (prop.GetCustomAttributes(typeof(ObsoleteAttribute), true).Any()) + continue; // Skip deprecated. + var propType = prop.PropertyType; var isCollection = propType.IsGenericType && @@ -348,7 +351,7 @@ namespace Apache.Ignite.Core.Tests // Some properties var cfg = new IgniteConfiguration { - GridName = "myGrid", + IgniteInstanceName = "myGrid", ClientMode = true, CacheConfiguration = new[] { @@ -370,7 +373,7 @@ namespace Apache.Ignite.Core.Tests }; Assert.AreEqual(FixLineEndings(@"<?xml version=""1.0"" encoding=""utf-16""?> -<igniteConfiguration clientMode=""true"" gridName=""myGrid"" xmlns=""http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"";> +<igniteConfiguration clientMode=""true"" igniteInstanceName=""myGrid"" xmlns=""http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"";> <cacheConfiguration> <cacheConfiguration cacheMode=""Replicated"" name=""myCache""> <queryEntities> @@ -400,7 +403,7 @@ namespace Apache.Ignite.Core.Tests } Assert.AreEqual(FixLineEndings(@"<?xml version=""1.0"" encoding=""utf-16""?> -<igCfg clientMode=""true"" gridName=""myGrid"" xmlns=""http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"";> +<igCfg clientMode=""true"" igniteInstanceName=""myGrid"" xmlns=""http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"";> <cacheConfiguration> <cacheConfiguration cacheMode=""Replicated"" name=""myCache""> <queryEntities> @@ -431,8 +434,8 @@ namespace Apache.Ignite.Core.Tests AssertReflectionEqual(new IgniteConfiguration(), cfg); // Simple test. - cfg = IgniteConfiguration.FromXml(@"<igCfg gridName=""myGrid"" clientMode=""true"" />"); - AssertReflectionEqual(new IgniteConfiguration {GridName = "myGrid", ClientMode = true}, cfg); + cfg = IgniteConfiguration.FromXml(@"<igCfg igniteInstanceName=""myGrid"" clientMode=""true"" />"); + AssertReflectionEqual(new IgniteConfiguration {IgniteInstanceName = "myGrid", ClientMode = true}, cfg); // Invalid xml. var ex = Assert.Throws<ConfigurationErrorsException>(() => @@ -443,11 +446,11 @@ namespace Apache.Ignite.Core.Tests // Xml reader. using (var xmlReader = XmlReader.Create( - new StringReader(@"<igCfg gridName=""myGrid"" clientMode=""true"" />"))) + new StringReader(@"<igCfg igniteInstanceName=""myGrid"" clientMode=""true"" />"))) { cfg = IgniteConfiguration.FromXml(xmlReader); } - AssertReflectionEqual(new IgniteConfiguration { GridName = "myGrid", ClientMode = true }, cfg); + AssertReflectionEqual(new IgniteConfiguration { IgniteInstanceName = "myGrid", ClientMode = true }, cfg); } /// <summary> @@ -566,7 +569,7 @@ namespace Apache.Ignite.Core.Tests { return new IgniteConfiguration { - GridName = "gridName", + IgniteInstanceName = "gridName", JvmOptions = new[] {"1", "2"}, Localhost = "localhost11", JvmClasspath = "classpath", http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs index 3d9732d..5063c21 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationTest.cs @@ -122,7 +122,7 @@ namespace Apache.Ignite.Core.Tests // There can be extra IPv6 endpoints Assert.AreEqual(ip.Endpoints, resIp.Endpoints.Take(2).Select(x => x.Trim('/')).ToArray()); - Assert.AreEqual(cfg.GridName, resCfg.GridName); + Assert.AreEqual(cfg.IgniteInstanceName, resCfg.IgniteInstanceName); Assert.AreEqual(cfg.IncludedEventTypes, resCfg.IncludedEventTypes); Assert.AreEqual(cfg.MetricsExpireTime, resCfg.MetricsExpireTime); Assert.AreEqual(cfg.MetricsHistorySize, resCfg.MetricsHistorySize); @@ -244,7 +244,7 @@ namespace Apache.Ignite.Core.Tests { Localhost = "127.0.0.1", DiscoverySpi = TestUtils.GetStaticDiscovery(), - GridName = "client", + IgniteInstanceName = "client", ClientMode = true })) { @@ -284,7 +284,7 @@ namespace Apache.Ignite.Core.Tests using (var ignite = Ignition.Start(cfg)) { - cfg.GridName = "ignite2"; + cfg.IgniteInstanceName = "ignite2"; using (var ignite2 = Ignition.Start(cfg)) { Assert.AreEqual(2, ignite.GetCluster().GetNodes().Count); @@ -383,7 +383,7 @@ namespace Apache.Ignite.Core.Tests using (var ignite = Ignition.Start(cfg)) { // Start with the same endpoint - cfg.GridName = "ignite2"; + cfg.IgniteInstanceName = "ignite2"; using (var ignite2 = Ignition.Start(cfg)) { Assert.AreEqual(2, ignite.GetCluster().GetNodes().Count); @@ -472,7 +472,7 @@ namespace Apache.Ignite.Core.Tests ThreadPriority = 6, TopologyHistorySize = 1234567 }, - GridName = "gridName1", + IgniteInstanceName = "gridName1", IncludedEventTypes = EventType.SwapspaceAll, MetricsExpireTime = TimeSpan.FromMinutes(7), MetricsHistorySize = 125, http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs index 13e7854..68d107a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/CustomLoggerTest.cs @@ -127,7 +127,7 @@ namespace Apache.Ignite.Core.Tests.Log { // Start 2 nodes: PlatformNativeException does not occur in local scenario using (var ignite = Ignition.Start(GetConfigWithLogger())) - using (Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) {GridName = "1"})) + using (Ignition.Start(new IgniteConfiguration(TestUtils.GetTestConfiguration()) {IgniteInstanceName = "1"})) { var compute = ignite.GetCluster().ForRemotes().GetCompute(); http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs index 0fc8877..2ef8bb2 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Plugin/Cache/CachePluginTest.cs @@ -172,7 +172,7 @@ namespace Apache.Ignite.Core.Tests.Plugin.Cache Assert.IsNull(plugin.IgniteStopped); var ctx = plugin.Context; - Assert.AreEqual(ignite.Name, ctx.IgniteConfiguration.GridName); + Assert.AreEqual(ignite.Name, ctx.IgniteConfiguration.IgniteInstanceName); Assert.AreEqual(cacheName, ctx.CacheConfiguration.Name); Assert.AreEqual(propValue, ctx.CachePluginConfiguration.TestProperty); @@ -186,7 +186,7 @@ namespace Apache.Ignite.Core.Tests.Plugin.Cache { return new IgniteConfiguration(TestUtils.GetTestConfiguration()) { - GridName = name, + IgniteInstanceName = name, CacheConfiguration = new[] { new CacheConfiguration(CacheName) http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs index 5a2d2d0..4013b5a 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ReconnectTest.cs @@ -48,7 +48,7 @@ namespace Apache.Ignite.Core.Tests var clientCfg = new IgniteConfiguration(TestUtils.GetTestConfiguration()) { - GridName = "client", + IgniteInstanceName = "client", ClientMode = true }; http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/SerializationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/SerializationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/SerializationTest.cs index a36e30f..2812468 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/SerializationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/SerializationTest.cs @@ -45,7 +45,7 @@ namespace Apache.Ignite.Core.Tests { var cfg = new IgniteConfiguration { - GridName = GridName, + IgniteInstanceName = GridName, JvmClasspath = TestUtils.CreateTestClasspath(), JvmOptions = TestUtils.TestJavaOptions(), SpringConfigUrl = "config\\native-client-test-cache.xml" http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config index f928ed4..be08e61 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/app.config @@ -28,7 +28,7 @@ <gcServer enabled="true"/> </runtime> - <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"; gridName="myGrid1"> + <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"; igniteInstanceName="myGrid1"> <discoverySpi type="TcpDiscoverySpi"> <ipFinder type="TcpDiscoveryStaticIpFinder"> <endpoints> @@ -42,7 +42,7 @@ </cacheConfiguration> </igniteConfiguration> - <igniteConfiguration2 gridName="myGrid2" localhost="127.0.0.1"> + <igniteConfiguration2 igniteInstanceName="myGrid2" localhost="127.0.0.1"> <discoverySpi type="TcpDiscoverySpi"> <ipFinder type="TcpDiscoveryStaticIpFinder"> <endpoints> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config index aec91dc..cb3af7c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/custom_app.config @@ -23,7 +23,7 @@ <section name="igniteConfigurationMissing" type="Apache.Ignite.Core.IgniteConfigurationSection, Apache.Ignite.Core" /> </configSections> - <igniteConfiguration3 gridName="myGrid3" localhost="127.0.0.1"> + <igniteConfiguration3 igniteInstanceName="myGrid3" localhost="127.0.0.1"> <discoverySpi type="TcpDiscoverySpi"> <ipFinder type="TcpDiscoveryStaticIpFinder"> <endpoints> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs index 563eea0..d3bd50c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs @@ -500,7 +500,7 @@ /// </summary> private void CopyLocalProperties(IgniteConfiguration cfg) { - GridName = cfg.GridName; + IgniteInstanceName = cfg.IgniteInstanceName; if (BinaryConfiguration != null && cfg.BinaryConfiguration != null) { @@ -523,9 +523,27 @@ } /// <summary> - /// Grid name which is used if not provided in configuration file. + /// Gets or sets optional local instance name. + /// <para /> + /// This name only works locally and has no effect on topology. + /// <para /> + /// This property is used to when there are multiple Ignite nodes in one process to distinguish them. /// </summary> - public string GridName { get; set; } + public string IgniteInstanceName { get; set; } + + /// <summary> + /// Gets or sets optional local instance name. + /// <para /> + /// This name only works locally and has no effect on topology. + /// <para /> + /// This property is used to when there are multiple Ignite nodes in one process to distinguish them. + /// </summary> + [Obsolete("Use IgniteInstanceName instead.")] + public string GridName + { + get { return IgniteInstanceName; } + set { IgniteInstanceName = value; } + } /// <summary> /// Gets or sets the binary configuration. http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd index 5a49790..629a41b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd +++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd @@ -1228,7 +1228,7 @@ </xs:complexType> </xs:element> </xs:all> - <xs:attribute name="gridName" type="xs:string"> + <xs:attribute name="igniteInstanceName" type="xs:string"> <xs:annotation> <xs:documentation>Local Ignite instance name to be used with Ignition.GetIgnite.</xs:documentation> </xs:annotation> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs index 515902f..1190c14 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs @@ -231,7 +231,7 @@ namespace Apache.Ignite.Core IgniteManager.CreateJvmContext(cfg, cbs, log); log.Debug("JVM started."); - var gridName = cfg.GridName; + var gridName = cfg.IgniteInstanceName; // 3. Create startup object which will guide us through the rest of the process. _startup = new Startup(cfg, cbs); http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs index a87ff18..8290329 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteConfigurationXmlSerializer.cs @@ -84,7 +84,7 @@ namespace Apache.Ignite.Core.Impl.Common private static void WriteElement(object obj, XmlWriter writer, string rootElementName, Type valueType, PropertyInfo property = null) { - if (property != null && !property.CanWrite) + if (property != null && (!property.CanWrite || IsObsolete(property))) return; if (valueType == typeof(IgniteConfiguration)) @@ -152,7 +152,7 @@ namespace Apache.Ignite.Core.Impl.Common writer.WriteAttributeString(TypNameAttribute, TypeStringConverter.Convert(obj.GetType())); // Write attributes - foreach (var prop in props.Where(p => IsBasicType(p.PropertyType))) + foreach (var prop in props.Where(p => IsBasicType(p.PropertyType) && !IsObsolete(p))) { var converter = GetConverter(prop, prop.PropertyType); var stringValue = converter.ConvertToInvariantString(prop.GetValue(obj, null)); @@ -482,5 +482,15 @@ namespace Apache.Ignite.Core.Impl.Common return null; } + + /// <summary> + /// Determines whether the specified property is obsolete. + /// </summary> + private static bool IsObsolete(PropertyInfo property) + { + Debug.Assert(property != null); + + return property.GetCustomAttributes(typeof(ObsoleteAttribute), true).Any(); + } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config index 3527920..0e0da8d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config +++ b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/App.config @@ -25,7 +25,7 @@ <gcServer enabled="true" /> </runtime> - <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"; gridName="myGrid1"> + <igniteConfiguration xmlns="http://ignite.apache.org/schema/dotnet/IgniteConfigurationSection"; igniteInstanceName="myGrid1"> <discoverySpi type="TcpDiscoverySpi"> <ipFinder type="TcpDiscoveryStaticIpFinder"> <endpoints> @@ -38,7 +38,7 @@ </cacheConfiguration> </igniteConfiguration> - <igniteConfiguration2 gridName="myGrid2" localhost="127.0.0.1"> + <igniteConfiguration2 igniteInstanceName="myGrid2" localhost="127.0.0.1"> <discoverySpi type="TcpDiscoverySpi"> <ipFinder type="TcpDiscoveryStaticIpFinder"> <endpoints> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheInitializationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheInitializationTest.cs b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheInitializationTest.cs index 36b1c2b..bef8b78 100644 --- a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheInitializationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheInitializationTest.cs @@ -64,7 +64,7 @@ namespace Apache.Ignite.EntityFramework.Tests CheckCacheAndStop("myGrid3", "myCache", new IgniteDbConfiguration(new IgniteConfiguration { - GridName = "myGrid3", + IgniteInstanceName = "myGrid3", }, new CacheConfiguration("myCache_metadata") { CacheMode = CacheMode.Replicated, http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs index 158df12..d34e330 100644 --- a/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.EntityFramework.Tests/EntityFrameworkCacheTest.cs @@ -70,7 +70,7 @@ namespace Apache.Ignite.EntityFramework.Tests var cfg = TestUtils.GetTestConfiguration(); var ignite = Ignition.Start(cfg); - Ignition.Start(new IgniteConfiguration(cfg) {GridName = "grid2"}); + Ignition.Start(new IgniteConfiguration(cfg) {IgniteInstanceName = "grid2"}); // Create SQL CE database in a temp file. using (var ctx = GetDbContext()) http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/Apache.Ignite.EntityFramework/IgniteDbConfiguration.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.EntityFramework/IgniteDbConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.EntityFramework/IgniteDbConfiguration.cs index 55ecd40..773e59f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.EntityFramework/IgniteDbConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.EntityFramework/IgniteDbConfiguration.cs @@ -74,7 +74,7 @@ namespace Apache.Ignite.EntityFramework /// <summary> /// Initializes a new instance of the <see cref="IgniteDbConfiguration"/> class. /// <para /> - /// This constructor uses default Ignite instance (with null <see cref="IgniteConfiguration.GridName"/>) + /// This constructor uses default Ignite instance (with null <see cref="IgniteConfiguration.IgniteInstanceName"/>) /// and a cache with <see cref="DefaultCacheNamePrefix"/> name. /// <para /> /// Ignite instance will be started automatically, if it is not started yet. @@ -277,7 +277,7 @@ namespace Apache.Ignite.EntityFramework { cfg = cfg ?? new IgniteConfiguration(); - return Ignition.TryGetIgnite(cfg.GridName) ?? Ignition.Start(cfg); + return Ignition.TryGetIgnite(cfg.IgniteInstanceName) ?? Ignition.Start(cfg); } /// <summary> http://git-wip-us.apache.org/repos/asf/ignite/blob/9dc64fea/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Misc/ClientReconnectExample.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Misc/ClientReconnectExample.cs b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Misc/ClientReconnectExample.cs index 7ea6e0a..fca0f9f 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Misc/ClientReconnectExample.cs +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Misc/ClientReconnectExample.cs @@ -113,7 +113,7 @@ namespace Apache.Ignite.Examples.Misc var cfg = new IgniteConfiguration { // Nodes within a single process are distinguished by GridName property. - GridName = "serverNode", + IgniteInstanceName = "serverNode", // Discovery settings are the same as in app.config. DiscoverySpi = new TcpDiscoverySpi
