You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/05/04 14:20:53 UTC

[1/9] ignite git commit: IGNITE-1786: Fix for .NET solution

Repository: ignite
Updated Branches:
  refs/heads/ignite-1786 ce2764637 -> 887942fb8


IGNITE-1786: Fix for .NET solution


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee3b7301
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee3b7301
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee3b7301

Branch: refs/heads/ignite-1786
Commit: ee3b7301e2bffedc8071e5ffb8c015b2858fbd6b
Parents: 9123eef
Author: isapego <is...@gridgain.com>
Authored: Fri Apr 29 17:43:24 2016 +0300
Committer: isapego <is...@gridgain.com>
Committed: Fri Apr 29 17:43:24 2016 +0300

----------------------------------------------------------------------
 .../Apache.Ignite.Core.csproj                   | 12 +++---
 modules/platforms/dotnet/Apache.Ignite.sln      | 40 ++++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ee3b7301/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 5a74af8..e16146c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -471,11 +471,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup Condition="'$(Platform)' == 'AnyCPU'">
-    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\x64\$(Configuration)\ignite.common.dll">
-      <Link>resources\$(Configuration)\x64\ignite.common.dll</Link>
+    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\x64\$(Configuration)\ignite.jni.dll">
+      <Link>resources\$(Configuration)\x64\ignite.jni.dll</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.common.dll" Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.common.dll')">
-      <Link>resources\$(Configuration)\x86\ignite.common.dll</Link>
+    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.jni.dll" Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.jni.dll')">
+      <Link>resources\$(Configuration)\x86\ignite.jni.dll</Link>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -496,7 +496,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\cpp\jni\project\vs\jni.vcxproj">
-      <Project>{d906be6e-9370-494e-b10b-f74994e68fb2}</Project>
+      <Project>{4f7e4917-4612-4b96-9838-025711ade391}</Project>
       <Name>jni</Name>
     </ProjectReference>
   </ItemGroup>
