This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new a202932 GEODE-9549: enable netcore tests in CI (#867)
a202932 is described below
commit a20293285e667c7ac1d6120bad4dd48a19e75830
Author: Blake Bender <[email protected]>
AuthorDate: Wed Sep 22 07:18:09 2021 -0700
GEODE-9549: enable netcore tests in CI (#867)
* GEODE-9549: Enable .net core tests in CI
- Enable test running job in yml
* GEODE-9549: Build NetCore and NetCore.Test projects individually
- This simplifies the cmake config, and makes the post-build file copy
steps more reliable
* GEODE-9549: Copy C bindings lib to binary dir for tests
- Give Java project a reasonable name
* GEODE-9549: Use ctest to run netcore tests
- Eliminates need for start/stop scripts, all done via ctest now
* GEODE-9549: Make .net core project build in sequence
- Still getting sharing violations on parallel builds, so need to ensure
none of these build at the same time.
Co-authored-by: Jacob Barrett <[email protected]>
---
ci/docker/task/Dockerfile | 2 +-
ci/lib/templates.lib.txt | 8 +--
ci/lib/templates.lib.yml | 4 +-
ci/release/data.yml | 1 +
.../integration-test/ThinClientDurableConnect.hpp | 1 -
netcore/CMakeLists.txt | 11 ++--
.../AspNetCore GeodeSession Sample.csproj.user | 0
.../Extensions/SessionExtensions.cs | 0
.../Middleware/HttpContextItemsMiddleware.cs | 0
.../Models/BasicAuthInitialize.cs | 0
.../Models/ErrorViewModel.cs | 0
.../Pages/Error.cshtml | 0
.../Pages/Error.cshtml.cs | 0
.../Pages/Index.cshtml | 0
.../Pages/Index.cshtml.cs | 0
.../Pages/Shared/_Layout.cshtml | 0
.../Pages/_ViewImports.cshtml | 0
.../Pages/_ViewStart.cshtml | 0
.../Program.cs | 0
.../Properties/launchSettings.json | 0
.../README.md | 0
.../Startup.cs | 0
.../appsettings.Development.json | 0
.../appsettings.Production.json | 0
.../appsettings.json | 0
.../asp-netcore-session-sample.csproj} | 2 +-
.../CMakeLists.txt => cmake/remove_dirs.cmake} | 25 ++------
netcore/geode-dotnet-core.sln | 10 ++--
netcore/netcore-integration-test/CMakeLists.txt | 57 ++++++++++++++++++
.../CacheFactoryTest.cs | 0
.../CacheTest.cs | 0
.../NetCoreCollectionFixture.cs | 0
.../ObjectLeakTest.cs | 0
.../PoolFactoryTest.cs | 0
.../PoolManagerTest.cs | 0
.../Properties/launchSettings.json | 0
.../RegionFactoryTest.cs | 0
.../netcore-integration-test.csproj} | 2 +-
.../xunit.runner.json | 0
netcore/{NetCore => netcore-lib}/AuthInitialize.cs | 0
.../stopserver.sh => netcore-lib/CMakeLists.txt} | 23 ++------
netcore/{NetCore => netcore-lib}/Cache.cs | 0
netcore/{NetCore => netcore-lib}/CacheFactory.cs | 0
netcore/{NetCore => netcore-lib}/Client.cs | 0
netcore/{NetCore => netcore-lib}/Constants.cs | 0
.../{NetCore => netcore-lib}/GeodeNativeObject.cs | 0
netcore/{NetCore => netcore-lib}/ICacheFactory.cs | 0
netcore/{NetCore => netcore-lib}/IGeodeCache.cs | 0
netcore/{NetCore => netcore-lib}/IRegionService.cs | 0
netcore/{NetCore => netcore-lib}/Pool.cs | 0
netcore/{NetCore => netcore-lib}/PoolFactory.cs | 0
netcore/{NetCore => netcore-lib}/PoolManager.cs | 0
netcore/{NetCore => netcore-lib}/Region.cs | 0
netcore/{NetCore => netcore-lib}/RegionFactory.cs | 0
netcore/{NetCore => netcore-lib}/RegionShortcut.cs | 0
.../netcore-lib.csproj} | 0
.../CMakeLists.txt | 53 +++++++++++++++++
.../Properties/launchSettings.json | 0
.../SessionStateIntegrationTests.cs | 0
.../netcore-session-integration-test.csproj} | 4 +-
.../CMakeLists.txt} | 42 +-------------
.../GeodeCacheServiceCollectionExtensions.cs | 0
.../GeodeSessionStateCacheOptions.cs | 0
.../NetCoreSessionState.cs | 0
.../netcore-session.csproj} | 2 +-
netcore/scripts/run-clang-format.cmd | 16 ------
netcore/scripts/startserver.ps1 | 67 ----------------------
netcore/scripts/startserver.sh | 48 ----------------
netcore/scripts/stopserver.ps1 | 47 ---------------
netcore/utility/CMakeLists.txt | 5 +-
70 files changed, 144 insertions(+), 286 deletions(-)
diff --git a/ci/docker/task/Dockerfile b/ci/docker/task/Dockerfile
index ae648e4..dc1269f 100644
--- a/ci/docker/task/Dockerfile
+++ b/ci/docker/task/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM alpine:latest
+FROM alpine:3.13
LABEL maintainer="Apache Geode <[email protected]>"
LABEL description="Minimal image for executing CI tasks."
RUN apk add --no-cache bash git openssh-client
diff --git a/ci/lib/templates.lib.txt b/ci/lib/templates.lib.txt
index 94df686..e38724a 100644
--- a/ci/lib/templates.lib.txt
+++ b/ci/lib/templates.lib.txt
@@ -78,12 +78,6 @@ set -ueo pipefail
remote_shell cmake -E chdir (@= path @) ctest -C ${CMAKE_CONFIG} -j(@=
str(parallel) @) --timeout=(@= str(timeout) @) --output-on-failure --repeat
until-pass:4 --schedule-random
(@- end @)
-(@ def dotnet_bash_task(path): -@)
-set -ueo pipefail
-(@= remote_functions() @)
-remote_shell cmake -E chdir (@= path @) dotnet test
-(@- end @)
-
(@ def clang_tidy_bash_task(): -@)
set -ueo pipefail
export GEODE_HOME=$(pwd)/geode
@@ -309,4 +303,4 @@ exclude_dirs="ci packer docker tools"
exclude_files="*/*.md"
is_source_from_pr_testable "source" "${exclude_dirs}" "${exclude_files}" &&
exit 0 || exit 1
-(@- end @)
\ No newline at end of file
+(@- end @)
diff --git a/ci/lib/templates.lib.yml b/ci/lib/templates.lib.yml
index ca46abf..b38e580 100644
--- a/ci/lib/templates.lib.yml
+++ b/ci/lib/templates.lib.yml
@@ -36,7 +36,6 @@
#@ "upload_source_bash_task",
#@ "upload_geode_bash_task",
#@ "extract_geode_bash_task",
-#@ "dotnet_bash_task",
#@ )
#@ load("@ytt:overlay", "overlay")
@@ -222,7 +221,8 @@ plan:
- #@ remote_task("net-integration-tests", config.config,
ctest_bash_task("build/clicache/integration-test2"), "1h", build.params)
- #@ remote_task("net-legacy-integration-tests", config.config,
ctest_bash_task("build/clicache/integration-test", timeout=500, parallel=4),
"2h", build.params)
#@ end
-#! - #@ remote_task("netcore-tests", config.config,
dotnet_bash_task("source/netcore/NetCore.Test"), "10m", build.params)
+ - #@ remote_task("netcore-integration-test", config.config,
ctest_bash_task("build/netcore/netcore-integration-test", config.config,
parallel=1), "10m", build.params)
+ - #@ remote_task("netcore-session-integration-test", config.config,
ctest_bash_task("build/netcore/netcore-session-integration-test", parallel=1),
"10m", build.params)
on_failure:
in_parallel:
steps:
diff --git a/ci/release/data.yml b/ci/release/data.yml
index 4ddd6de..201440b 100644
--- a/ci/release/data.yml
+++ b/ci/release/data.yml
@@ -28,3 +28,4 @@ configs:
#@overlay/append
- name: release
config: RelWithDebInfo
+
diff --git a/cppcache/integration-test/ThinClientDurableConnect.hpp
b/cppcache/integration-test/ThinClientDurableConnect.hpp
index defc92e..e542f9a 100644
--- a/cppcache/integration-test/ThinClientDurableConnect.hpp
+++ b/cppcache/integration-test/ThinClientDurableConnect.hpp
@@ -54,7 +54,6 @@ const char* durableId = "DurableId";
std::string getServerEndPoint(int instance) {
- char instanceStr[16];
int port;
if (instance == 1) {
port = CacheHelper::staticHostPort1;
diff --git a/netcore/CMakeLists.txt b/netcore/CMakeLists.txt
index 544c47b..b5c3536 100644
--- a/netcore/CMakeLists.txt
+++ b/netcore/CMakeLists.txt
@@ -12,7 +12,6 @@
# 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.
-
project(netcore LANGUAGES NONE)
option(INCLUDE_DOTNET_CORE "Build .NET Core client." ON)
@@ -20,8 +19,10 @@ option(INCLUDE_DOTNET_CORE "Build .NET Core client." ON)
find_program(DOTNET dotnet)
if(DOTNET AND INCLUDE_DOTNET_CORE)
- add_custom_target(netcore ALL COMMAND ${DOTNET} build --configuration
$<CONFIG> WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/NetCore DEPENDS
apache-geode-c VERBATIM)
- add_custom_target(netcore-test ALL COMMAND ${DOTNET} build --configuration
$<CONFIG> WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/NetCore.Test DEPENDS
netcore VERBATIM)
-
- install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/NetCore/bin/$<CONFIG>/netcoreapp3.1/Apache.Geode.NetCore.dll
DESTINATION ./lib)
+ add_subdirectory(netcore-lib)
+ add_subdirectory(netcore-session)
+ add_subdirectory(netcore-integration-test)
+ add_subdirectory(netcore-session-integration-test)
+ add_subdirectory(utility)
endif()
+
diff --git a/netcore/AspNetCore GeodeSession Sample/AspNetCore GeodeSession
Sample.csproj.user b/netcore/asp-netcore-session-sample/AspNetCore GeodeSession
Sample.csproj.user
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/AspNetCore GeodeSession
Sample.csproj.user
rename to netcore/asp-netcore-session-sample/AspNetCore GeodeSession
Sample.csproj.user
diff --git a/netcore/AspNetCore GeodeSession
Sample/Extensions/SessionExtensions.cs
b/netcore/asp-netcore-session-sample/Extensions/SessionExtensions.cs
similarity index 100%
rename from netcore/AspNetCore GeodeSession
Sample/Extensions/SessionExtensions.cs
rename to netcore/asp-netcore-session-sample/Extensions/SessionExtensions.cs
diff --git a/netcore/AspNetCore GeodeSession
Sample/Middleware/HttpContextItemsMiddleware.cs
b/netcore/asp-netcore-session-sample/Middleware/HttpContextItemsMiddleware.cs
similarity index 100%
rename from netcore/AspNetCore GeodeSession
Sample/Middleware/HttpContextItemsMiddleware.cs
rename to
netcore/asp-netcore-session-sample/Middleware/HttpContextItemsMiddleware.cs
diff --git a/netcore/AspNetCore GeodeSession
Sample/Models/BasicAuthInitialize.cs
b/netcore/asp-netcore-session-sample/Models/BasicAuthInitialize.cs
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Models/BasicAuthInitialize.cs
rename to netcore/asp-netcore-session-sample/Models/BasicAuthInitialize.cs
diff --git a/netcore/AspNetCore GeodeSession Sample/Models/ErrorViewModel.cs
b/netcore/asp-netcore-session-sample/Models/ErrorViewModel.cs
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Models/ErrorViewModel.cs
rename to netcore/asp-netcore-session-sample/Models/ErrorViewModel.cs
diff --git a/netcore/AspNetCore GeodeSession Sample/Pages/Error.cshtml
b/netcore/asp-netcore-session-sample/Pages/Error.cshtml
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Pages/Error.cshtml
rename to netcore/asp-netcore-session-sample/Pages/Error.cshtml
diff --git a/netcore/AspNetCore GeodeSession Sample/Pages/Error.cshtml.cs
b/netcore/asp-netcore-session-sample/Pages/Error.cshtml.cs
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Pages/Error.cshtml.cs
rename to netcore/asp-netcore-session-sample/Pages/Error.cshtml.cs
diff --git a/netcore/AspNetCore GeodeSession Sample/Pages/Index.cshtml
b/netcore/asp-netcore-session-sample/Pages/Index.cshtml
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Pages/Index.cshtml
rename to netcore/asp-netcore-session-sample/Pages/Index.cshtml
diff --git a/netcore/AspNetCore GeodeSession Sample/Pages/Index.cshtml.cs
b/netcore/asp-netcore-session-sample/Pages/Index.cshtml.cs
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Pages/Index.cshtml.cs
rename to netcore/asp-netcore-session-sample/Pages/Index.cshtml.cs
diff --git a/netcore/AspNetCore GeodeSession Sample/Pages/Shared/_Layout.cshtml
b/netcore/asp-netcore-session-sample/Pages/Shared/_Layout.cshtml
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Pages/Shared/_Layout.cshtml
rename to netcore/asp-netcore-session-sample/Pages/Shared/_Layout.cshtml
diff --git a/netcore/AspNetCore GeodeSession Sample/Pages/_ViewImports.cshtml
b/netcore/asp-netcore-session-sample/Pages/_ViewImports.cshtml
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Pages/_ViewImports.cshtml
rename to netcore/asp-netcore-session-sample/Pages/_ViewImports.cshtml
diff --git a/netcore/AspNetCore GeodeSession Sample/Pages/_ViewStart.cshtml
b/netcore/asp-netcore-session-sample/Pages/_ViewStart.cshtml
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Pages/_ViewStart.cshtml
rename to netcore/asp-netcore-session-sample/Pages/_ViewStart.cshtml
diff --git a/netcore/AspNetCore GeodeSession Sample/Program.cs
b/netcore/asp-netcore-session-sample/Program.cs
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Program.cs
rename to netcore/asp-netcore-session-sample/Program.cs
diff --git a/netcore/AspNetCore GeodeSession
Sample/Properties/launchSettings.json
b/netcore/asp-netcore-session-sample/Properties/launchSettings.json
similarity index 100%
rename from netcore/AspNetCore GeodeSession
Sample/Properties/launchSettings.json
rename to netcore/asp-netcore-session-sample/Properties/launchSettings.json
diff --git a/netcore/AspNetCore GeodeSession Sample/README.md
b/netcore/asp-netcore-session-sample/README.md
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/README.md
rename to netcore/asp-netcore-session-sample/README.md
diff --git a/netcore/AspNetCore GeodeSession Sample/Startup.cs
b/netcore/asp-netcore-session-sample/Startup.cs
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/Startup.cs
rename to netcore/asp-netcore-session-sample/Startup.cs
diff --git a/netcore/AspNetCore GeodeSession
Sample/appsettings.Development.json
b/netcore/asp-netcore-session-sample/appsettings.Development.json
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/appsettings.Development.json
rename to netcore/asp-netcore-session-sample/appsettings.Development.json
diff --git a/netcore/AspNetCore GeodeSession Sample/appsettings.Production.json
b/netcore/asp-netcore-session-sample/appsettings.Production.json
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/appsettings.Production.json
rename to netcore/asp-netcore-session-sample/appsettings.Production.json
diff --git a/netcore/AspNetCore GeodeSession Sample/appsettings.json
b/netcore/asp-netcore-session-sample/appsettings.json
similarity index 100%
rename from netcore/AspNetCore GeodeSession Sample/appsettings.json
rename to netcore/asp-netcore-session-sample/appsettings.json
diff --git a/netcore/AspNetCore GeodeSession Sample/AspNetCore GeodeSession
Sample.csproj
b/netcore/asp-netcore-session-sample/asp-netcore-session-sample.csproj
similarity index 77%
rename from netcore/AspNetCore GeodeSession Sample/AspNetCore GeodeSession
Sample.csproj
rename to netcore/asp-netcore-session-sample/asp-netcore-session-sample.csproj
index fb587cb..3928293 100644
--- a/netcore/AspNetCore GeodeSession Sample/AspNetCore GeodeSession
Sample.csproj
+++ b/netcore/asp-netcore-session-sample/asp-netcore-session-sample.csproj
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="..\NetCore.Session\NetCore.Session.csproj" />
+ <ProjectReference Include="..\netcore-session\netcore-session.csproj" />
</ItemGroup>
diff --git a/netcore/utility/CMakeLists.txt b/netcore/cmake/remove_dirs.cmake
similarity index 67%
copy from netcore/utility/CMakeLists.txt
copy to netcore/cmake/remove_dirs.cmake
index 2640b07..e63d3dd 100644
--- a/netcore/utility/CMakeLists.txt
+++ b/netcore/cmake/remove_dirs.cmake
@@ -12,24 +12,7 @@
# 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.
-cmake_minimum_required (VERSION 3.10)
-project (example)
-
-set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake)
-
-find_package(Geode REQUIRED)
-find_package(Java REQUIRED)
-
-include(UseJava)
-
-file(GLOB_RECURSE SOURCES "*.java")
-
-add_jar(example ${SOURCES}
- INCLUDE_JARS ${Geode_CLASSPATH}
-)
-
-file(GLOB SSL_CERTIFICATES
- "${CMAKE_CURRENT_SOURCE_DIR}/*Keys"
-)
-
-
+##
+# FindGeode CMake find module.
+##
+file(REMOVE_RECURSE locator server auth_locator auth_server)
diff --git a/netcore/geode-dotnet-core.sln b/netcore/geode-dotnet-core.sln
index d44f076..83316b9 100644
--- a/netcore/geode-dotnet-core.sln
+++ b/netcore/geode-dotnet-core.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30001.183
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore",
"NetCore\NetCore.csproj", "{09ABBCE7-B217-43F1-A51B-CC5BDCD8EE98}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "netcore",
"netcore\netcore.csproj", "{09ABBCE7-B217-43F1-A51B-CC5BDCD8EE98}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Test",
"NetCore.Test\NetCore.Test.csproj", "{501DEA7E-8985-42A8-8BC9-C073E1B6DFE0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") =
"netcore-integration-test",
"netcore-integration-test\netcore-integration-test.csproj",
"{501DEA7E-8985-42A8-8BC9-C073E1B6DFE0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Session", "Session",
"{520C96EC-F929-4365-8D78-CC5785419B62}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Session",
"NetCore.Session\NetCore.Session.csproj",
"{B88C58EB-B144-403B-85F7-7A5B45E643E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "netcore-session",
"netcore-session\netcore-session.csproj",
"{B88C58EB-B144-403B-85F7-7A5B45E643E3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") =
"NetCore.Session.IntegrationTests",
"NetCore.Session.IntegrationTests\NetCore.Session.IntegrationTests.csproj",
"{94D2CD59-A5F3-4504-BF01-0A3B95CE12B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") =
"netcore-session-integration-test",
"netcore-session-integration-test\netcore-session-integration-test.csproj",
"{94D2CD59-A5F3-4504-BF01-0A3B95CE12B5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore GeodeSession
Sample", "AspNetCore GeodeSession Sample\AspNetCore GeodeSession
Sample.csproj", "{4E830BC8-D1CA-40AF-9C9C-D15E193C6585}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") =
"asp-netcore-session-sample",
"asp-netcore-session-sample\asp-netcore-session-sample.csproj",
"{4E830BC8-D1CA-40AF-9C9C-D15E193C6585}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/netcore/netcore-integration-test/CMakeLists.txt
b/netcore/netcore-integration-test/CMakeLists.txt
new file mode 100644
index 0000000..6756bcf
--- /dev/null
+++ b/netcore/netcore-integration-test/CMakeLists.txt
@@ -0,0 +1,57 @@
+# 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.
+project(netcore-test LANGUAGES NONE)
+
+add_custom_target(netcore-integration-test ALL
+ COMMAND ${DOTNET} build netcore-integration-test.csproj --configuration
$<CONFIG>
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:apache-geode-c>
${CMAKE_CURRENT_SOURCE_DIR}/bin/$<CONFIG>/netcoreapp3.1/
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c
netcore-lib netcore-utility VERBATIM)
+
+enable_testing()
+
+set(AUTH_OPTS "--J=-Dgemfire.security-username=server
--J=-Dgemfire.security-password=server
--classpath=$<SHELL_PATH:${CMAKE_CURRENT_BINARY_DIR}/../utility/netcore-utility.jar>")
+set(AUTH_LOCATOR_OPTS "${AUTH_OPTS}
--J=-Dgemfire.security-manager=javaobject.SimpleSecurityManager")
+
+add_test(NAME startclusters COMMAND ${Geode_gfsh_EXECUTABLE}
+ -e "start locator --name=locator --port=10334
--http-service-port=6060 --J=-Dgemfire.jmx-manager-port=1099"
+ -e "start server --name=server --server-port=0"
+ -e "create region --name=exampleRegion --type=PARTITION"
+ -e "create region --name=geodeSessionState --type=PARTITION"
+ -e "disconnect"
+ -e "start locator --name=auth_locator ${AUTH_LOCATOR_OPTS}
--port=10335 --http-service-port=7070 --J=-Dgemfire.jmx-manager-port=2099"
+ -e "connect --locator=localhost[10335] --user=server
--password=server"
+ -e "start server --name=auth_server ${AUTH_OPTS} --server-port=0"
+ -e "create region --name=authExampleRegion --type=PARTITION"
+ -e "create region --name=authGeodeSessionState --type=PARTITION")
+add_test(NAME stopclusters
+ COMMAND ${Geode_gfsh_EXECUTABLE}
+ -e "connect --locator=localhost[10335] --user=server --password=server"
+ -e "stop server --name=auth_server"
+ -e "stop locator --name=auth_locator"
+ -e "connect --locator=localhost[10334]"
+ -e "stop server --name=server"
+ -e "stop locator --name=locator")
+add_test(NAME remove_dirs
+ COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_SOURCE_DIR}/../cmake/remove_dirs.cmake)
+
+add_test(NAME netcore-test
+ COMMAND dotnet test -c $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+set_tests_properties(startclusters PROPERTIES FIXTURES_SETUP geode)
+set_tests_properties(netcore-test PROPERTIES FIXTURES_REQUIRED geode)
+set_tests_properties(stopclusters PROPERTIES FIXTURES_CLEANUP geode)
+set_tests_properties(remove_dirs PROPERTIES DEPENDS stopclusters)
+
diff --git a/netcore/NetCore.Test/CacheFactoryTest.cs
b/netcore/netcore-integration-test/CacheFactoryTest.cs
similarity index 100%
rename from netcore/NetCore.Test/CacheFactoryTest.cs
rename to netcore/netcore-integration-test/CacheFactoryTest.cs
diff --git a/netcore/NetCore.Test/CacheTest.cs
b/netcore/netcore-integration-test/CacheTest.cs
similarity index 100%
rename from netcore/NetCore.Test/CacheTest.cs
rename to netcore/netcore-integration-test/CacheTest.cs
diff --git a/netcore/NetCore.Test/NetCoreCollectionFixture.cs
b/netcore/netcore-integration-test/NetCoreCollectionFixture.cs
similarity index 100%
rename from netcore/NetCore.Test/NetCoreCollectionFixture.cs
rename to netcore/netcore-integration-test/NetCoreCollectionFixture.cs
diff --git a/netcore/NetCore.Test/ObjectLeakTest.cs
b/netcore/netcore-integration-test/ObjectLeakTest.cs
similarity index 100%
rename from netcore/NetCore.Test/ObjectLeakTest.cs
rename to netcore/netcore-integration-test/ObjectLeakTest.cs
diff --git a/netcore/NetCore.Test/PoolFactoryTest.cs
b/netcore/netcore-integration-test/PoolFactoryTest.cs
similarity index 100%
rename from netcore/NetCore.Test/PoolFactoryTest.cs
rename to netcore/netcore-integration-test/PoolFactoryTest.cs
diff --git a/netcore/NetCore.Test/PoolManagerTest.cs
b/netcore/netcore-integration-test/PoolManagerTest.cs
similarity index 100%
rename from netcore/NetCore.Test/PoolManagerTest.cs
rename to netcore/netcore-integration-test/PoolManagerTest.cs
diff --git a/netcore/NetCore.Test/Properties/launchSettings.json
b/netcore/netcore-integration-test/Properties/launchSettings.json
similarity index 100%
rename from netcore/NetCore.Test/Properties/launchSettings.json
rename to netcore/netcore-integration-test/Properties/launchSettings.json
diff --git a/netcore/NetCore.Test/RegionFactoryTest.cs
b/netcore/netcore-integration-test/RegionFactoryTest.cs
similarity index 100%
rename from netcore/NetCore.Test/RegionFactoryTest.cs
rename to netcore/netcore-integration-test/RegionFactoryTest.cs
diff --git a/netcore/NetCore.Test/NetCore.Test.csproj
b/netcore/netcore-integration-test/netcore-integration-test.csproj
similarity index 92%
rename from netcore/NetCore.Test/NetCore.Test.csproj
rename to netcore/netcore-integration-test/netcore-integration-test.csproj
index 3898983..78dc7b4 100644
--- a/netcore/NetCore.Test/NetCore.Test.csproj
+++ b/netcore/netcore-integration-test/netcore-integration-test.csproj
@@ -20,7 +20,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\NetCore\NetCore.csproj" />
+ <ProjectReference Include="..\netcore-lib\netcore-lib.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/netcore/NetCore.Test/xunit.runner.json
b/netcore/netcore-integration-test/xunit.runner.json
similarity index 100%
rename from netcore/NetCore.Test/xunit.runner.json
rename to netcore/netcore-integration-test/xunit.runner.json
diff --git a/netcore/NetCore/AuthInitialize.cs
b/netcore/netcore-lib/AuthInitialize.cs
similarity index 100%
rename from netcore/NetCore/AuthInitialize.cs
rename to netcore/netcore-lib/AuthInitialize.cs
diff --git a/netcore/scripts/stopserver.sh b/netcore/netcore-lib/CMakeLists.txt
similarity index 57%
rename from netcore/scripts/stopserver.sh
rename to netcore/netcore-lib/CMakeLists.txt
index d1ab4fa..3128c63 100644
--- a/netcore/scripts/stopserver.sh
+++ b/netcore/netcore-lib/CMakeLists.txt
@@ -12,24 +12,9 @@
# 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.
+project(netcore-lib LANGUAGES NONE)
-#!/usr/bin/env bash
-GFSH_PATH=""
-which gfsh 2> /dev/null
-
-if [ $? -eq 0 ]; then
- GFSH_PATH="gfsh"
-else
- if [ "$GEODE_HOME" == "" ]; then
- echo "Could not find gfsh. Please set the GEODE_HOME path."
- echo "e.g. export GEODE_HOME=<path to Geode>"
- else
- GFSH_PATH=$GEODE_HOME/bin/gfsh
- fi
-fi
-
-$GFSH_PATH -e "connect --locator=localhost[10335] --user=server
--password=server" -e "shutdown --include-locators=true"
-$GFSH_PATH -e "connect --locator=localhost[10334]" -e "shutdown
--include-locators=true"
-
-rm -rf locator server auth_locator auth_server
+add_custom_target(netcore-lib ALL COMMAND ${DOTNET} build netcore-lib.csproj
--configuration $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c
VERBATIM)
+install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/bin/$<CONFIG>/netcoreapp3.1/Apache.Geode.NetCore.dll
DESTINATION ./lib)
diff --git a/netcore/NetCore/Cache.cs b/netcore/netcore-lib/Cache.cs
similarity index 100%
rename from netcore/NetCore/Cache.cs
rename to netcore/netcore-lib/Cache.cs
diff --git a/netcore/NetCore/CacheFactory.cs
b/netcore/netcore-lib/CacheFactory.cs
similarity index 100%
rename from netcore/NetCore/CacheFactory.cs
rename to netcore/netcore-lib/CacheFactory.cs
diff --git a/netcore/NetCore/Client.cs b/netcore/netcore-lib/Client.cs
similarity index 100%
rename from netcore/NetCore/Client.cs
rename to netcore/netcore-lib/Client.cs
diff --git a/netcore/NetCore/Constants.cs b/netcore/netcore-lib/Constants.cs
similarity index 100%
rename from netcore/NetCore/Constants.cs
rename to netcore/netcore-lib/Constants.cs
diff --git a/netcore/NetCore/GeodeNativeObject.cs
b/netcore/netcore-lib/GeodeNativeObject.cs
similarity index 100%
rename from netcore/NetCore/GeodeNativeObject.cs
rename to netcore/netcore-lib/GeodeNativeObject.cs
diff --git a/netcore/NetCore/ICacheFactory.cs
b/netcore/netcore-lib/ICacheFactory.cs
similarity index 100%
rename from netcore/NetCore/ICacheFactory.cs
rename to netcore/netcore-lib/ICacheFactory.cs
diff --git a/netcore/NetCore/IGeodeCache.cs b/netcore/netcore-lib/IGeodeCache.cs
similarity index 100%
rename from netcore/NetCore/IGeodeCache.cs
rename to netcore/netcore-lib/IGeodeCache.cs
diff --git a/netcore/NetCore/IRegionService.cs
b/netcore/netcore-lib/IRegionService.cs
similarity index 100%
rename from netcore/NetCore/IRegionService.cs
rename to netcore/netcore-lib/IRegionService.cs
diff --git a/netcore/NetCore/Pool.cs b/netcore/netcore-lib/Pool.cs
similarity index 100%
rename from netcore/NetCore/Pool.cs
rename to netcore/netcore-lib/Pool.cs
diff --git a/netcore/NetCore/PoolFactory.cs b/netcore/netcore-lib/PoolFactory.cs
similarity index 100%
rename from netcore/NetCore/PoolFactory.cs
rename to netcore/netcore-lib/PoolFactory.cs
diff --git a/netcore/NetCore/PoolManager.cs b/netcore/netcore-lib/PoolManager.cs
similarity index 100%
rename from netcore/NetCore/PoolManager.cs
rename to netcore/netcore-lib/PoolManager.cs
diff --git a/netcore/NetCore/Region.cs b/netcore/netcore-lib/Region.cs
similarity index 100%
rename from netcore/NetCore/Region.cs
rename to netcore/netcore-lib/Region.cs
diff --git a/netcore/NetCore/RegionFactory.cs
b/netcore/netcore-lib/RegionFactory.cs
similarity index 100%
rename from netcore/NetCore/RegionFactory.cs
rename to netcore/netcore-lib/RegionFactory.cs
diff --git a/netcore/NetCore/RegionShortcut.cs
b/netcore/netcore-lib/RegionShortcut.cs
similarity index 100%
rename from netcore/NetCore/RegionShortcut.cs
rename to netcore/netcore-lib/RegionShortcut.cs
diff --git a/netcore/NetCore/NetCore.csproj
b/netcore/netcore-lib/netcore-lib.csproj
similarity index 100%
rename from netcore/NetCore/NetCore.csproj
rename to netcore/netcore-lib/netcore-lib.csproj
diff --git a/netcore/netcore-session-integration-test/CMakeLists.txt
b/netcore/netcore-session-integration-test/CMakeLists.txt
new file mode 100644
index 0000000..0b5e905
--- /dev/null
+++ b/netcore/netcore-session-integration-test/CMakeLists.txt
@@ -0,0 +1,53 @@
+# 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.
+project(netcore-session-integrationtest LANGUAGES NONE)
+
+add_custom_target(netcore-session-integration-test ALL
+ COMMAND ${DOTNET} build netcore-session-integration-test.csproj
--configuration $<CONFIG>
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:apache-geode-c>
${CMAKE_CURRENT_SOURCE_DIR}/bin/$<CONFIG>/netcoreapp3.1/
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c
netcore-session VERBATIM)
+
+enable_testing()
+
+add_test(NAME startclusters COMMAND ${Geode_gfsh_EXECUTABLE}
+ -e "start locator --name=locator --port=10334
--http-service-port=6060 --J=-Dgemfire.jmx-manager-port=1099"
+ -e "start server --name=server --server-port=0"
+ -e "create region --name=exampleRegion --type=PARTITION"
+ -e "create region --name=geodeSessionState --type=PARTITION"
+ -e "disconnect"
+ -e "start locator --name=auth_locator ${AUTH_LOCATOR_OPTS}
--port=10335 --http-service-port=7070 --J=-Dgemfire.jmx-manager-port=2099"
+ -e "connect --locator=localhost[10335] --user=server
--password=server"
+ -e "start server --name=auth_server ${AUTH_OPTS} --server-port=0"
+ -e "create region --name=authExampleRegion --type=PARTITION"
+ -e "create region --name=authGeodeSessionState --type=PARTITION")
+add_test(NAME stopclusters
+ COMMAND ${Geode_gfsh_EXECUTABLE}
+ -e "connect --locator=localhost[10335] --user=server --password=server"
+ -e "stop server --name=auth_server"
+ -e "stop locator --name=auth_locator"
+ -e "connect --locator=localhost[10334]"
+ -e "stop server --name=server"
+ -e "stop locator --name=locator")
+add_test(NAME remove_dirs
+ COMMAND ${CMAKE_COMMAND} -P
${CMAKE_CURRENT_SOURCE_DIR}/../cmake/remove_dirs.cmake)
+
+add_test(NAME netcore-session-test
+ COMMAND dotnet test -c $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+
+set_tests_properties(startclusters PROPERTIES FIXTURES_SETUP geode)
+set_tests_properties(netcore-session-test PROPERTIES FIXTURES_REQUIRED geode)
+set_tests_properties(stopclusters PROPERTIES FIXTURES_CLEANUP geode)
+set_tests_properties(remove_dirs PROPERTIES DEPENDS stopclusters)
diff --git
a/netcore/NetCore.Session.IntegrationTests/Properties/launchSettings.json
b/netcore/netcore-session-integration-test/Properties/launchSettings.json
similarity index 100%
rename from
netcore/NetCore.Session.IntegrationTests/Properties/launchSettings.json
rename to
netcore/netcore-session-integration-test/Properties/launchSettings.json
diff --git
a/netcore/NetCore.Session.IntegrationTests/SessionStateIntegrationTests.cs
b/netcore/netcore-session-integration-test/SessionStateIntegrationTests.cs
similarity index 100%
rename from
netcore/NetCore.Session.IntegrationTests/SessionStateIntegrationTests.cs
rename to
netcore/netcore-session-integration-test/SessionStateIntegrationTests.cs
diff --git
a/netcore/NetCore.Session.IntegrationTests/NetCore.Session.IntegrationTests.csproj
b/netcore/netcore-session-integration-test/netcore-session-integration-test.csproj
similarity index 80%
rename from
netcore/NetCore.Session.IntegrationTests/NetCore.Session.IntegrationTests.csproj
rename to
netcore/netcore-session-integration-test/netcore-session-integration-test.csproj
index e0420cc..de4d070 100644
---
a/netcore/NetCore.Session.IntegrationTests/NetCore.Session.IntegrationTests.csproj
+++
b/netcore/netcore-session-integration-test/netcore-session-integration-test.csproj
@@ -16,8 +16,8 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\NetCore.Session\NetCore.Session.csproj" />
- <ProjectReference Include="..\NetCore\NetCore.csproj" />
+ <ProjectReference Include="..\netcore-session\netcore-session.csproj" />
+ <ProjectReference Include="..\netcore-lib\netcore-lib.csproj" />
</ItemGroup>
</Project>
diff --git a/netcore/scripts/build-geode-native-netcore.sh
b/netcore/netcore-session/CMakeLists.txt
similarity index 53%
rename from netcore/scripts/build-geode-native-netcore.sh
rename to netcore/netcore-session/CMakeLists.txt
index 1233582..6456dc6 100644
--- a/netcore/scripts/build-geode-native-netcore.sh
+++ b/netcore/netcore-session/CMakeLists.txt
@@ -12,43 +12,7 @@
# 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.
+project(netcore-session LANGUAGES NONE)
-#!/usr/bin/env bash
-
-set -e
-set -x
-# Setup GEODE_HOME, if not set use default
-if [ "$GEODE_HOME" == "" ]; then
- export GEODE_HOME=$HOME/src/apache-geode
-fi
-
-# Setup BUILD_HOME, if not set use default
-if [ "$BUILD_HOME" == "" ]; then
- export BUILD_HOME=$HOME/src/geode-native/netcore/build
-fi
-
-echo "Using environment vars GEODE_HOME=${GEODE_HOME} and
BUILD_HOME=${BUILD_HOME}"
-
-# Build utility .jar file # BUild NetCore library
-pushd ./NetCore
-dotnet build
-popd
-
-# Build NetCore tests
-pushd ./NetCore.Test
-dotnet build
-popd
-
-# Build utility jar file used for auth test
-pushd ./utility
-if [ -d "./build" ]; then
- :
-else
- mkdir build
-fi
-
-cd build
-cmake ..
-cmake --build .
-popd
-
+add_custom_target(netcore-session ALL COMMAND ${DOTNET} build
netcore-session.csproj --configuration $<CONFIG>
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS apache-geode-c
netcore-integration-test VERBATIM)
diff --git a/netcore/NetCore.Session/GeodeCacheServiceCollectionExtensions.cs
b/netcore/netcore-session/GeodeCacheServiceCollectionExtensions.cs
similarity index 100%
rename from netcore/NetCore.Session/GeodeCacheServiceCollectionExtensions.cs
rename to netcore/netcore-session/GeodeCacheServiceCollectionExtensions.cs
diff --git a/netcore/NetCore.Session/GeodeSessionStateCacheOptions.cs
b/netcore/netcore-session/GeodeSessionStateCacheOptions.cs
similarity index 100%
rename from netcore/NetCore.Session/GeodeSessionStateCacheOptions.cs
rename to netcore/netcore-session/GeodeSessionStateCacheOptions.cs
diff --git a/netcore/NetCore.Session/NetCoreSessionState.cs
b/netcore/netcore-session/NetCoreSessionState.cs
similarity index 100%
rename from netcore/NetCore.Session/NetCoreSessionState.cs
rename to netcore/netcore-session/NetCoreSessionState.cs
diff --git a/netcore/NetCore.Session/NetCore.Session.csproj
b/netcore/netcore-session/netcore-session.csproj
similarity index 85%
rename from netcore/NetCore.Session/NetCore.Session.csproj
rename to netcore/netcore-session/netcore-session.csproj
index 29e13a3..41d119d 100644
--- a/netcore/NetCore.Session/NetCore.Session.csproj
+++ b/netcore/netcore-session/netcore-session.csproj
@@ -11,7 +11,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\NetCore\NetCore.csproj" />
+ <ProjectReference Include="..\netcore-lib\netcore-lib.csproj" />
</ItemGroup>
</Project>
diff --git a/netcore/scripts/run-clang-format.cmd
b/netcore/scripts/run-clang-format.cmd
deleted file mode 100644
index 01c8f8c..0000000
--- a/netcore/scripts/run-clang-format.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-clang-format -i --style=file NetCore/*.cs
-clang-format -i --style=file NetCore.Test/*.cs
diff --git a/netcore/scripts/startserver.ps1 b/netcore/scripts/startserver.ps1
deleted file mode 100644
index 2321418..0000000
--- a/netcore/scripts/startserver.ps1
+++ /dev/null
@@ -1,67 +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.
-
-$GFSH_PATH = ""
-if (Get-Command gfsh -ErrorAction SilentlyContinue)
-{
- $GFSH_PATH = "gfsh"
-}
-else
-{
- if (-not (Test-Path env:GEODE_HOME))
- {
- Write-Host "Could not find gfsh. Please set the GEODE_HOME path. e.g.
"
- Write-Host "(Powershell) `$env:GEODE_HOME = <path to Geode>"
- Write-Host " OR"
- Write-Host "(Command-line) set %GEODE_HOME% = <path to Geode>"
- exit
- }
- else
- {
- $GFSH_PATH = "$env:GEODE_HOME\bin\gfsh.bat"
- }
-}
-
-if ($env:BUILD_HOME -eq "" -or $env:BUILD_HOME -eq $null)
-{
- Write-Host "Please set BUILD_HOME path to the root directory of a
geode-native examples build."
- Write-Host "startserver.ps1 needs to find 'example.jar' under
BUILD_HOME/utilities to work properly."
- exit
-}
-
-$AUTH_OPTS="--J=-Dgemfire.security-username=server"
-$AUTH_OPTS="$AUTH_OPTS --J=-Dgemfire.security-password=server"
-$AUTH_OPTS="$AUTH_OPTS --classpath=$env:BUILD_HOME/utilities/example.jar"
-
-$AUTH_LOCATOR_OPTS="$AUTH_OPTS
--J=-Dgemfire.security-manager=javaobject.SimpleSecurityManager"
-
-if ($GFSH_PATH -ne "")
-{
- $expression = "$GFSH_PATH " + `
- "-e 'start locator --name=locator --port=10334
--http-service-port=6060 --J=-Dgemfire.jmx-manager-port=1099' " + `
- "-e 'start server --name=server --server-port=0' " + `
- "-e 'create region --name=exampleRegion --type=PARTITION' " + `
- "-e 'create region --name=geodeSessionState --type=PARTITION'";
- Invoke-Expression $expression
-
- $expression = "$GFSH_PATH " + `
- "-e 'start locator --name=auth_locator $AUTH_LOCATOR_OPTS --port=10335
--http-service-port=7070 --J=-Dgemfire.jmx-manager-port=2099' " + `
- "-e 'connect --locator=localhost[10335] --user=server
--password=server' " + `
- "-e 'start server --name=auth_server $AUTH_OPTS --server-port=0' " + `
- "-e 'create region --name=authExampleRegion --type=PARTITION' " + `
- "-e 'create region --name=authGeodeSessionState --type=PARTITION'";
- Invoke-Expression $expression
-}
-
\ No newline at end of file
diff --git a/netcore/scripts/startserver.sh b/netcore/scripts/startserver.sh
deleted file mode 100644
index 3444d9f..0000000
--- a/netcore/scripts/startserver.sh
+++ /dev/null
@@ -1,48 +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.
-
-#!/usr/bin/env bash
-GFSH_PATH=""
-which gfsh 2> /dev/null
-
-if [ $? -eq 0 ]; then
- GFSH_PATH="gfsh"
-else
- if [ "$GEODE_HOME" == "" ]; then
- echo "Could not find gfsh. Please set the GEODE_HOME path."
- echo "e.g. export GEODE_HOME=<path to Geode>"
- else
- GFSH_PATH=$GEODE_HOME/bin/gfsh
- fi
-fi
-
-if [ "$NETCORE_JAVA_BUILD_HOME" == "" ]; then
- NETCORE_JAVA_BUILD_HOME="`pwd -P`"/utility/build
-fi
-
-
-# These security items typically go into gfsecurity.properties file. For
-# simplicity we are including the security details on the commandline.
-
-AUTH_OPTS="--J=-Dgemfire.security-username=server"
-AUTH_OPTS="${AUTH_OPTS} --J=-Dgemfire.security-password=server"
-AUTH_OPTS="${AUTH_OPTS} --classpath=${NETCORE_JAVA_BUILD_HOME}/example.jar"
-
-AUTH_LOCATOR_OPTS="${AUTH_OPTS}
--J=-Dgemfire.security-manager=javaobject.SimpleSecurityManager"
-
-
-$GFSH_PATH -e "start locator --name=locator --port=10334
--http-service-port=6060 --J=-Dgemfire.jmx-manager-port=1099" -e "start server
--name=server --server-port=0" -e "create region --name=exampleRegion
--type=PARTITION" -e "create region --name=geodeSessionState --type=PARTITION"
-
-$GFSH_PATH -e "start locator --name=auth_locator ${AUTH_LOCATOR_OPTS}
--port=10335 --http-service-port=7070 --J=-Dgemfire.jmx-manager-port=2099" -e
"connect --locator=localhost[10335] --user=server --password=server" -e "start
server --name=auth_server ${AUTH_OPTS} --server-port=0" -e "create region
--name=authExampleRegion --type=PARTITION" -e "create region
--name=authGeodeSessionState --type=PARTITION"
diff --git a/netcore/scripts/stopserver.ps1 b/netcore/scripts/stopserver.ps1
deleted file mode 100644
index 25c2034..0000000
--- a/netcore/scripts/stopserver.ps1
+++ /dev/null
@@ -1,47 +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.
-
-$GFSH_PATH = ""
-if (Get-Command gfsh -ErrorAction SilentlyContinue)
-{
- $GFSH_PATH = "gfsh"
-}
-else
-{
- if (-not (Test-Path env:GEODE_HOME))
- {
- Write-Host "Could not find gfsh. Please set the GEODE_HOME path. e.g.
"
- Write-Host "(Powershell) `$env:GEODE_HOME = <path to Geode>"
- Write-Host " OR"
- Write-Host "(Command-line) set %GEODE_HOME% = <path to Geode>"
- exit
- }
- else
- {
- $GFSH_PATH = "$env:GEODE_HOME\bin\gfsh.bat"
- }
-}
-
-if ($GFSH_PATH -ne "")
-{
- Invoke-Expression "$GFSH_PATH -e 'connect --locator=localhost[10335]
--user=server --password=server' -e 'shutdown --include-locators=true'"
- Invoke-Expression "$GFSH_PATH -e 'connect --locator=localhost[10334]' -e
'shutdown --include-locators=true'"
- Start-Sleep -Seconds 5
- Remove-Item -LiteralPath "locator" -Force -Recurse
- Remove-Item -LiteralPath "server" -Force -Recurse
- Remove-Item -LiteralPath "auth_locator" -Force -Recurse
- Remove-Item -LiteralPath "auth_server" -Force -Recurse
-}
-
diff --git a/netcore/utility/CMakeLists.txt b/netcore/utility/CMakeLists.txt
index 2640b07..cf224d1 100644
--- a/netcore/utility/CMakeLists.txt
+++ b/netcore/utility/CMakeLists.txt
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
cmake_minimum_required (VERSION 3.10)
-project (example)
+project (netcore-utility)
set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../cmake)
@@ -24,12 +24,11 @@ include(UseJava)
file(GLOB_RECURSE SOURCES "*.java")
-add_jar(example ${SOURCES}
+add_jar(netcore-utility ${SOURCES}
INCLUDE_JARS ${Geode_CLASSPATH}
)
file(GLOB SSL_CERTIFICATES
"${CMAKE_CURRENT_SOURCE_DIR}/*Keys"
)
-
