Repository: ignite Updated Branches: refs/heads/ignite-1286 d6d27fba4 -> 9b55689cf
IGNITE-1286 review Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b55689c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b55689c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b55689c Branch: refs/heads/ignite-1286 Commit: 9b55689cff7c2fc0ba93f81f6454636ec674742f Parents: d6d27fb Author: ptupitsyn <[email protected]> Authored: Mon Aug 24 16:41:11 2015 +0300 Committer: ptupitsyn <[email protected]> Committed: Mon Aug 24 16:41:11 2015 +0300 ---------------------------------------------------------------------- .../Apache.Ignite.Core.csproj | 2 +- .../dotnet/Apache.Ignite.Core/GridFactory.cs | 23 ----------- .../Properties/AssemblyInfo.cs | 40 ++++++++++---------- .../Apache.Ignite.Core.Tests.csproj | 2 +- .../Apache.Ignite.Core.Tests/GridFactoryTest.cs | 30 --------------- .../Properties/AssemblyInfo.cs | 21 +--------- .../Apache.Ignite.Core.Tests/TestRunner.cs | 4 +- 7 files changed, 26 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj index 32fd659..71e022f 100644 --- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -38,7 +38,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="GridFactory.cs" /> + <Compile Include="Ignition.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs deleted file mode 100644 index 20fdb69..0000000 --- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/GridFactory.cs +++ /dev/null @@ -1,23 +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 -{ - public class GridFactory - { - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs index 92e4b93..7432673 100644 --- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs +++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs @@ -1,9 +1,23 @@ -using System.Reflection; +/* + * 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. + */ + +using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("Apache.Ignite.Core")] [assembly: AssemblyDescription("Apache Ignite .NET Client Core")] [assembly: AssemblyConfiguration("")] @@ -13,23 +27,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("97db45a8-f922-456a-a819-7b3c6e5e03ba")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.4.1.0")] +[assembly: AssemblyFileVersion("1.4.1.0")] http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj ---------------------------------------------------------------------- diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj index d6e1421..78ddba9 100644 --- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj +++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj @@ -48,7 +48,7 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="GridFactoryTest.cs" /> + <Compile Include="IgnitionTest.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="TestRunner.cs" /> </ItemGroup> http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs ---------------------------------------------------------------------- diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs deleted file mode 100644 index 3188deb..0000000 --- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/GridFactoryTest.cs +++ /dev/null @@ -1,30 +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 NUnit.Framework; - - public class GridFactoryTest - { - [Test] - public void Test() - { - Assert.IsNotNull(new GridFactory()); - } - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs index d8073ac..fe079ac 100644 --- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs +++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs @@ -18,9 +18,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("Apache.Ignite.Core.Tests")] [assembly: AssemblyDescription("Apache Ignite .NET Client Tests")] [assembly: AssemblyConfiguration("")] @@ -30,23 +27,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("de8dd5cc-7c7f-4a09-80d5-7086d9416a7b")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.4.1.0")] +[assembly: AssemblyFileVersion("1.4.1.0")] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/9b55689c/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/TestRunner.cs ---------------------------------------------------------------------- diff --git a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/TestRunner.cs b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/TestRunner.cs index 27b70db..feb91bc 100644 --- a/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/TestRunner.cs +++ b/modules/platform/src/test/dotnet/Apache.Ignite.Core.Tests/TestRunner.cs @@ -31,7 +31,7 @@ namespace Apache.Ignite.Core.Tests //TestOne(typeof(ContinuousQueryAtomiclBackupTest), "TestInitialQuery"); - TestAll(typeof(GridFactoryTest)); + TestAll(typeof(IgnitionTest)); //TestAllInAssembly(); } @@ -58,7 +58,7 @@ namespace Apache.Ignite.Core.Tests private static void TestAllInAssembly() { - string[] args = { Assembly.GetAssembly(typeof(GridFactoryTest)).Location }; + string[] args = { Assembly.GetAssembly(typeof(IgnitionTest)).Location }; int returnCode = NUnit.ConsoleRunner.Runner.Main(args);