@@ -513,4 +513,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/ee3b7301/modules/platforms/dotnet/Apache.Ignite.sln
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln
index 37ed118..7367d1d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.sln
+++ b/modules/platforms/dotnet/Apache.Ignite.sln
@@ -5,7 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", "Apach
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests", "Apache.Ignite.Core.Tests\Apache.Ignite.Core.Tests.csproj", "{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\cpp\common\project\vs\common.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\cpp\common\project\vs\common.vcxproj", "{B63F2E01-5157-4719-8491-0E1C7CD3B701}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests.TestDll", "Apache.Ignite.Core.Tests.TestDll\Apache.Ignite.Core.Tests.TestDll.csproj", "{F4A69E2D-908E-4F0F-A794-84D508D60E5F}"
 EndProject
@@ -31,7 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.txt = README.txt
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "..\cpp\jni\project\vs\jni.vcxproj", "{D906BE6E-9370-494E-B10B-F74994E68FB2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "..\cpp\jni\project\vs\jni.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Linq", "Apache.Ignite.Linq\Apache.Ignite.Linq.csproj", "{5B571661-17F4-4F29-8C7D-0EDB38CA9B55}"
 EndProject
@@ -69,14 +69,14 @@ Global
 		{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.Build.0 = Release|Any CPU
 		{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.ActiveCfg = Release|Any CPU
 		{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.Build.0 = Release|Any CPU
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.ActiveCfg = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.Build.0 = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Any CPU.ActiveCfg = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.ActiveCfg = Release|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.ActiveCfg = Debug|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.Build.0 = Debug|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x86.ActiveCfg = Debug|Win32
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x86.Build.0 = Debug|Win32
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|Any CPU.ActiveCfg = Release|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x64.ActiveCfg = Release|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x86.ActiveCfg = Release|x64
 		{F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -137,16 +137,16 @@ Global
 		{8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x64.Build.0 = Release|Any CPU
 		{8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x86.ActiveCfg = Release|Any CPU
 		{8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x86.Build.0 = Release|Any CPU
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|x64.ActiveCfg = Debug|x64
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|x64.Build.0 = Debug|x64
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|x86.ActiveCfg = Debug|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|x86.Build.0 = Debug|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|Any CPU.ActiveCfg = Release|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|x64.ActiveCfg = Release|x64
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|x64.Build.0 = Release|x64
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|x86.ActiveCfg = Release|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|x86.Build.0 = Release|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = Debug|x64
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.ActiveCfg = Debug|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.Build.0 = Debug|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Any CPU.ActiveCfg = Release|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.Build.0 = Release|x64
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.ActiveCfg = Release|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.Build.0 = Release|Win32
 		{5B571661-17F4-4F29-8C7D-0EDB38CA9B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5B571661-17F4-4F29-8C7D-0EDB38CA9B55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B571661-17F4-4F29-8C7D-0EDB38CA9B55}.Debug|x64.ActiveCfg = Debug|Any CPU

[9/9] ignite git commit: Merge branch 'ignite-1786-1' into ignite-1786

Posted by vo...@apache.org.
Merge branch 'ignite-1786-1' into ignite-1786


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/887942fb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/887942fb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/887942fb

Branch: refs/heads/ignite-1786
Commit: 887942fb8dc6d3d436e167a21fd475c83ac4a0c3
Parents: c953aa9 4fc16fd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed May 4 17:20:34 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed May 4 17:20:34 2016 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------

[7/9] ignite git commit: Merge branch 'ignite-1786' of https://github.com/isapego/ignite into ignite-1786-1

Posted by vo...@apache.org.
Merge branch 'ignite-1786' of https://github.com/isapego/ignite into ignite-1786-1


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4fc16fd7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4fc16fd7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4fc16fd7

Branch: refs/heads/ignite-1786
Commit: 4fc16fd7e93f5eccaa563338a78ea3de5a719794
Parents: ce27646 ededa70
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed May 4 17:18:48 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed May 4 17:18:48 2016 +0300

----------------------------------------------------------------------
 modules/platforms/cpp/DEVNOTES.txt              |  2 +
 modules/platforms/cpp/configure.acrel           |  1 -
 .../Apache.Ignite.Core.csproj                   | 12 +++---
 .../dotnet/Apache.Ignite.Core/build-common.ps1  | 13 +++++++
 modules/platforms/dotnet/Apache.Ignite.sln      | 40 ++++++++++----------
 5 files changed, 41 insertions(+), 27 deletions(-)
----------------------------------------------------------------------

[2/9] ignite git commit: IGNITE-1786: Fix for release version of the configure.ac file.

Posted by vo...@apache.org.
IGNITE-1786: Fix for release version of the configure.ac file.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7431dd4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7431dd4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7431dd4

Branch: refs/heads/ignite-1786
Commit: f7431dd49872c8186a4dff70711b255c0ba61ed7
Parents: ee3b730
Author: Igor Sapego <is...@gridgain.com>
Authored: Fri Apr 29 17:47:17 2016 +0300
Committer: Igor Sapego <is...@gridgain.com>
Committed: Fri Apr 29 17:47:17 2016 +0300

----------------------------------------------------------------------
 modules/platforms/cpp/configure.acrel | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f7431dd4/modules/platforms/cpp/configure.acrel
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/configure.acrel b/modules/platforms/cpp/configure.acrel
index f1af7e5..036f124 100644
--- a/modules/platforms/cpp/configure.acrel
+++ b/modules/platforms/cpp/configure.acrel
@@ -85,7 +85,6 @@ AC_CONFIG_FILES([ \
     core/include/Makefile \
     core/Makefile \
     core/ignite.pc \
-    jni/os/linux/include/Makefile \
     jni/include/Makefile \
     jni/Makefile \
     ignite/Makefile \

[6/9] ignite git commit: IGNITE-1786: Fix for DEVNOTES.

Posted by vo...@apache.org.
IGNITE-1786: Fix for DEVNOTES.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ededa70a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ededa70a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ededa70a

Branch: refs/heads/ignite-1786
Commit: ededa70ab812dadd2864250f673185757a568480
Parents: 9d01e18
Author: isapego <is...@gridgain.com>
Authored: Fri Apr 29 22:47:57 2016 +0300
Committer: isapego <is...@gridgain.com>
Committed: Fri Apr 29 22:47:57 2016 +0300

----------------------------------------------------------------------
 modules/platforms/cpp/DEVNOTES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ededa70a/modules/platforms/cpp/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/DEVNOTES.txt b/modules/platforms/cpp/DEVNOTES.txt
index 2525ef3..81c22db 100644
--- a/modules/platforms/cpp/DEVNOTES.txt
+++ b/modules/platforms/cpp/DEVNOTES.txt
@@ -19,12 +19,14 @@ Common Requirements:
 
 Building the Apache Ignite C++ components:
  * Navigate to the directory $IGNITE_HOME/platforms/cpp
+ * Generate configure file using autotools.
  * Configure build system using './configure' script. For additional options
    use './configure --help'
  * Build enabled components using 'make' command.
 
 Or simply speaking do the following:
  * cd $IGNITE_HOME/platforms/cpp
+ * libtoolize && aclocal && autoheader && automake --add-missing && autoreconf
  * ./configure
  * make

[8/9] ignite git commit: Merging latest changes to build procedure.

Posted by vo...@apache.org.
Merging latest changes to build procedure.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c953aa94
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c953aa94
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c953aa94

Branch: refs/heads/ignite-1786
Commit: c953aa946e94d3ea01cbc1ac8076a7a1d6e6e538
Parents: ce27646
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed May 4 17:20:23 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed May 4 17:20:23 2016 +0300

----------------------------------------------------------------------
 modules/platforms/cpp/DEVNOTES.txt              |  2 +
 modules/platforms/cpp/configure.acrel           |  1 -
 .../Apache.Ignite.Core.csproj                   | 12 +++---
 .../dotnet/Apache.Ignite.Core/build-common.ps1  | 13 +++++++
 modules/platforms/dotnet/Apache.Ignite.sln      | 40 ++++++++++----------
 5 files changed, 41 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c953aa94/modules/platforms/cpp/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/DEVNOTES.txt b/modules/platforms/cpp/DEVNOTES.txt
index 2525ef3..81c22db 100644
--- a/modules/platforms/cpp/DEVNOTES.txt
+++ b/modules/platforms/cpp/DEVNOTES.txt
@@ -19,12 +19,14 @@ Common Requirements:
 
 Building the Apache Ignite C++ components:
  * Navigate to the directory $IGNITE_HOME/platforms/cpp
+ * Generate configure file using autotools.
  * Configure build system using './configure' script. For additional options
    use './configure --help'
  * Build enabled components using 'make' command.
 
 Or simply speaking do the following:
  * cd $IGNITE_HOME/platforms/cpp
+ * libtoolize && aclocal && autoheader && automake --add-missing && autoreconf
  * ./configure
  * make
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c953aa94/modules/platforms/cpp/configure.acrel
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/configure.acrel b/modules/platforms/cpp/configure.acrel
index f1af7e5..036f124 100644
--- a/modules/platforms/cpp/configure.acrel
+++ b/modules/platforms/cpp/configure.acrel
@@ -85,7 +85,6 @@ AC_CONFIG_FILES([ \
     core/include/Makefile \
     core/Makefile \
     core/ignite.pc \
-    jni/os/linux/include/Makefile \
     jni/include/Makefile \
     jni/Makefile \
     ignite/Makefile \

http://git-wip-us.apache.org/repos/asf/ignite/blob/c953aa94/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 5a74af8..409a7cf 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -471,11 +471,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup Condition="'$(Platform)' == 'AnyCPU'">
-    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\x64\$(Configuration)\ignite.common.dll">
-      <Link>resources\$(Configuration)\x64\ignite.common.dll</Link>
+    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\jni\project\vs\x64\$(Configuration)\ignite.jni.dll">
+      <Link>resources\$(Configuration)\x64\ignite.jni.dll</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.common.dll" Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.common.dll')">
-      <Link>resources\$(Configuration)\x86\ignite.common.dll</Link>
+    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\jni\project\vs\Win32\$(Configuration)\ignite.jni.dll" Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\jni\project\vs\Win32\$(Configuration)\ignite.jni.dll')">
+      <Link>resources\$(Configuration)\x86\ignite.jni.dll</Link>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -496,7 +496,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\cpp\jni\project\vs\jni.vcxproj">
-      <Project>{d906be6e-9370-494e-b10b-f74994e68fb2}</Project>
+      <Project>{4f7e4917-4612-4b96-9838-025711ade391}</Project>
       <Name>jni</Name>
     </ProjectReference>
   </ItemGroup>
@@ -513,4 +513,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/c953aa94/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1 b/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
index 3df6c76..db24751 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
@@ -61,4 +61,17 @@ if ($env:JAVA_HOME32) {
     $env:JAVA_HOME = $env:JAVA_HOME32
 
     & $msbuildexe "..\..\cpp\common\project\vs\common.vcxproj" /p:Platform=Win32 /p:Configuration=$Configuration /t:Rebuild
+}
+
+# build jni project
+if ($env:JAVA_HOME64) {
+    $env:JAVA_HOME = $env:JAVA_HOME64
+
+    & $msbuildexe "..\..\cpp\jni\project\vs\jni.vcxproj" /p:Platform=x64 /p:Configuration=$Configuration /t:Rebuild
+}
+
+if ($env:JAVA_HOME32) {
+    $env:JAVA_HOME = $env:JAVA_HOME32
+
+    & $msbuildexe "..\..\cpp\jni\project\vs\jni.vcxproj" /p:Platform=Win32 /p:Configuration=$Configuration /t:Rebuild
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/c953aa94/modules/platforms/dotnet/Apache.Ignite.sln
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln
index 37ed118..7367d1d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.sln
+++ b/modules/platforms/dotnet/Apache.Ignite.sln
@@ -5,7 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", "Apach
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests", "Apache.Ignite.Core.Tests\Apache.Ignite.Core.Tests.csproj", "{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\cpp\common\project\vs\common.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\cpp\common\project\vs\common.vcxproj", "{B63F2E01-5157-4719-8491-0E1C7CD3B701}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests.TestDll", "Apache.Ignite.Core.Tests.TestDll\Apache.Ignite.Core.Tests.TestDll.csproj", "{F4A69E2D-908E-4F0F-A794-84D508D60E5F}"
 EndProject
@@ -31,7 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.txt = README.txt
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "..\cpp\jni\project\vs\jni.vcxproj", "{D906BE6E-9370-494E-B10B-F74994E68FB2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jni", "..\cpp\jni\project\vs\jni.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Linq", "Apache.Ignite.Linq\Apache.Ignite.Linq.csproj", "{5B571661-17F4-4F29-8C7D-0EDB38CA9B55}"
 EndProject
@@ -69,14 +69,14 @@ Global
 		{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.Build.0 = Release|Any CPU
 		{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.ActiveCfg = Release|Any CPU
 		{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.Build.0 = Release|Any CPU
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = Debug|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.ActiveCfg = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.Build.0 = Debug|Win32
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Any CPU.ActiveCfg = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64
-		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.ActiveCfg = Release|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.ActiveCfg = Debug|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x64.Build.0 = Debug|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x86.ActiveCfg = Debug|Win32
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Debug|x86.Build.0 = Debug|Win32
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|Any CPU.ActiveCfg = Release|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x64.ActiveCfg = Release|x64
+		{B63F2E01-5157-4719-8491-0E1C7CD3B701}.Release|x86.ActiveCfg = Release|x64
 		{F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -137,16 +137,16 @@ Global
 		{8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x64.Build.0 = Release|Any CPU
 		{8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x86.ActiveCfg = Release|Any CPU
 		{8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x86.Build.0 = Release|Any CPU
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|x64.ActiveCfg = Debug|x64
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|x64.Build.0 = Debug|x64
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|x86.ActiveCfg = Debug|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Debug|x86.Build.0 = Debug|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|Any CPU.ActiveCfg = Release|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|x64.ActiveCfg = Release|x64
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|x64.Build.0 = Release|x64
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|x86.ActiveCfg = Release|Win32
-		{D906BE6E-9370-494E-B10B-F74994E68FB2}.Release|x86.Build.0 = Release|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = Debug|x64
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.ActiveCfg = Debug|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.Build.0 = Debug|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Any CPU.ActiveCfg = Release|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.Build.0 = Release|x64
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.ActiveCfg = Release|Win32
+		{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.Build.0 = Release|Win32
 		{5B571661-17F4-4F29-8C7D-0EDB38CA9B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5B571661-17F4-4F29-8C7D-0EDB38CA9B55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B571661-17F4-4F29-8C7D-0EDB38CA9B55}.Debug|x64.ActiveCfg = Debug|Any CPU

[4/9] ignite git commit: Merge branch 'ignite-1786' of https://github.com/isapego/ignite into ignite-1786

Posted by vo...@apache.org.
Merge branch 'ignite-1786' of https://github.com/isapego/ignite into ignite-1786


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b508239
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b508239
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b508239

Branch: refs/heads/ignite-1786
Commit: 0b5082398a44d24e114af95678d933a1ece9696c
Parents: b3966a1 f7431dd
Author: isapego <is...@gridgain.com>
Authored: Fri Apr 29 18:04:46 2016 +0300
Committer: isapego <is...@gridgain.com>
Committed: Fri Apr 29 18:04:46 2016 +0300

----------------------------------------------------------------------
 modules/platforms/cpp/configure.acrel | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------

[3/9] ignite git commit: IGNITE-1786: Fix for .Net solution.

Posted by vo...@apache.org.
IGNITE-1786: Fix for .Net solution.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3966a16
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3966a16
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3966a16

Branch: refs/heads/ignite-1786
Commit: b3966a1696b7d82a79b05dfdfe8119dcb24cf8a3
Parents: ee3b730
Author: isapego <is...@gridgain.com>
Authored: Fri Apr 29 18:03:57 2016 +0300
Committer: isapego <is...@gridgain.com>
Committed: Fri Apr 29 18:03:57 2016 +0300

----------------------------------------------------------------------
 .../Apache.Ignite.Core/Apache.Ignite.Core.csproj       |  4 ++--
 .../dotnet/Apache.Ignite.Core/build-common.ps1         | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b3966a16/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index e16146c..409a7cf 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -471,10 +471,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup Condition="'$(Platform)' == 'AnyCPU'">
-    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\x64\$(Configuration)\ignite.jni.dll">
+    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\jni\project\vs\x64\$(Configuration)\ignite.jni.dll">
       <Link>resources\$(Configuration)\x64\ignite.jni.dll</Link>
     </EmbeddedResource>
-    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.jni.dll" Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.jni.dll')">
+    <EmbeddedResource Include="$(ProjectDir)..\..\cpp\jni\project\vs\Win32\$(Configuration)\ignite.jni.dll" Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\jni\project\vs\Win32\$(Configuration)\ignite.jni.dll')">
       <Link>resources\$(Configuration)\x86\ignite.jni.dll</Link>
     </EmbeddedResource>
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/ignite/blob/b3966a16/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1 b/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
index 3df6c76..db24751 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1
@@ -61,4 +61,17 @@ if ($env:JAVA_HOME32) {
     $env:JAVA_HOME = $env:JAVA_HOME32
 
     & $msbuildexe "..\..\cpp\common\project\vs\common.vcxproj" /p:Platform=Win32 /p:Configuration=$Configuration /t:Rebuild
+}
+
+# build jni project
+if ($env:JAVA_HOME64) {
+    $env:JAVA_HOME = $env:JAVA_HOME64
+
+    & $msbuildexe "..\..\cpp\jni\project\vs\jni.vcxproj" /p:Platform=x64 /p:Configuration=$Configuration /t:Rebuild
+}
+
+if ($env:JAVA_HOME32) {
+    $env:JAVA_HOME = $env:JAVA_HOME32
+
+    & $msbuildexe "..\..\cpp\jni\project\vs\jni.vcxproj" /p:Platform=Win32 /p:Configuration=$Configuration /t:Rebuild
 }
\ No newline at end of file

[5/9] ignite git commit: Merge branch 'ignite-1786' of https://github.com/apache/ignite into ignite-1786

Posted by vo...@apache.org.
Merge branch 'ignite-1786' of https://github.com/apache/ignite into ignite-1786


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9d01e180
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9d01e180
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9d01e180

Branch: refs/heads/ignite-1786
Commit: 9d01e1804209bcc64dafe766c0b7f71f52716293
Parents: 0b50823 8d824ab
Author: isapego <is...@gridgain.com>
Authored: Fri Apr 29 18:23:52 2016 +0300
Committer: isapego <is...@gridgain.com>
Committed: Fri Apr 29 18:23:52 2016 +0300

----------------------------------------------------------------------
 .../apache/ignite/IgniteSystemProperties.java   |  16 +-
 .../dht/GridClientPartitionTopology.java        |   6 +-
 .../dht/GridDhtPartitionTopology.java           |   2 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   6 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   4 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   8 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  10 +-
 .../processors/cluster/GridUpdateNotifier.java  |   3 +-
 .../datastructures/GridCacheLockState.java      |   2 +-
 .../platform/PlatformNoopProcessor.java         |   5 +
 .../processors/platform/PlatformProcessor.java  |   7 +
 .../platform/PlatformProcessorImpl.java         |  15 +
 .../processors/task/GridTaskWorker.java         |   2 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |   2 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   5 +-
 .../spi/discovery/tcp/TcpDiscoveryImpl.java     |  10 +
 .../internal/GridTaskExecutionSelfTest.java     |  76 +++-
 .../BinaryObjectOffHeapUnswapTemporaryTest.java |  12 +-
 ...GridServiceProxyClientReconnectSelfTest.java |   2 +-
 ...gniteServiceConfigVariationsFullApiTest.java | 350 +++++++++++++++++++
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |  34 ++
 .../properties/NotStringSystemPropertyTest.java | 124 +++++++
 .../configvariations/VariationsTestsConfig.java |   2 +-
 .../IgniteConfigVariationsAbstractTest.java     |  72 +++-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   2 +
 .../IgniteCacheDataStructuresSelfTestSuite.java |   6 +-
 ...ServiceConfigVariationsFullApiTestSuite.java |  92 +++++
 .../cpp/jni/include/ignite/jni/exports.h        |   1 +
 .../platforms/cpp/jni/include/ignite/jni/java.h |   4 +-
 modules/platforms/cpp/jni/project/vs/module.def |   1 +
 modules/platforms/cpp/jni/src/exports.cpp       |   4 +
 modules/platforms/cpp/jni/src/java.cpp          |  11 +
 .../Cache/CacheAbstractTest.cs                  |  18 +
 .../dotnet/Apache.Ignite.Core/IIgnite.cs        |   8 +
 .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs    |  18 +
 .../Apache.Ignite.Core/Impl/IgniteProxy.cs      |   7 +
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs    |   3 +
 .../Impl/Unmanaged/UnmanagedUtils.cs            |   5 +
 .../Apache.Ignite.Linq.nuspec                   |   5 +-
 39 files changed, 918 insertions(+), 42 deletions(-)
----------------------------------------------------------------------