You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2018/02/23 18:31:49 UTC
[geode-native] 11/11: GEODE-4341: Incorporate PR feedback
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 7bf9fa8afbbd4a0b9a74a9c9b0c081a8ebbae5d4
Author: Blake Bender <bb...@pivotal.io>
AuthorDate: Thu Feb 22 22:41:11 2018 +0000
GEODE-4341: Incorporate PR feedback
---
.../Apache.Geode.Examples.AuthInitialize.csproj | 62 ----------------------
.../CMakeLists.txt | 7 +--
.../ExampleAuthInitialize.cs | 0
.../Program.cs | 0
.../README.md | 0
.../startserver.ps1 | 2 +-
.../stopserver.ps1 | 2 +-
examples/dotnet/CMakeLists.txt | 3 +-
.../Apache.Geode.Examples.PutGetRemove.csproj | 0
.../CMakeLists.txt | 0
.../Program.cs | 2 +-
.../README.md | 0
.../startserver.ps1 | 0
.../stopserver.ps1 | 0
14 files changed, 9 insertions(+), 69 deletions(-)
diff --git a/examples/dotnet/Apache.Geode.Examples.AuthInitialize/Apache.Geode.Examples.AuthInitialize.csproj b/examples/dotnet/Apache.Geode.Examples.AuthInitialize/Apache.Geode.Examples.AuthInitialize.csproj
deleted file mode 100644
index 74be271..0000000
--- a/examples/dotnet/Apache.Geode.Examples.AuthInitialize/Apache.Geode.Examples.AuthInitialize.csproj
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{047FC72E-F06D-4F3A-9EF3-B66FAE4B6C36}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Apache.Geode.Examples.AuthInitialize</RootNamespace>
- <AssemblyName>Apache.Geode.Examples.AuthInitialize</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- <Prefer32Bit>true</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <OutputPath>bin\x64\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- <Prefer32Bit>true</Prefer32Bit>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Apache.Geode">
- <HintPath>..\..\..\..\build\clicache\src\Debug\Apache.Geode.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="ExampleAuthInitialize.cs" />
- <Compile Include="Program.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="README.md" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Properties\" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt b/examples/dotnet/AuthInitialize/CMakeLists.txt
similarity index 91%
copy from examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt
copy to examples/dotnet/AuthInitialize/CMakeLists.txt
index 3a8d7e1..b5bb961 100644
--- a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt
+++ b/examples/dotnet/AuthInitialize/CMakeLists.txt
@@ -15,7 +15,7 @@
cmake_minimum_required(VERSION 3.8.2)
-project(PutGetRemove CSharp)
+project(AuthInitialize CSharp)
message(STATUS "Assembly is ${GEODE_ASSEMBLY}")
@@ -24,7 +24,8 @@ if ("${GEODE_ASSEMBLY}" STREQUAL "")
endif()
add_executable(${PROJECT_NAME}
- Program.cs)
+ Program.cs
+ ExampleAuthInitialize.cs)
message(STATUS "output dir is ${RUNTIME_OUTPUT_DIRECTORY}")
message(STATUS "project binary dir: ${PROJECT_BINARY_DIR}")
@@ -35,7 +36,7 @@ message(STATUS "Attempting to link to ${CMAKE_CURRENT_SOURCE_DIR}/../../../build
target_link_libraries(${PROJECT_NAME}
${GEODE_ASSEMBLY})
-set_property(TARGET PutGetRemove PROPERTY VS_DOTNET_REFERENCES
+set_property(TARGET ${PROJECT_NAME} PROPERTY VS_DOTNET_REFERENCES
"System"
"${GEODE_ASSEMBLY}")
diff --git a/examples/dotnet/Apache.Geode.Examples.AuthInitialize/ExampleAuthInitialize.cs b/examples/dotnet/AuthInitialize/ExampleAuthInitialize.cs
similarity index 100%
rename from examples/dotnet/Apache.Geode.Examples.AuthInitialize/ExampleAuthInitialize.cs
rename to examples/dotnet/AuthInitialize/ExampleAuthInitialize.cs
diff --git a/examples/dotnet/Apache.Geode.Examples.AuthInitialize/Program.cs b/examples/dotnet/AuthInitialize/Program.cs
similarity index 100%
rename from examples/dotnet/Apache.Geode.Examples.AuthInitialize/Program.cs
rename to examples/dotnet/AuthInitialize/Program.cs
diff --git a/examples/dotnet/Apache.Geode.Examples.AuthInitialize/README.md b/examples/dotnet/AuthInitialize/README.md
similarity index 100%
rename from examples/dotnet/Apache.Geode.Examples.AuthInitialize/README.md
rename to examples/dotnet/AuthInitialize/README.md
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/startserver.ps1 b/examples/dotnet/AuthInitialize/startserver.ps1
similarity index 94%
copy from examples/dotnet/Apache.Geode.Examples.PutGetRemove/startserver.ps1
copy to examples/dotnet/AuthInitialize/startserver.ps1
index cdffe7a..49d764e 100644
--- a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/startserver.ps1
+++ b/examples/dotnet/AuthInitialize/startserver.ps1
@@ -37,5 +37,5 @@ else
if ($GFSH_PATH -ne "")
{
- Invoke-Expression "$GFSH_PATH -e 'start locator --name=locator --dir=$PSScriptRoot\locator' -e 'start server --name=server --dir=$PSScriptRoot\server' -e 'create region --name=example_userinfo --type=PARTITION'"
+ Invoke-Expression "$GFSH_PATH -e 'start locator --name=locator --dir=$PSScriptRoot\locator' -e 'start server --name=server --dir=$PSScriptRoot\server' -e 'create region --name=region --type=PARTITION'"
}
\ No newline at end of file
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/stopserver.ps1 b/examples/dotnet/AuthInitialize/stopserver.ps1
similarity index 93%
copy from examples/dotnet/Apache.Geode.Examples.PutGetRemove/stopserver.ps1
copy to examples/dotnet/AuthInitialize/stopserver.ps1
index 6c78ac8..361a746 100644
--- a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/stopserver.ps1
+++ b/examples/dotnet/AuthInitialize/stopserver.ps1
@@ -37,5 +37,5 @@ else
if ($GFSH_PATH -ne "")
{
- Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=example_userinfo' -e 'stop server --name=server' -e 'stop locator --name=locator'"
+ Invoke-Expression "$GFSH_PATH -e 'connect' -e 'destroy region --name=region' -e 'stop server --name=server' -e 'stop locator --name=locator'"
}
\ No newline at end of file
diff --git a/examples/dotnet/CMakeLists.txt b/examples/dotnet/CMakeLists.txt
index db538ad..a5ec504 100644
--- a/examples/dotnet/CMakeLists.txt
+++ b/examples/dotnet/CMakeLists.txt
@@ -16,4 +16,5 @@ cmake_minimum_required(VERSION 3.4)
project(Apache.Geode.Examples)
-add_subdirectory(Apache.Geode.Examples.PutGetRemove)
+add_subdirectory(AuthInitialize)
+add_subdirectory(PutGetRemove)
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/Apache.Geode.Examples.PutGetRemove.csproj b/examples/dotnet/PutGetRemove/Apache.Geode.Examples.PutGetRemove.csproj
similarity index 100%
rename from examples/dotnet/Apache.Geode.Examples.PutGetRemove/Apache.Geode.Examples.PutGetRemove.csproj
rename to examples/dotnet/PutGetRemove/Apache.Geode.Examples.PutGetRemove.csproj
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt b/examples/dotnet/PutGetRemove/CMakeLists.txt
similarity index 100%
rename from examples/dotnet/Apache.Geode.Examples.PutGetRemove/CMakeLists.txt
rename to examples/dotnet/PutGetRemove/CMakeLists.txt
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/Program.cs b/examples/dotnet/PutGetRemove/Program.cs
similarity index 98%
rename from examples/dotnet/Apache.Geode.Examples.PutGetRemove/Program.cs
rename to examples/dotnet/PutGetRemove/Program.cs
index 7834411..07dac3d 100644
--- a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/Program.cs
+++ b/examples/dotnet/PutGetRemove/Program.cs
@@ -18,7 +18,7 @@
using System;
using Apache.Geode.Client;
-namespace Apache.Geode.Examples.Cache
+namespace Apache.Geode.Examples.PutGetRemove
{
class Program
{
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/README.md b/examples/dotnet/PutGetRemove/README.md
similarity index 100%
rename from examples/dotnet/Apache.Geode.Examples.PutGetRemove/README.md
rename to examples/dotnet/PutGetRemove/README.md
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/startserver.ps1 b/examples/dotnet/PutGetRemove/startserver.ps1
similarity index 100%
rename from examples/dotnet/Apache.Geode.Examples.PutGetRemove/startserver.ps1
rename to examples/dotnet/PutGetRemove/startserver.ps1
diff --git a/examples/dotnet/Apache.Geode.Examples.PutGetRemove/stopserver.ps1 b/examples/dotnet/PutGetRemove/stopserver.ps1
similarity index 100%
rename from examples/dotnet/Apache.Geode.Examples.PutGetRemove/stopserver.ps1
rename to examples/dotnet/PutGetRemove/stopserver.ps1
--
To stop receiving notification emails like this one, please contact
echobravo@apache.org.