ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/4] incubator-ignite git commit: # ignite-496
Date Fri, 20 Mar 2015 15:07:51 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-496 [created] 0a7501f79


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a7501f7/modules/interop-api/src/test/cpp/ingite-interop-api-test.cpp
----------------------------------------------------------------------
diff --git a/modules/interop-api/src/test/cpp/ingite-interop-api-test.cpp b/modules/interop-api/src/test/cpp/ingite-interop-api-test.cpp
new file mode 100644
index 0000000..b95ab17
--- /dev/null
+++ b/modules/interop-api/src/test/cpp/ingite-interop-api-test.cpp
@@ -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.
+ */
+
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
+
+#include <iostream>
+
+#include "ignite-interop-api.h"
+
+using namespace ignite;
+using namespace std;
+
+TEST_CASE("StartIgnite", "[ignite]") {
+    IgniteJvm* jvm = testIgniteJvmStart();
+
+    REQUIRE_THROWS_AS(jvm->startIgnite("invalid config", "ignite1"), IgniteException);
+
+    Ignite* ignite = jvm->startIgnite("modules\\interop-api\\src\\test\\config\\test-single-node.xml",
"ignite1");
+    
+    REQUIRE(ignite);
+
+    IgniteCache* cache = ignite->cache("cache1");
+
+    REQUIRE(cache);
+
+    delete cache;
+
+    delete ignite;
+
+    delete jvm;
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a7501f7/modules/interop-api/vsproject/ignite-interop-api/ignite-interop-api.sln
----------------------------------------------------------------------
diff --git a/modules/interop-api/vsproject/ignite-interop-api/ignite-interop-api.sln b/modules/interop-api/vsproject/ignite-interop-api/ignite-interop-api.sln
new file mode 100644
index 0000000..926d26e
--- /dev/null
+++ b/modules/interop-api/vsproject/ignite-interop-api/ignite-interop-api.sln
@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interop-api", "interop-api\interop-api.vcxproj",
"{E7506B2D-A215-4DF3-B5A5-04C49183F592}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interop-api-tests", "interop-api-tests\interop-api-tests.vcxproj",
"{8D0167AF-9573-43AB-9E82-47EE858635E0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592} = {E7506B2D-A215-4DF3-B5A5-04C49183F592}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592}.Debug|Win32.Build.0 = Debug|Win32
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592}.Debug|x64.ActiveCfg = Debug|x64
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592}.Debug|x64.Build.0 = Debug|x64
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592}.Release|Win32.ActiveCfg = Release|Win32
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592}.Release|Win32.Build.0 = Release|Win32
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592}.Release|x64.ActiveCfg = Release|x64
+		{E7506B2D-A215-4DF3-B5A5-04C49183F592}.Release|x64.Build.0 = Release|x64
+		{8D0167AF-9573-43AB-9E82-47EE858635E0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8D0167AF-9573-43AB-9E82-47EE858635E0}.Debug|Win32.Build.0 = Debug|Win32
+		{8D0167AF-9573-43AB-9E82-47EE858635E0}.Debug|x64.ActiveCfg = Debug|x64
+		{8D0167AF-9573-43AB-9E82-47EE858635E0}.Debug|x64.Build.0 = Debug|x64
+		{8D0167AF-9573-43AB-9E82-47EE858635E0}.Release|Win32.ActiveCfg = Release|Win32
+		{8D0167AF-9573-43AB-9E82-47EE858635E0}.Release|Win32.Build.0 = Release|Win32
+		{8D0167AF-9573-43AB-9E82-47EE858635E0}.Release|x64.ActiveCfg = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a7501f7/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj
----------------------------------------------------------------------
diff --git a/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj
b/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj
new file mode 100644
index 0000000..5fc8f2c
--- /dev/null
+++ b/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E7506B2D-A215-4DF3-B5A5-04C49183F592}</ProjectGuid>
+    <RootNamespace>interopapi</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetExt>.dll</TargetExt>
+    <IncludePath>$(ProjectDir)\..\..\..\src\main\cpp\include;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+    <LibraryPath>$(JAVA_HOME)\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
+    <TargetName>$(SolutionName)</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetExt>.dll</TargetExt>
+    <IncludePath>$(ProjectDir)\..\..\..\src\main\cpp\include;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
+    <LibraryPath>$(JAVA_HOME)\lib;$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
+    <TargetName>$(SolutionName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_API_EXPORT;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>jvm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>IGNITE_API_EXPORT;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>jvm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\main\cpp\include\ignite-interop-api.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\main\cpp\src\ignite-interop-api.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a7501f7/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj.filters
----------------------------------------------------------------------
diff --git a/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj.filters
b/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj.filters
new file mode 100644
index 0000000..46ff6e8
--- /dev/null
+++ b/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj.filters
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\main\cpp\include\ignite-interop-api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\main\cpp\src\ignite-interop-api.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a7501f7/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj.user
----------------------------------------------------------------------
diff --git a/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj.user
b/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj.user
new file mode 100644
index 0000000..7135522
--- /dev/null
+++ b/modules/interop-api/vsproject/ignite-interop-api/interop-api/interop-api.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a7501f7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d2e42eb..2c897f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
         <module>modules/jcl</module>
         <module>modules/schema-import</module>
         <module>modules/codegen</module>
+        <module>modules/interop-api</module>
     </modules>
 
     <dependencyManagement>


Mime
View raw message