http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/PortableConfigurationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/PortableConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/PortableConfigurationTest.cs deleted file mode 100644 index 16c68e1..0000000 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/PortableConfigurationTest.cs +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -namespace Apache.Ignite.Core.Tests -{ - using System; - using System.Collections.Generic; - using System.Linq; - using Apache.Ignite.Core.Binary; - using Apache.Ignite.Core.Cache; - using NUnit.Framework; - - /// <summary> - /// Portable configuration tests. - /// </summary> - public class PortableConfigurationTest - { - /** Cache. */ - private ICache<int, TestGenericPortableBase> _cache; - - /** Random generator. */ - private static readonly Random Rnd = new Random(); - - /** Test types for code config */ - private static readonly Type[] TestTypes = { - typeof (TestGenericPortable<int>), - typeof (TestGenericPortable<string>), - typeof (TestGenericPortable<TestGenericPortable<int>>), - typeof (TestGenericPortable<List<Tuple<int, string>>>), - typeof (TestGenericPortable<int, string>), - typeof (TestGenericPortable<int, TestGenericPortable<string>>), - typeof (TestGenericPortable<int, string, Type>), - typeof (TestGenericPortable<int, string, TestGenericPortable<int, string, Type>>) - }; - - /** Test types for xml config */ - private static readonly Type[] TestTypesXml = { - typeof (TestGenericPortable<long>), - typeof (TestGenericPortable<Type>), - typeof (TestGenericPortable<TestGenericPortable<long>>), - typeof (TestGenericPortable<List<Tuple<long, string>>>), - typeof (TestGenericPortable<long, string>), - typeof (TestGenericPortable<long, TestGenericPortable<string>>), - typeof (TestGenericPortable<long, string, Type>), - typeof (TestGenericPortable<long, string, TestGenericPortable<long, string, Type>>) - }; - - /// <summary> - /// Starts the grid with provided config. - /// </summary> - /// <param name="binaryConfiguration">The portable configuration.</param> - private void StartGrid(BinaryConfiguration binaryConfiguration) - { - Ignition.StopAll(true); - - var grid = Ignition.Start(new IgniteConfiguration - { - SpringConfigUrl = "config\\cache-portables.xml", - JvmClasspath = TestUtils.CreateTestClasspath(), - JvmOptions = TestUtils.TestJavaOptions(), - BinaryConfiguration = binaryConfiguration - }); - - _cache = grid.GetCache<int, TestGenericPortableBase>(null); - } - - /// <summary> - /// Test fixture tear-down routine. - /// </summary> - [TestFixtureTearDown] - public void TestFixtureTearDown() - { - Ignition.StopAll(true); - } - - /// <summary> - /// Tests the configuration set in code. - /// </summary> - [Test] - public void TestCodeConfiguration() - { - StartGrid(new BinaryConfiguration - { - TypeConfigurations = TestTypes.Select(x => new BinaryTypeConfiguration(x)).ToList() - }); - - CheckPortableTypes(TestTypes); - } - - /// <summary> - /// Tests the configuration set in xml. - /// </summary> - [Test] - public void TestXmlConfiguration() - { - StartGrid(null); - - CheckPortableTypes(TestTypesXml); - } - - /// <summary> - /// Checks that specified types are portable and can be successfully used in cache. - /// </summary> - private void CheckPortableTypes(IEnumerable<Type> testTypes) - { - int key = 0; - - foreach (var typ in testTypes) - { - key += 1; - - var inst = CreateInstance(typ); - - _cache.Put(key, inst); - - var result = _cache.Get(key); - - Assert.AreEqual(inst.Prop, result.Prop); - - Assert.AreEqual(typ, result.GetType()); - } - } - - /// <summary> - /// Creates the instance of specified test portable type and sets a value on it. - /// </summary> - private static TestGenericPortableBase CreateInstance(Type type) - { - var inst = (TestGenericPortableBase)Activator.CreateInstance(type); - - inst.Prop = Rnd.Next(int.MaxValue); - - return inst; - } - } - - public abstract class TestGenericPortableBase - { - public object Prop { get; set; } - } - - public class TestGenericPortable<T> : TestGenericPortableBase - { - public T Prop1 { get; set; } - } - - public class TestGenericPortable<T1, T2> : TestGenericPortableBase - { - public T1 Prop1 { get; set; } - public T2 Prop2 { get; set; } - } - - public class TestGenericPortable<T1, T2, T3> : TestGenericPortableBase - { - public T1 Prop1 { get; set; } - public T2 Prop2 { get; set; } - public T3 Prop3 { get; set; } - } -} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/BinarizablePerson.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/BinarizablePerson.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/BinarizablePerson.cs new file mode 100644 index 0000000..c2e38bb --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/BinarizablePerson.cs @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Apache.Ignite.Core.Tests.Query +{ + using Apache.Ignite.Core.Binary; + + /// <summary> + /// Test person. + /// </summary> + internal class BinarizablePerson : IBinarizable + { + /// <summary> + /// Initializes a new instance of the <see cref="BinarizablePerson"/> class. + /// </summary> + /// <param name="name">The name.</param> + /// <param name="age">The age.</param> + public BinarizablePerson(string name, int age) + { + Name = name; + Age = age; + } + + /// <summary> + /// Gets or sets the name. + /// </summary> + public string Name { get; set; } + + /// <summary> + /// Gets or sets the address. + /// </summary> + public string Address { get; set; } + + /// <summary> + /// Gets or sets the age. + /// </summary> + public int Age { get; set; } + + /** <ineritdoc /> */ + public void WriteBinary(IBinaryWriter writer) + { + writer.WriteString("name", Name); + writer.WriteString("address", Address); + writer.WriteInt("age", Age); + } + + /** <ineritdoc /> */ + public void ReadBinary(IBinaryReader reader) + { + Name = reader.ReadString("name"); + Address = reader.ReadString("address"); + Age = reader.ReadInt("age"); + } + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/ImplicitBinarizablePerson.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/ImplicitBinarizablePerson.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/ImplicitBinarizablePerson.cs new file mode 100644 index 0000000..b7e9524 --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/ImplicitBinarizablePerson.cs @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Apache.Ignite.Core.Tests.Query +{ + /// <summary> + /// Test person. + /// </summary> + internal class ImplicitBinarizablePerson + { + /// <summary> + /// Initializes a new instance of the <see cref="ImplicitBinarizablePerson"/> class. + /// </summary> + /// <param name="name">The name.</param> + /// <param name="age">The age.</param> + public ImplicitBinarizablePerson(string name, int age) + { + Name = name; + Age = age; + } + + /// <summary> + /// Gets or sets the name. + /// </summary> + public string Name { get; set; } + + /// <summary> + /// Gets or sets the age. + /// </summary> + public int Age { get; set; } + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/ImplicitPortablePerson.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/ImplicitPortablePerson.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/ImplicitPortablePerson.cs deleted file mode 100644 index f80c4eb..0000000 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/ImplicitPortablePerson.cs +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -namespace Apache.Ignite.Core.Tests.Query -{ - /// <summary> - /// Test person. - /// </summary> - internal class ImplicitPortablePerson - { - /// <summary> - /// Initializes a new instance of the <see cref="ImplicitPortablePerson"/> class. - /// </summary> - /// <param name="name">The name.</param> - /// <param name="age">The age.</param> - public ImplicitPortablePerson(string name, int age) - { - Name = name; - Age = age; - } - - /// <summary> - /// Gets or sets the name. - /// </summary> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the age. - /// </summary> - public int Age { get; set; } - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/NoDefBinarizablePerson.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/NoDefBinarizablePerson.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/NoDefBinarizablePerson.cs new file mode 100644 index 0000000..5ae4159 --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/NoDefBinarizablePerson.cs @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace Apache.Ignite.Core.Tests.Query +{ + /// <summary> + /// Test person. + /// </summary> + internal class NoDefBinarizablePerson + { + /// <summary> + /// Gets or sets the name. + /// </summary> + public string Name { get; set; } + + /// <summary> + /// Gets or sets the age. + /// </summary> + public int Age { get; set; } + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/NoDefPortablePerson.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/NoDefPortablePerson.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/NoDefPortablePerson.cs deleted file mode 100644 index 16bd07d..0000000 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/NoDefPortablePerson.cs +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -namespace Apache.Ignite.Core.Tests.Query -{ - /// <summary> - /// Test person. - /// </summary> - internal class NoDefPortablePerson - { - /// <summary> - /// Gets or sets the name. - /// </summary> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the age. - /// </summary> - public int Age { get; set; } - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/PortablePerson.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/PortablePerson.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/PortablePerson.cs deleted file mode 100644 index 08134fd..0000000 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Query/PortablePerson.cs +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -namespace Apache.Ignite.Core.Tests.Query -{ - using Apache.Ignite.Core.Binary; - - /// <summary> - /// Test person. - /// </summary> - internal class PortablePerson : IBinarizable - { - /// <summary> - /// Initializes a new instance of the <see cref="PortablePerson"/> class. - /// </summary> - /// <param name="name">The name.</param> - /// <param name="age">The age.</param> - public PortablePerson(string name, int age) - { - Name = name; - Age = age; - } - - /// <summary> - /// Gets or sets the name. - /// </summary> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the address. - /// </summary> - public string Address { get; set; } - - /// <summary> - /// Gets or sets the age. - /// </summary> - public int Age { get; set; } - - /** <ineritdoc /> */ - public void WriteBinary(IBinaryWriter writer) - { - writer.WriteString("name", Name); - writer.WriteString("address", Address); - writer.WriteInt("age", Age); - } - - /** <ineritdoc /> */ - public void ReadBinary(IBinaryReader reader) - { - Name = reader.ReadString("name"); - Address = reader.ReadString("address"); - Age = reader.ReadInt("age"); - } - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServiceProxyTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServiceProxyTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServiceProxyTest.cs index 1fe6a21..1797337 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServiceProxyTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServiceProxyTest.cs @@ -42,8 +42,8 @@ namespace Apache.Ignite.Core.Tests.Services { TypeConfigurations = new[] { - new BinaryTypeConfiguration(typeof (TestPortableClass)), - new BinaryTypeConfiguration(typeof (CustomExceptionPortable)) + new BinaryTypeConfiguration(typeof (TestBinarizableClass)), + new BinaryTypeConfiguration(typeof (CustomExceptionBinarizable)) } }); @@ -54,10 +54,10 @@ namespace Apache.Ignite.Core.Tests.Services private readonly PlatformMemoryManager _memory = new PlatformMemoryManager(1024); /** */ - protected bool KeepPortable; + protected bool KeepBinary; /** */ - protected bool SrvKeepPortable; + protected bool SrvKeepBinary; /// <summary> /// Initializes a new instance of the <see cref="ServiceProxyTest"/> class. @@ -196,13 +196,13 @@ namespace Apache.Ignite.Core.Tests.Services } [Test] - public void TestPortableMarshallingException() + public void TestBinarizableMarshallingException() { var prx = GetProxy(); - var ex = Assert.Throws<ServiceInvocationException>(() => prx.CustomExceptionPortableMethod(false, false)); + var ex = Assert.Throws<ServiceInvocationException>(() => prx.CustomExceptionBinarizableMethod(false, false)); - if (KeepPortable) + if (KeepBinary) { Assert.AreEqual("Proxy method invocation failed with a binary error. " + "Examine BinaryCause for details.", ex.Message); @@ -219,15 +219,15 @@ namespace Apache.Ignite.Core.Tests.Services Assert.IsNotNull(ex.InnerException); } - ex = Assert.Throws<ServiceInvocationException>(() => prx.CustomExceptionPortableMethod(true, false)); + ex = Assert.Throws<ServiceInvocationException>(() => prx.CustomExceptionBinarizableMethod(true, false)); Assert.IsTrue(ex.ToString().Contains( - "Call completed with error, but error serialization failed [errType=CustomExceptionPortable, " + - "serializationErrMsg=Expected exception in CustomExceptionPortable.WritePortable]")); + "Call completed with error, but error serialization failed [errType=CustomExceptionBinarizable, " + + "serializationErrMsg=Expected exception in CustomExceptionBinarizable.WriteBinary]")); - ex = Assert.Throws<ServiceInvocationException>(() => prx.CustomExceptionPortableMethod(true, true)); + ex = Assert.Throws<ServiceInvocationException>(() => prx.CustomExceptionBinarizableMethod(true, true)); Assert.IsTrue(ex.ToString().Contains( - "Call completed with error, but error serialization failed [errType=CustomExceptionPortable, " + - "serializationErrMsg=Expected exception in CustomExceptionPortable.WritePortable]")); + "Call completed with error, but error serialization failed [errType=CustomExceptionBinarizable, " + + "serializationErrMsg=Expected exception in CustomExceptionBinarizable.WriteBinary]")); } /// <summary> @@ -266,7 +266,7 @@ namespace Apache.Ignite.Core.Tests.Services using (var outStream = new PlatformMemoryStream(_memory.Allocate())) { // 1) Write to a stream - inStream.WriteBool(SrvKeepPortable); // WriteProxyMethod does not do this, but Java does + inStream.WriteBool(SrvKeepBinary); // WriteProxyMethod does not do this, but Java does ServiceProxySerializer.WriteProxyMethod(_marsh.StartMarshal(inStream), method, args); @@ -290,7 +290,7 @@ namespace Apache.Ignite.Core.Tests.Services outStream.Seek(0, SeekOrigin.Begin); - return ServiceProxySerializer.ReadInvocationResult(outStream, _marsh, KeepPortable); + return ServiceProxySerializer.ReadInvocationResult(outStream, _marsh, KeepBinary); } } @@ -354,16 +354,16 @@ namespace Apache.Ignite.Core.Tests.Services void CustomExceptionMethod(); /** */ - void CustomExceptionPortableMethod(bool throwOnWrite, bool throwOnRead); + void CustomExceptionBinarizableMethod(bool throwOnWrite, bool throwOnRead); /** */ - TestPortableClass PortableArgMethod(int arg1, IBinaryObject arg2); + TestBinarizableClass BinarizableArgMethod(int arg1, IBinaryObject arg2); /** */ - IBinaryObject PortableResultMethod(int arg1, TestPortableClass arg2); + IBinaryObject BinarizableResultMethod(int arg1, TestBinarizableClass arg2); /** */ - IBinaryObject PortableArgAndResultMethod(int arg1, IBinaryObject arg2); + IBinaryObject BinarizableArgAndResultMethod(int arg1, IBinaryObject arg2); /** */ int AmbiguousMethod(int arg); @@ -414,16 +414,16 @@ namespace Apache.Ignite.Core.Tests.Services void CustomExceptionMethod(); /** */ - void CustomExceptionPortableMethod(bool throwOnWrite, bool throwOnRead); + void CustomExceptionBinarizableMethod(bool throwOnWrite, bool throwOnRead); /** */ - TestPortableClass PortableArgMethod(int arg1, IBinaryObject arg2); + TestBinarizableClass BinarizableArgMethod(int arg1, IBinaryObject arg2); /** */ - IBinaryObject PortableResultMethod(int arg1, TestPortableClass arg2); + IBinaryObject BinarizableResultMethod(int arg1, TestBinarizableClass arg2); /** */ - IBinaryObject PortableArgAndResultMethod(int arg1, IBinaryObject arg2); + IBinaryObject BinarizableArgAndResultMethod(int arg1, IBinaryObject arg2); /** */ void MissingMethod(); @@ -444,7 +444,7 @@ namespace Apache.Ignite.Core.Tests.Services /// <summary> /// Initializes a new instance of the <see cref="TestIgniteService"/> class. /// </summary> - /// <param name="igniteBinary">The portables.</param> + /// <param name="igniteBinary">Binary.</param> public TestIgniteService(IIgniteBinary igniteBinary) { _igniteBinary = igniteBinary; @@ -520,27 +520,27 @@ namespace Apache.Ignite.Core.Tests.Services } /** <inheritdoc /> */ - public void CustomExceptionPortableMethod(bool throwOnWrite, bool throwOnRead) + public void CustomExceptionBinarizableMethod(bool throwOnWrite, bool throwOnRead) { - throw new CustomExceptionPortable {ThrowOnRead = throwOnRead, ThrowOnWrite = throwOnWrite}; + throw new CustomExceptionBinarizable {ThrowOnRead = throwOnRead, ThrowOnWrite = throwOnWrite}; } /** <inheritdoc /> */ - public TestPortableClass PortableArgMethod(int arg1, IBinaryObject arg2) + public TestBinarizableClass BinarizableArgMethod(int arg1, IBinaryObject arg2) { - return arg2.Deserialize<TestPortableClass>(); + return arg2.Deserialize<TestBinarizableClass>(); } /** <inheritdoc /> */ - public IBinaryObject PortableResultMethod(int arg1, TestPortableClass arg2) + public IBinaryObject BinarizableResultMethod(int arg1, TestBinarizableClass arg2) { return _igniteBinary.ToBinary<IBinaryObject>(arg2); } /** <inheritdoc /> */ - public IBinaryObject PortableArgAndResultMethod(int arg1, IBinaryObject arg2) + public IBinaryObject BinarizableArgAndResultMethod(int arg1, IBinaryObject arg2) { - return _igniteBinary.ToBinary<IBinaryObject>(arg2.Deserialize<TestPortableClass>()); + return _igniteBinary.ToBinary<IBinaryObject>(arg2.Deserialize<TestBinarizableClass>()); } /** <inheritdoc /> */ @@ -595,7 +595,7 @@ namespace Apache.Ignite.Core.Tests.Services /// <summary> /// Custom non-serializable exception. /// </summary> - private class CustomExceptionPortable : Exception, IBinarizable + private class CustomExceptionBinarizable : Exception, IBinarizable { /** */ public bool ThrowOnWrite { get; set; } @@ -609,7 +609,7 @@ namespace Apache.Ignite.Core.Tests.Services writer.WriteBoolean("ThrowOnRead", ThrowOnRead); if (ThrowOnWrite) - throw new Exception("Expected exception in CustomExceptionPortable.WritePortable"); + throw new Exception("Expected exception in CustomExceptionBinarizable.WriteBinary"); } /** <inheritdoc /> */ @@ -618,14 +618,14 @@ namespace Apache.Ignite.Core.Tests.Services ThrowOnRead = reader.ReadBoolean("ThrowOnRead"); if (ThrowOnRead) - throw new Exception("Expected exception in CustomExceptionPortable.ReadPortable"); + throw new Exception("Expected exception in CustomExceptionBinarizable.ReadBinary"); } } /// <summary> - /// Portable object for method argument/result. + /// Binarizable object for method argument/result. /// </summary> - protected class TestPortableClass : IBinarizable + protected class TestBinarizableClass : IBinarizable { /** */ public string Prop { get; set; } @@ -643,7 +643,7 @@ namespace Apache.Ignite.Core.Tests.Services writer.WriteBoolean("ThrowOnRead", ThrowOnRead); if (ThrowOnWrite) - throw new Exception("Expected exception in TestPortableClass.WritePortable"); + throw new Exception("Expected exception in TestBinarizableClass.WriteBinary"); } /** <inheritdoc /> */ @@ -653,89 +653,89 @@ namespace Apache.Ignite.Core.Tests.Services ThrowOnRead = reader.ReadBoolean("ThrowOnRead"); if (ThrowOnRead) - throw new Exception("Expected exception in TestPortableClass.ReadPortable"); + throw new Exception("Expected exception in TestBinarizableClass.ReadBinary"); } } } /// <summary> - /// Tests <see cref="ServiceProxySerializer"/> functionality with keepPortable mode enabled on client. + /// Tests <see cref="ServiceProxySerializer"/> functionality with keepBinary mode enabled on client. /// </summary> - public class ServiceProxyTestKeepPortableClient : ServiceProxyTest + public class ServiceProxyTestKeepBinaryClient : ServiceProxyTest { /// <summary> - /// Initializes a new instance of the <see cref="ServiceProxyTestKeepPortableClient"/> class. + /// Initializes a new instance of the <see cref="ServiceProxyTestKeepBinaryClient"/> class. /// </summary> - public ServiceProxyTestKeepPortableClient() + public ServiceProxyTestKeepBinaryClient() { - KeepPortable = true; + KeepBinary = true; } [Test] - public void TestPortableMethods() + public void TestBinarizableMethods() { var prx = GetProxy(); - var obj = new TestPortableClass { Prop = "PropValue" }; + var obj = new TestBinarizableClass { Prop = "PropValue" }; - var result = prx.PortableResultMethod(1, obj); + var result = prx.BinarizableResultMethod(1, obj); - Assert.AreEqual(obj.Prop, result.Deserialize<TestPortableClass>().Prop); + Assert.AreEqual(obj.Prop, result.Deserialize<TestBinarizableClass>().Prop); } } /// <summary> - /// Tests <see cref="ServiceProxySerializer"/> functionality with keepPortable mode enabled on server. + /// Tests <see cref="ServiceProxySerializer"/> functionality with keepBinary mode enabled on server. /// </summary> - public class ServiceProxyTestKeepPortableServer : ServiceProxyTest + public class ServiceProxyTestKeepBinaryServer : ServiceProxyTest { /// <summary> - /// Initializes a new instance of the <see cref="ServiceProxyTestKeepPortableServer"/> class. + /// Initializes a new instance of the <see cref="ServiceProxyTestKeepBinaryServer"/> class. /// </summary> - public ServiceProxyTestKeepPortableServer() + public ServiceProxyTestKeepBinaryServer() { - SrvKeepPortable = true; + SrvKeepBinary = true; } [Test] - public void TestPortableMethods() + public void TestBinarizableMethods() { var prx = GetProxy(); - var obj = new TestPortableClass { Prop = "PropValue" }; + var obj = new TestBinarizableClass { Prop = "PropValue" }; var portObj = IgniteBinary.ToBinary<IBinaryObject>(obj); - var result = prx.PortableArgMethod(1, portObj); + var result = prx.BinarizableArgMethod(1, portObj); Assert.AreEqual(obj.Prop, result.Prop); } } /// <summary> - /// Tests <see cref="ServiceProxySerializer"/> functionality with keepPortable mode enabled on client and on server. + /// Tests <see cref="ServiceProxySerializer"/> functionality with keepBinary mode enabled on client and on server. /// </summary> - public class ServiceProxyTestKeepPortableClientServer : ServiceProxyTest + public class ServiceProxyTestKeepBinaryClientServer : ServiceProxyTest { /// <summary> - /// Initializes a new instance of the <see cref="ServiceProxyTestKeepPortableClientServer"/> class. + /// Initializes a new instance of the <see cref="ServiceProxyTestKeepBinaryClientServer"/> class. /// </summary> - public ServiceProxyTestKeepPortableClientServer() + public ServiceProxyTestKeepBinaryClientServer() { - KeepPortable = true; - SrvKeepPortable = true; + KeepBinary = true; + SrvKeepBinary = true; } [Test] - public void TestPortableMethods() + public void TestBinarizableMethods() { var prx = GetProxy(); - var obj = new TestPortableClass { Prop = "PropValue" }; + var obj = new TestBinarizableClass { Prop = "PropValue" }; var portObj = IgniteBinary.ToBinary<IBinaryObject>(obj); - var result = prx.PortableArgAndResultMethod(1, portObj); + var result = prx.BinarizableArgAndResultMethod(1, portObj); - Assert.AreEqual(obj.Prop, result.Deserialize<TestPortableClass>().Prop); + Assert.AreEqual(obj.Prop, result.Deserialize<TestBinarizableClass>().Prop); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs index c4b5776..33f255e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTest.cs @@ -102,7 +102,7 @@ namespace Apache.Ignite.Core.Tests.Services /// Tests deployment. /// </summary> [Test] - public void TestDeploy([Values(true, false)] bool portable) + public void TestDeploy([Values(true, false)] bool binarizable) { var cfg = new ServiceConfiguration { @@ -110,7 +110,7 @@ namespace Apache.Ignite.Core.Tests.Services MaxPerNodeCount = 3, TotalCount = 3, NodeFilter = new NodeFilter {NodeId = Grid1.GetCluster().GetLocalNode().Id}, - Service = portable ? new TestIgniteServicePortable() : new TestIgniteServiceSerializable() + Service = binarizable ? new TestIgniteServiceBinarizable() : new TestIgniteServiceSerializable() }; Services.Deploy(cfg); @@ -161,7 +161,7 @@ namespace Apache.Ignite.Core.Tests.Services [Test] public void TestDeployKeyAffinitySingleton() { - var svc = new TestIgniteServicePortable(); + var svc = new TestIgniteServiceBinarizable(); Services.DeployKeyAffinitySingleton(SvcName, svc, CacheName, AffKey); @@ -176,13 +176,13 @@ namespace Apache.Ignite.Core.Tests.Services /// Tests key affinity singleton deployment. /// </summary> [Test] - public void TestDeployKeyAffinitySingletonPortable() + public void TestDeployKeyAffinitySingletonBinarizable() { var services = Services.WithKeepBinary(); - var svc = new TestIgniteServicePortable(); + var svc = new TestIgniteServiceBinarizable(); - var affKey = new PortableObject {Val = AffKey}; + var affKey = new BinarizableObject {Val = AffKey}; services.DeployKeyAffinitySingleton(SvcName, svc, CacheName, affKey); @@ -213,7 +213,7 @@ namespace Apache.Ignite.Core.Tests.Services { for (var i = 0; i < 10; i++) { - Services.DeployNodeSingleton(SvcName + i, new TestIgniteServicePortable()); + Services.DeployNodeSingleton(SvcName + i, new TestIgniteServiceBinarizable()); Assert.IsNotNull(Services.GetService<ITestIgniteService>(SvcName + i)); } @@ -236,7 +236,7 @@ namespace Apache.Ignite.Core.Tests.Services /// Tests service proxy. /// </summary> [Test] - public void TestGetServiceProxy([Values(true, false)] bool portable) + public void TestGetServiceProxy([Values(true, false)] bool binarizable) { // Test proxy without a service var prx = Services.GetServiceProxy<ITestIgniteService>(SvcName); @@ -247,8 +247,8 @@ namespace Apache.Ignite.Core.Tests.Services Assert.AreEqual("Failed to find deployed service: " + SvcName, ex.Message); // Deploy to grid2 & grid3 - var svc = portable - ? new TestIgniteServicePortable {TestProperty = 17} + var svc = binarizable + ? new TestIgniteServiceBinarizable {TestProperty = 17} : new TestIgniteServiceSerializable {TestProperty = 17}; Grid1.GetCluster().ForNodeIds(Grid2.GetCluster().GetLocalNode().Id, Grid3.GetCluster().GetLocalNode().Id).GetServices() @@ -300,7 +300,7 @@ namespace Apache.Ignite.Core.Tests.Services [Test] public void TestDuckTyping([Values(true, false)] bool local) { - var svc = new TestIgniteServicePortable {TestProperty = 33}; + var svc = new TestIgniteServiceBinarizable {TestProperty = 33}; // Deploy locally or to the remote node var nodeId = (local ? Grid1 : Grid2).GetCluster().GetLocalNode().Id; @@ -358,12 +358,12 @@ namespace Apache.Ignite.Core.Tests.Services } /// <summary> - /// Tests the client portable flag. + /// Tests the client binary flag. /// </summary> [Test] - public void TestWithKeepPortableClient() + public void TestWithKeepBinaryClient() { - var svc = new TestIgniteServicePortable(); + var svc = new TestIgniteServiceBinarizable(); // Deploy to grid2 Grid1.GetCluster().ForNodeIds(Grid2.GetCluster().GetLocalNode().Id).GetServices().WithKeepBinary() @@ -372,22 +372,22 @@ namespace Apache.Ignite.Core.Tests.Services // Get proxy var prx = Services.WithKeepBinary().GetServiceProxy<ITestIgniteService>(SvcName); - var obj = new PortableObject {Val = 11}; + var obj = new BinarizableObject {Val = 11}; var res = (IBinaryObject) prx.Method(obj); - Assert.AreEqual(11, res.Deserialize<PortableObject>().Val); + Assert.AreEqual(11, res.Deserialize<BinarizableObject>().Val); res = (IBinaryObject) prx.Method(Grid1.GetBinary().ToBinary<IBinaryObject>(obj)); - Assert.AreEqual(11, res.Deserialize<PortableObject>().Val); + Assert.AreEqual(11, res.Deserialize<BinarizableObject>().Val); } /// <summary> - /// Tests the server portable flag. + /// Tests the server binary flag. /// </summary> [Test] - public void TestWithKeepPortableServer() + public void TestWithKeepBinaryServer() { - var svc = new TestIgniteServicePortable(); + var svc = new TestIgniteServiceBinarizable(); // Deploy to grid2 Grid1.GetCluster().ForNodeIds(Grid2.GetCluster().GetLocalNode().Id).GetServices().WithServerKeepBinary() @@ -396,22 +396,22 @@ namespace Apache.Ignite.Core.Tests.Services // Get proxy var prx = Services.WithServerKeepBinary().GetServiceProxy<ITestIgniteService>(SvcName); - var obj = new PortableObject { Val = 11 }; + var obj = new BinarizableObject { Val = 11 }; - var res = (PortableObject) prx.Method(obj); + var res = (BinarizableObject) prx.Method(obj); Assert.AreEqual(11, res.Val); - res = (PortableObject)prx.Method(Grid1.GetBinary().ToBinary<IBinaryObject>(obj)); + res = (BinarizableObject)prx.Method(Grid1.GetBinary().ToBinary<IBinaryObject>(obj)); Assert.AreEqual(11, res.Val); } /// <summary> - /// Tests server and client portable flag. + /// Tests server and client binary flag. /// </summary> [Test] - public void TestWithKeepPortableBoth() + public void TestWithKeepBinaryBoth() { - var svc = new TestIgniteServicePortable(); + var svc = new TestIgniteServiceBinarizable(); // Deploy to grid2 Grid1.GetCluster().ForNodeIds(Grid2.GetCluster().GetLocalNode().Id).GetServices().WithKeepBinary().WithServerKeepBinary() @@ -420,13 +420,13 @@ namespace Apache.Ignite.Core.Tests.Services // Get proxy var prx = Services.WithKeepBinary().WithServerKeepBinary().GetServiceProxy<ITestIgniteService>(SvcName); - var obj = new PortableObject { Val = 11 }; + var obj = new BinarizableObject { Val = 11 }; var res = (IBinaryObject)prx.Method(obj); - Assert.AreEqual(11, res.Deserialize<PortableObject>().Val); + Assert.AreEqual(11, res.Deserialize<BinarizableObject>().Val); res = (IBinaryObject)prx.Method(Grid1.GetBinary().ToBinary<IBinaryObject>(obj)); - Assert.AreEqual(11, res.Deserialize<PortableObject>().Val); + Assert.AreEqual(11, res.Deserialize<BinarizableObject>().Val); } /// <summary> @@ -484,7 +484,7 @@ namespace Apache.Ignite.Core.Tests.Services [Test] public void TestMarshalExceptionOnRead() { - var svc = new TestIgniteServicePortableErr(); + var svc = new TestIgniteServiceBinarizableErr(); var ex = Assert.Throws<IgniteException>(() => Services.DeployMultiple(SvcName, svc, Grids.Length, 1)); Assert.AreEqual("Expected exception", ex.Message); @@ -497,7 +497,7 @@ namespace Apache.Ignite.Core.Tests.Services [Test] public void TestMarshalExceptionOnWrite() { - var svc = new TestIgniteServicePortableErr {ThrowOnWrite = true}; + var svc = new TestIgniteServiceBinarizableErr {ThrowOnWrite = true}; var ex = Assert.Throws<Exception>(() => Services.DeployMultiple(SvcName, svc, Grids.Length, 1)); Assert.AreEqual("Expected exception", ex.Message); @@ -570,9 +570,9 @@ namespace Apache.Ignite.Core.Tests.Services { TypeConfigurations = new List<BinaryTypeConfiguration> { - new BinaryTypeConfiguration(typeof(TestIgniteServicePortable)), - new BinaryTypeConfiguration(typeof(TestIgniteServicePortableErr)), - new BinaryTypeConfiguration(typeof(PortableObject)) + new BinaryTypeConfiguration(typeof(TestIgniteServiceBinarizable)), + new BinaryTypeConfiguration(typeof(TestIgniteServiceBinarizableErr)), + new BinaryTypeConfiguration(typeof(BinarizableObject)) } } }; @@ -734,11 +734,11 @@ namespace Apache.Ignite.Core.Tests.Services if (context.AffinityKey != null && !(context.AffinityKey is int)) { - var portableObject = context.AffinityKey as IBinaryObject; + var binaryObj = context.AffinityKey as IBinaryObject; - var key = portableObject != null - ? portableObject.Deserialize<PortableObject>() - : (PortableObject) context.AffinityKey; + var key = binaryObj != null + ? binaryObj.Deserialize<BinarizableObject>() + : (BinarizableObject) context.AffinityKey; Assert.AreEqual(AffKey, key.Val); } @@ -751,9 +751,9 @@ namespace Apache.Ignite.Core.Tests.Services } /// <summary> - /// Test portable service. + /// Test binary service. /// </summary> - private class TestIgniteServicePortable : TestIgniteServiceSerializable, IBinarizable + private class TestIgniteServiceBinarizable : TestIgniteServiceSerializable, IBinarizable { /** <inheritdoc /> */ public void WriteBinary(IBinaryWriter writer) @@ -769,9 +769,9 @@ namespace Apache.Ignite.Core.Tests.Services } /// <summary> - /// Test portable service with exceptions in marshalling. + /// Test binary service with exceptions in marshalling. /// </summary> - private class TestIgniteServicePortableErr : TestIgniteServiceSerializable, IBinarizable + private class TestIgniteServiceBinarizableErr : TestIgniteServiceSerializable, IBinarizable { /** */ public bool ThrowOnWrite { get; set; } @@ -813,9 +813,9 @@ namespace Apache.Ignite.Core.Tests.Services } /// <summary> - /// Portable object. + /// Binary object. /// </summary> - private class PortableObject + private class BinarizableObject { public int Val { get; set; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TypeResolverTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TypeResolverTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TypeResolverTest.cs index c75f003..a95ecd7 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TypeResolverTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/TypeResolverTest.cs @@ -38,16 +38,16 @@ namespace Apache.Ignite.Core.Tests { var testTypes = new[] { - typeof (TestGenericPortable<int>), - typeof (TestGenericPortable<string>), - typeof (TestGenericPortable<TestGenericPortable<int>>), - typeof (TestGenericPortable<List<Tuple<int, string>>>), - typeof (TestGenericPortable<List<TestGenericPortable<List<Tuple<int, string>>>>>), - typeof (List<TestGenericPortable<List<TestGenericPortable<List<Tuple<int, string>>>>>>), - typeof (TestGenericPortable<int, string>), - typeof (TestGenericPortable<int, TestGenericPortable<string>>), - typeof (TestGenericPortable<int, string, Type>), - typeof (TestGenericPortable<int, string, TestGenericPortable<int, string, Type>>) + typeof (TestGenericBinarizable<int>), + typeof (TestGenericBinarizable<string>), + typeof (TestGenericBinarizable<TestGenericBinarizable<int>>), + typeof (TestGenericBinarizable<List<Tuple<int, string>>>), + typeof (TestGenericBinarizable<List<TestGenericBinarizable<List<Tuple<int, string>>>>>), + typeof (List<TestGenericBinarizable<List<TestGenericBinarizable<List<Tuple<int, string>>>>>>), + typeof (TestGenericBinarizable<int, string>), + typeof (TestGenericBinarizable<int, TestGenericBinarizable<string>>), + typeof (TestGenericBinarizable<int, string, Type>), + typeof (TestGenericBinarizable<int, string, TestGenericBinarizable<int, string, Type>>) }; foreach (var type in testTypes) http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs index 12abefb..98ea106 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedCallbacks.cs @@ -604,7 +604,7 @@ namespace Apache.Ignite.Core.Impl.Unmanaged } private void DataStreamerStreamReceiverInvoke(void* target, long rcvPtr, void* cache, long memPtr, - byte keepPortable) + byte keepBinary) { SafeCall(() => { @@ -612,14 +612,14 @@ namespace Apache.Ignite.Core.Impl.Unmanaged { var reader = _ignite.Marshaller.StartUnmarshal(stream, BinaryMode.ForceBinary); - var portableReceiver = reader.ReadObject<BinaryObject>(); + var binaryReceiver = reader.ReadObject<BinaryObject>(); var receiver = _handleRegistry.Get<StreamReceiverHolder>(rcvPtr) ?? - portableReceiver.Deserialize<StreamReceiverHolder>(); + binaryReceiver.Deserialize<StreamReceiverHolder>(); if (receiver != null) receiver.Receive(_ignite, new UnmanagedNonReleaseableTarget(_ctx, cache), stream, - keepPortable != 0); + keepBinary != 0); } }); } @@ -893,12 +893,12 @@ namespace Apache.Ignite.Core.Impl.Unmanaged { var reader = _ignite.Marshaller.StartUnmarshal(stream); - bool srvKeepPortable = reader.ReadBoolean(); + bool srvKeepBinary = reader.ReadBoolean(); var svc = reader.ReadObject<IService>(); ResourceProcessor.Inject(svc, _ignite); - svc.Init(new ServiceContext(_ignite.Marshaller.StartUnmarshal(stream, srvKeepPortable))); + svc.Init(new ServiceContext(_ignite.Marshaller.StartUnmarshal(stream, srvKeepBinary))); return _handleRegistry.Allocate(svc); } @@ -915,10 +915,10 @@ namespace Apache.Ignite.Core.Impl.Unmanaged { var reader = _ignite.Marshaller.StartUnmarshal(stream); - bool srvKeepPortable = reader.ReadBoolean(); + bool srvKeepBinary = reader.ReadBoolean(); svc.Execute(new ServiceContext( - _ignite.Marshaller.StartUnmarshal(stream, srvKeepPortable))); + _ignite.Marshaller.StartUnmarshal(stream, srvKeepBinary))); } }); } @@ -935,9 +935,9 @@ namespace Apache.Ignite.Core.Impl.Unmanaged { var reader = _ignite.Marshaller.StartUnmarshal(stream); - bool srvKeepPortable = reader.ReadBoolean(); + bool srvKeepBinary = reader.ReadBoolean(); - svc.Cancel(new ServiceContext(_ignite.Marshaller.StartUnmarshal(stream, srvKeepPortable))); + svc.Cancel(new ServiceContext(_ignite.Marshaller.StartUnmarshal(stream, srvKeepBinary))); } } finally http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/examples/Config/example-cache-query.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/examples/Config/example-cache-query.xml b/modules/platforms/dotnet/examples/Config/example-cache-query.xml index 7755645..a3b854b 100644 --- a/modules/platforms/dotnet/examples/Config/example-cache-query.xml +++ b/modules/platforms/dotnet/examples/Config/example-cache-query.xml @@ -33,12 +33,12 @@ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration"> <property name="types"> <list> - <value>Apache.Ignite.Examples.Dll.Portable.Account</value> - <value>Apache.Ignite.Examples.Dll.Portable.Address</value> - <value>Apache.Ignite.Examples.Dll.Portable.Employee</value> - <value>Apache.Ignite.Examples.Dll.Portable.EmployeeKey</value> - <value>Apache.Ignite.Examples.Dll.Portable.Organization</value> - <value>Apache.Ignite.Examples.Dll.Portable.OrganizationType</value> + <value>Apache.Ignite.ExamplesDll.Binary.Account</value> + <value>Apache.Ignite.ExamplesDll.Binary.Address</value> + <value>Apache.Ignite.ExamplesDll.Binary.Employee</value> + <value>Apache.Ignite.ExamplesDll.Binary.EmployeeKey</value> + <value>Apache.Ignite.ExamplesDll.Binary.Organization</value> + <value>Apache.Ignite.ExamplesDll.Binary.OrganizationType</value> </list> </property> </bean> http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/modules/platforms/dotnet/examples/Config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/examples/Config/example-cache.xml b/modules/platforms/dotnet/examples/Config/example-cache.xml index d31938a..21a6a76 100644 --- a/modules/platforms/dotnet/examples/Config/example-cache.xml +++ b/modules/platforms/dotnet/examples/Config/example-cache.xml @@ -32,12 +32,12 @@ <bean class="org.apache.ignite.platform.dotnet.PlatformDotNetBinaryConfiguration"> <property name="types"> <list> - <value>Apache.Ignite.Examples.Dll.Portable.Account</value> - <value>Apache.Ignite.Examples.Dll.Portable.Address</value> - <value>Apache.Ignite.Examples.Dll.Portable.Employee</value> - <value>Apache.Ignite.Examples.Dll.Portable.EmployeeKey</value> - <value>Apache.Ignite.Examples.Dll.Portable.Organization</value> - <value>Apache.Ignite.Examples.Dll.Portable.OrganizationType</value> + <value>Apache.Ignite.ExamplesDll.Binary.Account</value> + <value>Apache.Ignite.ExamplesDll.Binary.Address</value> + <value>Apache.Ignite.ExamplesDll.Binary.Employee</value> + <value>Apache.Ignite.ExamplesDll.Binary.EmployeeKey</value> + <value>Apache.Ignite.ExamplesDll.Binary.Organization</value> + <value>Apache.Ignite.ExamplesDll.Binary.OrganizationType</value> </list> </property> </bean> http://git-wip-us.apache.org/repos/asf/ignite/blob/d69362f8/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 07c1847..d52ae4c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -763,6 +763,7 @@ <exclude>**/*.fxcop</exclude> <exclude>**/*.metaproj</exclude> <exclude>**/*.metaproj.tmp</exclude> + <exclude>**/*.nunit</exclude> <exclude>**/teamcity_boost.cpp</exclude> <exclude>**/teamcity_messages.h</exclude> <exclude>**/teamcity_messages.cpp</exclude>