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/04/12 19:16:57 UTC
[geode-native] branch develop updated: GEODE-4908 - Rename GFCPP
(#270)
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
The following commit(s) were added to refs/heads/develop by this push:
new edd2989 GEODE-4908 - Rename GFCPP (#270)
edd2989 is described below
commit edd2989a2f7731ae53668733e39778af45307d58
Author: M. Oleske <mo...@users.noreply.github.com>
AuthorDate: Thu Apr 12 12:16:55 2018 -0700
GEODE-4908 - Rename GFCPP (#270)
* GEODE-4908: Rename GFCPP
* Clang format and readibility improvements
* Use GEODE_NATIVE_HOME instead of GEODE_NATIVE to better match java server
---
CONTRIBUTING.md | 2 +-
clicache/integration-test/system.properties | 2 +-
clicache/integration-test/test.bat.in | 2 +-
cppcache/include/geode/DistributedSystem.hpp | 2 +-
cppcache/include/geode/internal/geode_globals.hpp | 6 +-
.../integration-test/resources/system.properties | 2 +-
cppcache/integration-test/testSystemProperties.cpp | 90 ++++++++++++----------
cppcache/src/CppCacheLibrary.cpp | 44 ++++++-----
cppcache/src/DistributedSystem.cpp | 19 ++---
cppcache/src/SystemProperties.cpp | 18 ++---
cppcache/src/geodeBanner.hpp | 7 +-
examples/cmake/FindGeodeNative.cmake.in | 4 +-
templates/security/CMakeLists.txt.forInstall | 10 +--
templates/security/csharp/securityImpl.csproj.in | 4 +-
tests/cli/DUnitFramework/Util.cs | 2 +-
tests/cli/NewFwkLib/CacheHelper.cs | 6 +-
tests/cpp/fwklib/TimeBomb.cpp | 12 +--
17 files changed, 123 insertions(+), 109 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5586fb1..1757e54 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,7 +17,7 @@ Before submitting a pull request the unit and integration tests must all pass. W
$ cd <clone>
$ cd build
$ cd cppcache/test/<Debug|Release|if needed>
-$ ./gfcppcache_unittests
+$ ./apache-geode_unittests
```
### Running integration tests
diff --git a/clicache/integration-test/system.properties b/clicache/integration-test/system.properties
index 0ffddef..4b3a357 100644
--- a/clicache/integration-test/system.properties
+++ b/clicache/integration-test/system.properties
@@ -16,7 +16,7 @@
statistic-sample-rate=700
statistic-sampling-enabled=false
statistic-archive-file=stats.gfs
-log-file=gfcpp.log
+log-file=geode-native.log
log-level=debug
name=system
cache-xml-file=cache.xml
diff --git a/clicache/integration-test/test.bat.in b/clicache/integration-test/test.bat.in
index c0b7735..5c358c4 100644
--- a/clicache/integration-test/test.bat.in
+++ b/clicache/integration-test/test.bat.in
@@ -30,7 +30,7 @@ set PATH=$<JOIN:$<SHELL_PATH:${PATH}>,;>;%PATH%
set PATH=c:\Program Files (x86)\Nunit 2.6.4\bin;%PATH%
set TEST_DIR="$<SHELL_PATH:${TEST_DIR}>"
-set GFCPP="%TEST_DIR%"
+set GEODE_NATIVE_HOME="%TEST_DIR%"
set TESTSRC=$<SHELL_PATH:${CMAKE_CURRENT_SOURCE_DIR}>
set GF_JAVA=$<SHELL_PATH:${Java_JAVA_EXECUTABLE}>
diff --git a/cppcache/include/geode/DistributedSystem.hpp b/cppcache/include/geode/DistributedSystem.hpp
index 1c922ce..c4822ac 100644
--- a/cppcache/include/geode/DistributedSystem.hpp
+++ b/cppcache/include/geode/DistributedSystem.hpp
@@ -67,7 +67,7 @@ class APACHE_GEODE_EXPORT DistributedSystem {
* Initializes the Native Client system to be able to connect to the
* Geode Java servers. If the name string is empty, then the default
* "NativeDS" is used as the name of distributed system.
- * @throws IllegalStateException if GFCPP variable is not set and
+ * @throws IllegalStateException if GEODE_NATIVE_HOME variable is not set and
* product installation directory cannot be determined
**/
static DistributedSystem create(
diff --git a/cppcache/include/geode/internal/geode_globals.hpp b/cppcache/include/geode/internal/geode_globals.hpp
index 6997bdc..064a1d1 100644
--- a/cppcache/include/geode/internal/geode_globals.hpp
+++ b/cppcache/include/geode/internal/geode_globals.hpp
@@ -17,8 +17,8 @@
#pragma once
-#ifndef GEODE_GFCPP_GLOBALS_H_
-#define GEODE_GFCPP_GLOBALS_H_
+#ifndef GEODE_NATIVE_GLOBALS_H_
+#define GEODE_NATIVE_GLOBALS_H_
#ifdef _MSC_VER
// disable: "C++ Exception Specification ignored"
@@ -56,4 +56,4 @@
#include "geode_base.hpp"
-#endif // GEODE_GFCPP_GLOBALS_H_
+#endif // GEODE_NATIVE_GLOBALS_H_
diff --git a/cppcache/integration-test/resources/system.properties b/cppcache/integration-test/resources/system.properties
index 50425b6..e1b0630 100644
--- a/cppcache/integration-test/resources/system.properties
+++ b/cppcache/integration-test/resources/system.properties
@@ -16,7 +16,7 @@
statistic-sample-rate=700s
statistic-sampling-enabled=false
statistic-archive-file=stats.gfs
-log-file=gfcpp.log
+log-file=geode-native.log
#log-level=debug
name=system
cache-xml-file=cache.xml
diff --git a/cppcache/integration-test/testSystemProperties.cpp b/cppcache/integration-test/testSystemProperties.cpp
index 3b34e4d..5881d43 100644
--- a/cppcache/integration-test/testSystemProperties.cpp
+++ b/cppcache/integration-test/testSystemProperties.cpp
@@ -16,6 +16,7 @@
*/
#include "fw_helper.hpp"
+
#include <geode/SystemProperties.hpp>
#include <geode/Properties.hpp>
#include <geode/CacheableString.hpp>
@@ -42,17 +43,20 @@ bool checkSecurityProperties(std::shared_ptr<Properties> securityProperties,
BEGIN_TEST(DEFAULT)
{
- SystemProperties* sp = new SystemProperties(nullptr, "./non-existent");
- ASSERT(sp->statisticsSampleInterval() == std::chrono::seconds(1),
- "expected 1");
- ASSERT(sp->statisticsEnabled() == true, "expected true");
- LOG(sp->statisticsArchiveFile());
- auto&& safname = sp->statisticsArchiveFile();
- ASSERT(safname == "statArchive.gfs",
- "Expected safname == \"statArchive.gfs\"");
- auto&& ll = Log::levelToChars(sp->logLevel());
- ASSERT_STREQ("config", ll);
- delete sp;
+ SystemProperties* systemProperties =
+ new SystemProperties(nullptr, "./non-existent");
+ ASSERT(
+ systemProperties->statisticsSampleInterval() == std::chrono::seconds(1),
+ "expected 1");
+ ASSERT(systemProperties->statisticsEnabled() == true, "expected true");
+ LOG(systemProperties->statisticsArchiveFile());
+ auto&& statisticsArchiveFileName =
+ systemProperties->statisticsArchiveFile();
+ ASSERT(statisticsArchiveFileName == "statArchive.gfs",
+ "Expected statisticsArchiveFileName == \"statArchive.gfs\"");
+ auto&& logLevel = Log::levelToChars(systemProperties->logLevel());
+ ASSERT_STREQ("config", logLevel);
+ delete systemProperties;
}
END_TEST(DEFAULT)
@@ -60,63 +64,69 @@ BEGIN_TEST(NEW_CONFIG)
{
// When the tests are run from the build script the environment variable
// TESTSRC is set.
- std::string testsrc(ACE_OS::getenv("TESTSRC"));
- std::string filePath = testsrc + "/resources/system.properties";
+ std::string testSource(ACE_OS::getenv("TESTSRC"));
+ std::string filePath = testSource + "/resources/system.properties";
// Make sure product can at least log to stdout.
Log::init(LogLevel::Config, nullptr, 0);
- SystemProperties* sp = new SystemProperties(nullptr, filePath.c_str());
+ SystemProperties* systemProperties =
+ new SystemProperties(nullptr, filePath);
- ASSERT(sp->statisticsSampleInterval() == std::chrono::seconds(700),
+ ASSERT(systemProperties->statisticsSampleInterval() ==
+ std::chrono::seconds(700),
"expected 700");
- ASSERT(sp->statisticsEnabled() == false, "expected false");
-
- ASSERT(sp->threadPoolSize() == 96, "max-fe-thread should be 96");
+ ASSERT(systemProperties->statisticsEnabled() == false, "expected false");
- auto&& safname = sp->statisticsArchiveFile();
- ASSERT1(safname == "stats.gfs");
+ ASSERT(systemProperties->threadPoolSize() == 96,
+ "max-fe-thread should be 96");
- auto&& logfname = sp->logFilename();
- ASSERT1(logfname == "gfcpp.log");
+ auto&& statisticsArchiveFileName =
+ systemProperties->statisticsArchiveFile();
+ ASSERT1(statisticsArchiveFileName == "stats.gfs");
- // Log::LogLevel ll = sp->logLevel();
- // ASSERT( ll == Log::Debug, "expected Log::Debug" );
+ auto&& logFilename = systemProperties->logFilename();
+ ASSERT1(logFilename == "geode-native.log");
- auto&& name = sp->name();
+ auto&& name = systemProperties->name();
ASSERT1(name == "system");
- auto&& cxml = sp->cacheXMLFile();
- ASSERT1(cxml == "cache.xml");
+ auto&& cacheXMLFileName = systemProperties->cacheXMLFile();
+ ASSERT1(cacheXMLFileName == "cache.xml");
- ASSERT(sp->pingInterval() == std::chrono::seconds(123),
+ ASSERT(systemProperties->pingInterval() == std::chrono::seconds(123),
"expected 123 pingInterval");
- ASSERT(sp->redundancyMonitorInterval() == std::chrono::seconds(456),
+ ASSERT(systemProperties->redundancyMonitorInterval() ==
+ std::chrono::seconds(456),
"expected 456s redundancyMonitorInterval");
- ASSERT(sp->heapLRULimit() == 100, "expected 100");
- ASSERT(sp->heapLRUDelta() == 10, "expected 10");
+ ASSERT(systemProperties->heapLRULimit() == 100, "expected 100");
+ ASSERT(systemProperties->heapLRUDelta() == 10, "expected 10");
- ASSERT(sp->notifyAckInterval() == std::chrono::milliseconds(1234),
+ ASSERT(systemProperties->notifyAckInterval() ==
+ std::chrono::milliseconds(1234),
"expected 1234 notifyAckInterval");
- ASSERT(sp->notifyDupCheckLife() == std::chrono::milliseconds(4321),
+ ASSERT(systemProperties->notifyDupCheckLife() ==
+ std::chrono::milliseconds(4321),
"expected 4321 notifyDupCheckLife");
- ASSERT(sp->logFileSizeLimit() == 1024000000, "expected 1024000000");
+ ASSERT(systemProperties->logFileSizeLimit() == 1024000000,
+ "expected 1024000000");
- ASSERT(sp->statsFileSizeLimit() == 1024000000, "expected 1024000000");
+ ASSERT(systemProperties->statsFileSizeLimit() == 1024000000,
+ "expected 1024000000");
- auto&& durableId = sp->durableClientId();
+ auto&& durableId = systemProperties->durableClientId();
ASSERT1(durableId == "testDurableId");
- ASSERT(sp->durableTimeout() == std::chrono::seconds(123),
+ ASSERT(systemProperties->durableTimeout() == std::chrono::seconds(123),
"expected 123 durableTimeOut");
- ASSERT(sp->connectTimeout() == std::chrono::milliseconds(345),
+ ASSERT(systemProperties->connectTimeout() == std::chrono::milliseconds(345),
"expected 345 for connect timeout");
- auto securityProperties = sp->getSecurityProperties();
+ auto securityProperties = systemProperties->getSecurityProperties();
ASSERT(checkSecurityProperties(securityProperties, "security-username",
"username") == true,
"SecurityProperties Not Stored");
@@ -124,6 +134,6 @@ BEGIN_TEST(NEW_CONFIG)
"password") == true,
"SecurityProperties Not Stored");
- delete sp;
+ delete systemProperties;
}
END_TEST(NEW_CONFIG)
diff --git a/cppcache/src/CppCacheLibrary.cpp b/cppcache/src/CppCacheLibrary.cpp
index 99e11ef..56db30d 100644
--- a/cppcache/src/CppCacheLibrary.cpp
+++ b/cppcache/src/CppCacheLibrary.cpp
@@ -53,9 +53,7 @@ namespace client {
// if we can... Probably safest to call from DistributedSystem factory method.
// impl type Unit tests may need to call this themselves to ensure the
// internals are prepared. fw_helper framework will handle this.
-void CppCacheLibrary::initLib(void) {
- ACE::init();
-}
+void CppCacheLibrary::initLib(void) { ACE::init(); }
// this closes ace and triggers the cleanup of the singleton CppCacheLibrary.
void CppCacheLibrary::closeLib(void) {
@@ -106,57 +104,61 @@ std::string CppCacheLibrary::getProductLibDir() {
std::string CppCacheLibrary::getProductDir() {
// If the environment variable is set, use it.
- std::string gfcppenv = Utils::getEnv("GFCPP");
- if (gfcppenv.length() > 0) {
- return gfcppenv;
+ std::string geodeNativeEnvironment = Utils::getEnv("GEODE_NATIVE_HOME");
+ if (geodeNativeEnvironment.length() > 0) {
+ return geodeNativeEnvironment;
}
// otherwise... get the DLL path, and work backwards from it.
- std::string libdirname = getProductLibDir();
- if (libdirname.size() == 0) {
+ std::string productLibraryDirectoryName = getProductLibDir();
+ if (productLibraryDirectoryName.size() == 0) {
fprintf(stderr,
"Cannot determine location of product directory.\n"
- "Please set GFCPP environment variable.\n");
+ "Please set GEODE_NATIVE_HOME environment variable.\n");
fflush(stderr);
throw apache::geode::client::IllegalStateException(
"Product installation directory "
- "not found. Please set GFCPP environment variable.");
+ "not found. Please set GEODE_NATIVE_HOME environment variable.");
}
// replace all '\' with '/' to make everything easier..
- size_t len = libdirname.length() + 1;
+ size_t len = productLibraryDirectoryName.length() + 1;
char* slashtmp = new char[len];
- ACE_OS::strncpy(slashtmp, libdirname.c_str(), len);
- for (size_t i = 0; i < libdirname.length(); i++) {
+ ACE_OS::strncpy(slashtmp, productLibraryDirectoryName.c_str(), len);
+ for (size_t i = 0; i < productLibraryDirectoryName.length(); i++) {
if (slashtmp[i] == '\\') {
slashtmp[i] = '/';
}
}
- libdirname = slashtmp;
+ productLibraryDirectoryName = slashtmp;
delete[] slashtmp;
slashtmp = nullptr;
// check if it is "hidden/lib/debug" and work back from build area.
- size_t hiddenidx = libdirname.find("hidden");
+ size_t hiddenidx = productLibraryDirectoryName.find("hidden");
if (hiddenidx != std::string::npos) {
// make sure hidden was a whole word...
hiddenidx--;
- if (libdirname[hiddenidx] == '/' || libdirname[hiddenidx] == '\\') {
+ if (productLibraryDirectoryName[hiddenidx] == '/' ||
+ productLibraryDirectoryName[hiddenidx] == '\\') {
// odds are high hiddenidx terminates osbuild.dir.
- std::string hiddenroute = libdirname.substr(0, hiddenidx) + "/product";
+ std::string hiddenroute =
+ productLibraryDirectoryName.substr(0, hiddenidx) + "/product";
return hiddenroute;
}
}
// check if bin on windows, and go back one...
- GF_D_ASSERT(libdirname.length() > 4);
+ GF_D_ASSERT(productLibraryDirectoryName.length() > 4);
#ifdef WIN32
std::string libpart = "bin";
#else
std::string libpart = "lib";
#endif
- if (libdirname.substr(libdirname.length() - 3) == libpart) {
- return libdirname.substr(0, libdirname.length() - 4);
+ if (productLibraryDirectoryName.substr(productLibraryDirectoryName.length() -
+ 3) == libpart) {
+ return productLibraryDirectoryName.substr(
+ 0, productLibraryDirectoryName.length() - 4);
} else {
- return libdirname;
+ return productLibraryDirectoryName;
}
}
diff --git a/cppcache/src/DistributedSystem.cpp b/cppcache/src/DistributedSystem.cpp
index b3c385b..8fd41b8 100644
--- a/cppcache/src/DistributedSystem.cpp
+++ b/cppcache/src/DistributedSystem.cpp
@@ -56,7 +56,7 @@ DistributedSystem DistributedSystem::create(
// Trigger other library initialization.
CppCacheLibrary::initLib();
- auto sysProps =
+ auto systemProperties =
std::unique_ptr<SystemProperties>(new SystemProperties(configPtr));
auto name = _name;
@@ -65,25 +65,26 @@ DistributedSystem DistributedSystem::create(
}
// Set client name via native client API
- auto&& propName = sysProps->name();
+ auto&& propName = systemProperties->name();
if (!propName.empty()) {
name = propName;
}
// TODO global - keep global but setup once.
- auto&& logFilename = sysProps->logFilename();
+ auto&& logFilename = systemProperties->logFilename();
if (!logFilename.empty()) {
try {
Log::close();
- Log::init(sysProps->logLevel(), logFilename.c_str(),
- sysProps->logFileSizeLimit(), sysProps->logDiskSpaceLimit());
+ Log::init(systemProperties->logLevel(), logFilename.c_str(),
+ systemProperties->logFileSizeLimit(),
+ systemProperties->logDiskSpaceLimit());
} catch (const GeodeIOException&) {
Log::close();
- sysProps = nullptr;
+ systemProperties = nullptr;
throw;
}
} else {
- Log::setLogLevel(sysProps->logLevel());
+ Log::setLogLevel(systemProperties->logLevel());
}
try {
@@ -91,11 +92,11 @@ DistributedSystem DistributedSystem::create(
} catch (const Exception&) {
LOGERROR(
"Unable to determine Product Directory. Please set the "
- "GFCPP environment variable.");
+ "GEODE_NATIVE_HOME environment variable.");
throw;
}
- auto distributedSystem = DistributedSystem(name, std::move(sysProps));
+ auto distributedSystem = DistributedSystem(name, std::move(systemProperties));
LOGCONFIG("Starting the Geode Native Client");
return distributedSystem;
diff --git a/cppcache/src/SystemProperties.cpp b/cppcache/src/SystemProperties.cpp
index 781b0fc..24b9a6e 100644
--- a/cppcache/src/SystemProperties.cpp
+++ b/cppcache/src/SystemProperties.cpp
@@ -75,8 +75,7 @@ const char SslEnabled[] = "ssl-enabled";
const char TimeStatisticsEnabled[] = "enable-time-statistics";
const char SslKeyStore[] = "ssl-keystore";
const char SslTrustStore[] = "ssl-truststore";
-const char SslKeystorePassword[] =
- "ssl-keystore-password"; // adongre: Added for Ticket #758
+const char SslKeystorePassword[] = "ssl-keystore-password";
const char ThreadPoolSize[] = "max-fe-threads";
const char SuspendedTxTimeout[] = "suspended-tx-timeout";
const char DisableChunkHandlerThread[] = "disable-chunk-handler-thread";
@@ -110,7 +109,7 @@ const bool DefaultTimeStatisticsEnabled = false; // or true;
const char DefaultSslKeyStore[] = "";
const char DefaultSslTrustStore[] = "";
-const char DefaultSslKeystorePassword[] = ""; // adongre: Added for Ticket #758
+const char DefaultSslKeystorePassword[] = "";
const char DefaultName[] = "";
const char DefaultCacheXMLFile[] = "";
const uint32_t DefaultLogFileSizeLimit = 0; // = unlimited
@@ -118,7 +117,7 @@ const uint32_t DefaultLogDiskSpaceLimit = 0; // = unlimited
const uint32_t DefaultStatsFileSizeLimit = 0; // = unlimited
const uint32_t DefaultStatsDiskSpaceLimit = 0; // = unlimited
-const size_t DefaultHeapLRULimit = 0; // = unlimited, disabled when it is 0
+const size_t DefaultHeapLRULimit = 0; // = unlimited, disabled when it is 0
const int32_t DefaultHeapLRUDelta = 10; // = unlimited, disabled when it is 0
const int32_t DefaultMaxSocketBufferSize = 65 * 1024;
@@ -213,13 +212,13 @@ SystemProperties::SystemProperties(
auto givenConfigPtr = Properties::create();
// Load the file from product tree.
try {
- std::string defsysprops =
+ std::string defaultSystemProperties =
CppCacheLibrary::getProductDir() + "/defaultSystem/geode.properties";
- givenConfigPtr->load(defsysprops.c_str());
+ givenConfigPtr->load(defaultSystemProperties);
} catch (Exception&) {
LOGERROR(
"Unable to determine Product Directory. Please set the "
- "GFCPP environment variable.");
+ "GEODE_NATIVE_HOME environment variable.");
throw;
}
@@ -328,8 +327,7 @@ void SystemProperties::processProperty(const std::string& property,
m_logLevel = Log::charsToLevel(value);
} catch (IllegalArgumentException&) {
throwError(
- ("SystemProperties: unknown log level " + property + "=" + value)
- .c_str());
+ ("SystemProperties: unknown log level " + property + "=" + value));
}
} else if (property == ConnectionPoolSize) {
m_connectionPoolSize = std::stol(value);
@@ -499,7 +497,7 @@ void SystemProperties::logSettings() {
// *** PLEASE ADD IN ALPHABETICAL ORDER - USER VISIBLE ***
- LOGCONFIG(settings.c_str());
+ LOGCONFIG(settings);
}
} // namespace client
diff --git a/cppcache/src/geodeBanner.hpp b/cppcache/src/geodeBanner.hpp
index 1c2b0ec..b09af65 100644
--- a/cppcache/src/geodeBanner.hpp
+++ b/cppcache/src/geodeBanner.hpp
@@ -1,7 +1,7 @@
#pragma once
-#ifndef GEODE_GFCPPBANNER_H_
-#define GEODE_GFCPPBANNER_H_
+#ifndef GEODE_BANNER_H_
+#define GEODE_BANNER_H_
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,6 +21,7 @@
*/
#include <string>
+
namespace apache {
namespace geode {
namespace client {
@@ -32,4 +33,4 @@ class geodeBanner {
} // namespace geode
} // namespace apache
-#endif // GEODE_GFCPPBANNER_H_
+#endif // GEODE_BANNER_H_
diff --git a/examples/cmake/FindGeodeNative.cmake.in b/examples/cmake/FindGeodeNative.cmake.in
index 33b947d..d2964de 100644
--- a/examples/cmake/FindGeodeNative.cmake.in
+++ b/examples/cmake/FindGeodeNative.cmake.in
@@ -45,8 +45,8 @@ if(@PRODUCT_NAME_NOSPACE@_ROOT AND IS_DIRECTORY "${@PRODUCT_NAME_NOSPACE@_ROOT}"
set(_@PRODUCT_NAME_NOSPACE@_ROOT_EXPLICIT 1)
else()
set(_ENV_@PRODUCT_NAME_NOSPACE@_ROOT "")
- if(DEFINED ENV{GFCPP})
- file(TO_CMAKE_PATH "$ENV{GFCPP}" _ENV_@PRODUCT_NAME_NOSPACE@_ROOT)
+ if(DEFINED ENV{GEODE_NATIVE_HOME})
+ file(TO_CMAKE_PATH "$ENV{GEODE_NATIVE_HOME}" _ENV_@PRODUCT_NAME_NOSPACE@_ROOT)
endif()
if(_ENV_@PRODUCT_NAME_NOSPACE@_ROOT AND IS_DIRECTORY "${_ENV_@PRODUCT_NAME_NOSPACE@_ROOT}")
set(_@PRODUCT_NAME_NOSPACE@_ROOT "${_ENV_@PRODUCT_NAME_NOSPACE@_ROOT}")
diff --git a/templates/security/CMakeLists.txt.forInstall b/templates/security/CMakeLists.txt.forInstall
index 16181d3..166524e 100644
--- a/templates/security/CMakeLists.txt.forInstall
+++ b/templates/security/CMakeLists.txt.forInstall
@@ -33,19 +33,19 @@ target_include_directories(securityImpl
include_directories(${NATIVECLIENT_INCLUDE_DIR})
if (${WIN32})
- set(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/apache-geode${CMAKE_IMPORT_LIBRARY_SUFFIX}")
+ set(GEODE_NATIVE_CACHE "${NATIVECLIENT_LIBRARIES}/apache-geode${CMAKE_IMPORT_LIBRARY_SUFFIX}")
else ()
- get_filename_component(GFCPPCACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}apache-geode${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
+ get_filename_component(GEODE_NATIVE_CACHE "${NATIVECLIENT_LIBRARIES}/${CMAKE_SHARED_LIBRARY_PREFIX}apache-geode${CMAKE_SHARED_LIBRARY_SUFFIX}" ABSOLUTE)
endif()
target_link_libraries(securityImpl
PUBLIC
- ${GFCPPCACHE}
+ ${GEODE_NATIVE_CACHE}
OpenSSL::Crypto
OpenSSL::SSL
)
install(TARGETS securityImpl
- RUNTIME DESTINATION ${GFCPP}/bin
- LIBRARY DESTINATION ${GFCPP}/lib
+ RUNTIME DESTINATION ${GEODE_NATIVE_HOME}/bin
+ LIBRARY DESTINATION ${GEODE_NATIVE_HOME}/lib
)
diff --git a/templates/security/csharp/securityImpl.csproj.in b/templates/security/csharp/securityImpl.csproj.in
index 7fe52c6..94e910d 100644
--- a/templates/security/csharp/securityImpl.csproj.in
+++ b/templates/security/csharp/securityImpl.csproj.in
@@ -52,7 +52,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Apache.Geode.Client">
- <HintPath>${GFCPP}\bin\Apache.Geode.dll</HintPath>
+ <HintPath>${GEODE_NATIVE_HOME}\bin\Apache.Geode.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -75,7 +75,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>copy $(TargetPath) ${GFCPP}\bin\$(TargetFileName)</PostBuildEvent>
+ <PostBuildEvent>copy $(TargetPath) ${GEODE_NATIVE_HOME}\bin\$(TargetFileName)</PostBuildEvent>
</PropertyGroup>
<!-- 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.
diff --git a/tests/cli/DUnitFramework/Util.cs b/tests/cli/DUnitFramework/Util.cs
index 91f78c6..0a067b3 100644
--- a/tests/cli/DUnitFramework/Util.cs
+++ b/tests/cli/DUnitFramework/Util.cs
@@ -38,7 +38,7 @@ namespace Apache.Geode.DUnitFramework
{
/// <summary>
/// Enumeration to specify logging level.
- /// For now this is same as the GFCPP product LogLevel enumeration.
+ /// For now this is same as the GEODE_NATIVE_HOME product LogLevel enumeration.
/// </summary>
public enum LogLevel
{
diff --git a/tests/cli/NewFwkLib/CacheHelper.cs b/tests/cli/NewFwkLib/CacheHelper.cs
index 43a9905..120c0eb 100644
--- a/tests/cli/NewFwkLib/CacheHelper.cs
+++ b/tests/cli/NewFwkLib/CacheHelper.cs
@@ -227,11 +227,11 @@ namespace Apache.Geode.Client.FwkLib
public static void InitConfig(Properties<string,string> config,
string cacheXml, bool PdxReadSerialized)
{
- string gfcppPropsFile = Util.AssemblyDir + "/geode.properties";
- if (File.Exists(gfcppPropsFile))
+ string geodeNativePropsFile = Util.AssemblyDir + "/geode.properties";
+ if (File.Exists(geodeNativePropsFile))
{
Properties<string,string> newConfig = new Properties<string,string>();
- newConfig.Load(gfcppPropsFile);
+ newConfig.Load(geodeNativePropsFile);
if (config != null)
{
newConfig.AddAll(config);
diff --git a/tests/cpp/fwklib/TimeBomb.cpp b/tests/cpp/fwklib/TimeBomb.cpp
index 560bd30..e0aa0c2 100644
--- a/tests/cpp/fwklib/TimeBomb.cpp
+++ b/tests/cpp/fwklib/TimeBomb.cpp
@@ -67,10 +67,11 @@ int32_t TimeBomb::svc() {
int32_t pid = ACE_OS::getpid();
char buf[8192];
- sprintf(buf,
- "bash -c \"perl $GFCPP/../framework/scripts/gdb.pl %d ; cat "
- "gdbout.%d\"",
- pid, pid);
+ sprintf(
+ buf,
+ "bash -c \"perl $GEODE_NATIVE_HOME/../framework/scripts/gdb.pl %d ; cat "
+ "gdbout.%d\"",
+ pid, pid);
FILE* pip = popen(buf, "r");
if (pip == NULL) {
FWKSEVERE("TimeBomb: Unable to dump threads.");
@@ -95,7 +96,8 @@ int32_t TimeBomb::svc() {
int32_t pid = ACE_OS::getpid();
char buf[8192];
- sprintf(buf, "bash -c \"perl $GFCPP/../framework/scripts/cdb.pl %d\"",
+ sprintf(buf,
+ "bash -c \"perl $GEODE_NATIVE_HOME/../framework/scripts/cdb.pl %d\"",
pid);
FILE* pip = _popen(buf, "r");
if (pip == NULL) {
--
To stop receiving notification emails like this one, please contact
echobravo@apache.org.