http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ThinClientPoolDM.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ThinClientPoolDM.cpp b/src/cppcache/src/ThinClientPoolDM.cpp index bc8ea0d..4e54bb6 100644 --- a/src/cppcache/src/ThinClientPoolDM.cpp +++ b/src/cppcache/src/ThinClientPoolDM.cpp @@ -85,7 +85,7 @@ class GetAllWork : public PooledWork<GfErrType>, m_aCallbackArgument); m_reply = new TcrMessageReply(true, m_poolDM); if (m_poolDM->isMultiUserMode()) { - m_userAttribute = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes + m_userAttribute = TSSUserAttributesWrapper::s_geodeTSSUserAttributes ->getUserAttributes(); } @@ -679,7 +679,7 @@ GfErrType ThinClientPoolDM::sendRequestToAllServers( FunctionExecution* fePtrList = new FunctionExecution[csArray->length()]; ThreadPool* threadPool = TPSingleton::instance(); UserAttributesPtr userAttr = - TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->getUserAttributes(); + TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes(); for (int i = 0; i < csArray->length(); i++) { CacheableStringPtr cs = csArray[i]; std::string endpointStr(cs->asChar()); @@ -997,7 +997,7 @@ QueryServicePtr ThinClientPoolDM::getQueryServiceWithoutCheck() { void ThinClientPoolDM::sendUserCacheCloseMessage(bool keepAlive) { LOGDEBUG("ThinClientPoolDM::sendUserCacheCloseMessage"); UserAttributesPtr userAttribute = - TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->getUserAttributes(); + TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes(); std::map<std::string, UserConnectionAttributes*>& uca = userAttribute->getUserConnectionServers(); @@ -1513,7 +1513,7 @@ GfErrType ThinClientPoolDM::sendSyncRequest( request, version, singleHopConnFound, connFound, serverLocation); } else { - userAttr = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes + userAttr = TSSUserAttributesWrapper::s_geodeTSSUserAttributes ->getUserAttributes(); if (userAttr == NULLPTR) { LOGWARN("Attempted operation type %d without credentials", @@ -2148,7 +2148,7 @@ GfErrType ThinClientPoolDM::sendRequestToEP(const TcrMessage& request, error = this->sendUserCredentials(this->getCredentials(currentEndpoint), conn, false, isServerException); } else if (this->m_isMultiUserMode) { - ua = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes + ua = TSSUserAttributesWrapper::s_geodeTSSUserAttributes ->getUserAttributes(); if (ua == NULLPTR) { LOGWARN("Attempted operation type %d without credentials",
http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ThinClientPoolDM.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ThinClientPoolDM.hpp b/src/cppcache/src/ThinClientPoolDM.hpp index 655e37a..fdb53f3 100644 --- a/src/cppcache/src/ThinClientPoolDM.hpp +++ b/src/cppcache/src/ThinClientPoolDM.hpp @@ -252,7 +252,7 @@ class ThinClientPoolDM if (request.forTransaction()) { bool connFound = m_manager->getStickyConnection(conn, error, excludeServers, true); - TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState(); + TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState(); if (*error == GF_NOERR && !connFound && (txState == NULL || txState->isDirty())) { *error = doFailover(conn); @@ -482,7 +482,7 @@ class FunctionExecution : public PooledWork<GfErrType> { } GfErrType execute(void) { - // TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->setUserAttributes(m_userAttr); + // TSSUserAttributesWrapper::s_geodeTSSUserAttributes->setUserAttributes(m_userAttr); GuardUserAttribures gua; if (m_userAttr != NULLPTR) gua.setProxyCache(m_userAttr->getProxyCache()); http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ThinClientPoolStickyDM.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ThinClientPoolStickyDM.cpp b/src/cppcache/src/ThinClientPoolStickyDM.cpp index 11f4054..270e61d 100644 --- a/src/cppcache/src/ThinClientPoolStickyDM.cpp +++ b/src/cppcache/src/ThinClientPoolStickyDM.cpp @@ -93,7 +93,7 @@ TcrConnection* ThinClientPoolStickyDM::getConnectionFromQueueW( request.forTransaction()); if (request.forTransaction()) { - TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState(); + TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState(); if (*error == GF_NOERR && !cf && (txState == NULL || txState->isDirty())) { *error = doFailover(conn); } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ThinClientRedundancyManager.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ThinClientRedundancyManager.cpp b/src/cppcache/src/ThinClientRedundancyManager.cpp index a8a09a0..832c0fe 100644 --- a/src/cppcache/src/ThinClientRedundancyManager.cpp +++ b/src/cppcache/src/ThinClientRedundancyManager.cpp @@ -874,7 +874,7 @@ GfErrType ThinClientRedundancyManager::sendSyncRequestCq( while (attempts--) { if (err != GF_NOERR || m_redundantEndpoints.empty()) { UserAttributesPtr userAttr = - TSSUserAttributesWrapper::s_gemfireTSSUserAttributes + TSSUserAttributesWrapper::s_geodeTSSUserAttributes ->getUserAttributes(); if (userAttr != NULLPTR) proxyCache = userAttr->getProxyCache(); err = maintainRedundancyLevel(); http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ThinClientRegion.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ThinClientRegion.cpp b/src/cppcache/src/ThinClientRegion.cpp index 957c651..aa26bb6 100644 --- a/src/cppcache/src/ThinClientRegion.cpp +++ b/src/cppcache/src/ThinClientRegion.cpp @@ -99,7 +99,7 @@ class PutAllWork : public PooledWork<GfErrType>, new VersionedCacheableObjectPartList(keys.ptr(), responseLock); if (m_poolDM->isMultiUserMode()) { - m_userAttribute = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes + m_userAttribute = TSSUserAttributesWrapper::s_geodeTSSUserAttributes ->getUserAttributes(); } @@ -237,7 +237,7 @@ class RemoveAllWork : public PooledWork<GfErrType>, new VersionedCacheableObjectPartList(keys.ptr(), responseLock); if (m_poolDM->isMultiUserMode()) { - m_userAttribute = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes + m_userAttribute = TSSUserAttributesWrapper::s_geodeTSSUserAttributes ->getUserAttributes(); } @@ -1780,7 +1780,7 @@ GfErrType ThinClientRegion::putAllNoThrow_remote( LOGDEBUG("ThinClientRegion::putAllNoThrow_remote"); ThinClientPoolDM* poolDM = dynamic_cast<ThinClientPoolDM*>(m_tcrdm); - TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState(); + TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState(); if (poolDM != NULL) { if (poolDM->getPRSingleHopEnabled() && @@ -2121,7 +2121,7 @@ GfErrType ThinClientRegion::removeAllNoThrow_remote( LOGDEBUG("ThinClientRegion::removeAllNoThrow_remote"); ThinClientPoolDM* poolDM = dynamic_cast<ThinClientPoolDM*>(m_tcrdm); - TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState(); + TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState(); if (poolDM != NULL) { if (poolDM->getPRSingleHopEnabled() && @@ -3352,7 +3352,7 @@ bool ThinClientRegion::executeFunctionSH( bool reExecute = false; ACE_Recursive_Thread_Mutex resultCollectorLock; UserAttributesPtr userAttr = - TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->getUserAttributes(); + TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes(); std::vector<OnRegionFunctionExecution*> feWorkers; ThreadPool* threadPool = TPSingleton::instance(); http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ThinClientStickyManager.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/ThinClientStickyManager.cpp b/src/cppcache/src/ThinClientStickyManager.cpp index 218b6c9..5d5a228 100644 --- a/src/cppcache/src/ThinClientStickyManager.cpp +++ b/src/cppcache/src/ThinClientStickyManager.cpp @@ -23,7 +23,7 @@ bool ThinClientStickyManager::getStickyConnection( bool maxConnLimit = false; bool connFound = false; // ACE_Guard<ACE_Recursive_Thread_Mutex> guard( m_stickyLock ); - conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection(); + conn = TssConnectionWrapper::s_geodeTSSConn->getConnection(); if (!conn) { conn = @@ -50,34 +50,34 @@ bool ThinClientStickyManager::getStickyConnection( void ThinClientStickyManager::getSingleHopStickyConnection( TcrEndpoint* theEP, TcrConnection*& conn) { - conn = TssConnectionWrapper::s_gemfireTSSConn->getSHConnection( - theEP, m_dm->getName()); + conn = TssConnectionWrapper::s_geodeTSSConn->getSHConnection(theEP, + m_dm->getName()); } void ThinClientStickyManager::addStickyConnection(TcrConnection* conn) { ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_stickyLock); TcrConnection* oldConn = - TssConnectionWrapper::s_gemfireTSSConn->getConnection(); + TssConnectionWrapper::s_geodeTSSConn->getConnection(); if (oldConn) { std::set<TcrConnection**>::iterator it = m_stickyConnList.find( - TssConnectionWrapper::s_gemfireTSSConn->getConnDoublePtr()); + TssConnectionWrapper::s_geodeTSSConn->getConnDoublePtr()); if (it != m_stickyConnList.end()) { oldConn->setAndGetBeingUsed(false, false); m_stickyConnList.erase(it); PoolPtr p = NULLPTR; - TssConnectionWrapper::s_gemfireTSSConn->setConnection(NULL, p); + TssConnectionWrapper::s_geodeTSSConn->setConnection(NULL, p); m_dm->put(oldConn, false); } } if (conn) { PoolPtr p(m_dm); - TssConnectionWrapper::s_gemfireTSSConn->setConnection(conn, p); + TssConnectionWrapper::s_geodeTSSConn->setConnection(conn, p); conn->setAndGetBeingUsed(true, true); // this is done for transaction // thread when some one resume // transaction m_stickyConnList.insert( - TssConnectionWrapper::s_gemfireTSSConn->getConnDoublePtr()); + TssConnectionWrapper::s_geodeTSSConn->getConnDoublePtr()); } } @@ -87,20 +87,20 @@ void ThinClientStickyManager::setStickyConnection(TcrConnection* conn, if (!conn) { ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_stickyLock); PoolPtr p = NULLPTR; - TssConnectionWrapper::s_gemfireTSSConn->setConnection(NULL, p); + TssConnectionWrapper::s_geodeTSSConn->setConnection(NULL, p); } else { TcrConnection* currentConn = - TssConnectionWrapper::s_gemfireTSSConn->getConnection(); + TssConnectionWrapper::s_geodeTSSConn->getConnection(); if (currentConn != conn) // otherwsie no need to set it again { ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_stickyLock); PoolPtr p(m_dm); - TssConnectionWrapper::s_gemfireTSSConn->setConnection(conn, p); + TssConnectionWrapper::s_geodeTSSConn->setConnection(conn, p); conn->setAndGetBeingUsed( false, forTransaction); // if transaction then it will keep this as used m_stickyConnList.insert( - TssConnectionWrapper::s_gemfireTSSConn->getConnDoublePtr()); + TssConnectionWrapper::s_geodeTSSConn->getConnDoublePtr()); } else { currentConn->setAndGetBeingUsed( false, @@ -111,7 +111,7 @@ void ThinClientStickyManager::setStickyConnection(TcrConnection* conn, void ThinClientStickyManager::setSingleHopStickyConnection( TcrEndpoint* ep, TcrConnection*& conn) { - TssConnectionWrapper::s_gemfireTSSConn->setSHConnection(ep, conn); + TssConnectionWrapper::s_geodeTSSConn->setSHConnection(ep, conn); } void ThinClientStickyManager::cleanStaleStickyConnection() { @@ -188,11 +188,11 @@ bool ThinClientStickyManager::canThisConnBeDeleted(TcrConnection* conn) { return canBeDeleted; } void ThinClientStickyManager::releaseThreadLocalConnection() { - TcrConnection* conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection(); + TcrConnection* conn = TssConnectionWrapper::s_geodeTSSConn->getConnection(); if (conn) { ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_stickyLock); std::set<TcrConnection**>::iterator it = m_stickyConnList.find( - TssConnectionWrapper::s_gemfireTSSConn->getConnDoublePtr()); + TssConnectionWrapper::s_geodeTSSConn->getConnDoublePtr()); LOGDEBUG("ThinClientStickyManager::releaseThreadLocalConnection()"); if (it != m_stickyConnList.end()) { m_stickyConnList.erase(it); @@ -201,10 +201,10 @@ void ThinClientStickyManager::releaseThreadLocalConnection() { m_dm->put(conn, false); } PoolPtr p(m_dm); - TssConnectionWrapper::s_gemfireTSSConn->setConnection(NULL, p); + TssConnectionWrapper::s_geodeTSSConn->setConnection(NULL, p); } PoolPtr p(m_dm); - TssConnectionWrapper::s_gemfireTSSConn->releaseSHConnections(p); + TssConnectionWrapper::s_geodeTSSConn->releaseSHConnections(p); } bool ThinClientStickyManager::isNULL(TcrConnection** conn) { if (*conn == NULL) return true; @@ -213,5 +213,5 @@ bool ThinClientStickyManager::isNULL(TcrConnection** conn) { void ThinClientStickyManager::getAnyConnection(TcrConnection*& conn) { conn = - TssConnectionWrapper::s_gemfireTSSConn->getAnyConnection(m_dm->getName()); + TssConnectionWrapper::s_geodeTSSConn->getAnyConnection(m_dm->getName()); } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TransactionSuspender.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/TransactionSuspender.cpp b/src/cppcache/src/TransactionSuspender.cpp index 2936b2c..60d200a 100644 --- a/src/cppcache/src/TransactionSuspender.cpp +++ b/src/cppcache/src/TransactionSuspender.cpp @@ -29,13 +29,13 @@ namespace geode { namespace client { TransactionSuspender::TransactionSuspender() { - TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_gemfireTSSTXState; + TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_geodeTSSTXState; m_TXState = txStateWrapper->getTXState(); txStateWrapper->setTXState(NULL); } TransactionSuspender::~TransactionSuspender() { - TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(m_TXState); + TSSTXStateWrapper::s_geodeTSSTXState->setTXState(m_TXState); } } // namespace client } // namespace geode http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TssConnectionWrapper.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/TssConnectionWrapper.cpp b/src/cppcache/src/TssConnectionWrapper.cpp index bee1b41..adb6e42 100644 --- a/src/cppcache/src/TssConnectionWrapper.cpp +++ b/src/cppcache/src/TssConnectionWrapper.cpp @@ -18,7 +18,7 @@ #include "TcrConnection.hpp" #include "ThinClientPoolDM.hpp" using namespace apache::geode::client; -ACE_TSS<TssConnectionWrapper> TssConnectionWrapper::s_gemfireTSSConn; +ACE_TSS<TssConnectionWrapper> TssConnectionWrapper::s_geodeTSSConn; TssConnectionWrapper::TssConnectionWrapper() { PoolPtr p = NULLPTR; m_pool = p; http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TssConnectionWrapper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/TssConnectionWrapper.hpp b/src/cppcache/src/TssConnectionWrapper.hpp index 3919cb6..3348c59 100644 --- a/src/cppcache/src/TssConnectionWrapper.hpp +++ b/src/cppcache/src/TssConnectionWrapper.hpp @@ -58,7 +58,7 @@ class TssConnectionWrapper { TssConnectionWrapper(const TssConnectionWrapper&); public: - static ACE_TSS<TssConnectionWrapper> s_gemfireTSSConn; + static ACE_TSS<TssConnectionWrapper> s_geodeTSSConn; TcrConnection* getConnection() { return m_tcrConn; } TcrConnection* getSHConnection(TcrEndpoint* ep, const char* poolname); void setConnection(TcrConnection* conn, PoolPtr& pool) { http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/UserAttributes.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/UserAttributes.cpp b/src/cppcache/src/UserAttributes.cpp index 0efed28..ae3b8af 100644 --- a/src/cppcache/src/UserAttributes.cpp +++ b/src/cppcache/src/UserAttributes.cpp @@ -128,7 +128,7 @@ PropertiesPtr UserAttributes::getCredentials() { ProxyCachePtr UserAttributes::getProxyCache() { return m_proxyCache; } ACE_TSS<TSSUserAttributesWrapper> - TSSUserAttributesWrapper::s_gemfireTSSUserAttributes; + TSSUserAttributesWrapper::s_geodeTSSUserAttributes; GuardUserAttribures::GuardUserAttribures(ProxyCachePtr proxyCache) { setProxyCache(proxyCache); @@ -138,7 +138,7 @@ void GuardUserAttribures::setProxyCache(ProxyCachePtr proxyCache) { m_proxyCache = proxyCache; LOGDEBUG("GuardUserAttribures::GuardUserAttribures:"); if (m_proxyCache != NULLPTR && !proxyCache->isClosed()) { - TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->setUserAttributes( + TSSUserAttributesWrapper::s_geodeTSSUserAttributes->setUserAttributes( proxyCache->m_userAttributes); } else { throw CacheClosedException("User Cache has been closed"); @@ -149,7 +149,7 @@ GuardUserAttribures::GuardUserAttribures() { m_proxyCache = NULLPTR; } GuardUserAttribures::~GuardUserAttribures() { if (m_proxyCache != NULLPTR) { - TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->setUserAttributes( + TSSUserAttributesWrapper::s_geodeTSSUserAttributes->setUserAttributes( NULLPTR); } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/UserAttributes.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/UserAttributes.hpp b/src/cppcache/src/UserAttributes.hpp index 5453e11..ad90722 100644 --- a/src/cppcache/src/UserAttributes.hpp +++ b/src/cppcache/src/UserAttributes.hpp @@ -129,7 +129,7 @@ class TSSUserAttributesWrapper { TSSUserAttributesWrapper(const TSSUserAttributesWrapper&); public: - static ACE_TSS<TSSUserAttributesWrapper> s_gemfireTSSUserAttributes; + static ACE_TSS<TSSUserAttributesWrapper> s_geodeTSSUserAttributes; UserAttributesPtr getUserAttributes() { return m_userAttribute; } void setUserAttributes(UserAttributesPtr userAttr) { m_userAttribute = userAttr; http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/Version.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/Version.cpp b/src/cppcache/src/Version.cpp index 2141cd3..3ba1ebd 100644 --- a/src/cppcache/src/Version.cpp +++ b/src/cppcache/src/Version.cpp @@ -21,8 +21,7 @@ namespace apache { namespace geode { namespace client { -int8_t Version::m_ordinal = 45; // Geode 1.0.0 - +int8_t Version::m_ordinal = 45; // Geode 1.0.0 } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp index ffcba0a..df972a1 100644 --- a/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp +++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp @@ -89,8 +89,7 @@ GeodeStatisticsFactory::~GeodeStatisticsFactory() { statsTypeMap.unbind_all(); } catch (const Exception& ex) { - Log::warningCatch("~GeodeStatisticsFactory swallowing GemFire exception", - ex); + Log::warningCatch("~GeodeStatisticsFactory swallowing Geode exception", ex); } catch (const std::exception& ex) { std::string what = "~GeodeStatisticsFactory swallowing std::exception: "; http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp index 5d6a265..9a75543 100644 --- a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp +++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp @@ -46,7 +46,7 @@ namespace statistics { class StatisticsManager; /** - * Gemfire's implementation of {@link StatisticsFactory}. + * Geode's implementation of {@link StatisticsFactory}. * */ class GeodeStatisticsFactory : public StatisticsFactory { http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/HostStatHelperSolaris.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/HostStatHelperSolaris.cpp b/src/cppcache/src/statistics/HostStatHelperSolaris.cpp index 7b0ee5c..f4f3f3f 100644 --- a/src/cppcache/src/statistics/HostStatHelperSolaris.cpp +++ b/src/cppcache/src/statistics/HostStatHelperSolaris.cpp @@ -70,7 +70,7 @@ void HostStatHelperSolaris::refreshProcess(ProcessStats* processStats) { ACE_OS::snprintf(procFileName, 64, "/proc/%lu/psinfo", (uint32)thePid); // fread was returning errno 2 FILENOTFOUND so it was switched to read - // This matches what was done in the Gemfire Project also + // This matches what was done in the Geode Project also fPtr = open(procFileName, O_RDONLY, 0); /* read only */ if (fPtr != -1) { if (read(fPtr, ¤tInfo, sizeof(currentInfo)) != sizeof(currentInfo)) { http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/HostStatSampler.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/HostStatSampler.cpp b/src/cppcache/src/statistics/HostStatSampler.cpp index e7defcd..765f8df 100644 --- a/src/cppcache/src/statistics/HostStatSampler.cpp +++ b/src/cppcache/src/statistics/HostStatSampler.cpp @@ -347,7 +347,7 @@ std::string HostStatSampler::getSystemDirectoryPath() { } std::string HostStatSampler::getProductDescription() { - return "Pivotal Gemfire Native Client "; + return "Pivotal Geode Native Client "; } void HostStatSampler::changeArchive(std::string filename) { http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/LinuxProcessStats.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/LinuxProcessStats.cpp b/src/cppcache/src/statistics/LinuxProcessStats.cpp index 4f418f6..eb2501b 100644 --- a/src/cppcache/src/statistics/LinuxProcessStats.cpp +++ b/src/cppcache/src/statistics/LinuxProcessStats.cpp @@ -24,7 +24,7 @@ using namespace apache::geode::statistics; /** * <P>This class provides the interface for statistics about a - * Linux operating system process that is using a GemFire system. + * Linux operating system process that is using a Geode system. * */ http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/LinuxProcessStats.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/LinuxProcessStats.hpp b/src/cppcache/src/statistics/LinuxProcessStats.hpp index 877cbf5..a3004ff 100644 --- a/src/cppcache/src/statistics/LinuxProcessStats.hpp +++ b/src/cppcache/src/statistics/LinuxProcessStats.hpp @@ -37,7 +37,7 @@ namespace geode { namespace statistics { /** * <P>This class provides the interface for statistics about a - * Linux operating system process that is using a GemFire system. + * Linux operating system process that is using a Geode system. * */ http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/NullProcessStats.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/NullProcessStats.cpp b/src/cppcache/src/statistics/NullProcessStats.cpp index 74b1a1a..3731827 100644 --- a/src/cppcache/src/statistics/NullProcessStats.cpp +++ b/src/cppcache/src/statistics/NullProcessStats.cpp @@ -24,7 +24,7 @@ using namespace apache::geode::statistics; /** * <P>This class provides the interface for statistics about a - * Null operating system process that is using a GemFire system. + * Null operating system process that is using a Geode system. * */ http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/NullProcessStats.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/NullProcessStats.hpp b/src/cppcache/src/statistics/NullProcessStats.hpp index 937261c..1437ace 100644 --- a/src/cppcache/src/statistics/NullProcessStats.hpp +++ b/src/cppcache/src/statistics/NullProcessStats.hpp @@ -37,7 +37,7 @@ namespace geode { namespace statistics { /** * <P>This class provides the interface for statistics about a - * Null operating system process that is using a GemFire system. + * Null operating system process that is using a Geode system. * */ http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/PoolStatsSampler.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/PoolStatsSampler.cpp b/src/cppcache/src/statistics/PoolStatsSampler.cpp index 8cc08ec..55e232f 100644 --- a/src/cppcache/src/statistics/PoolStatsSampler.cpp +++ b/src/cppcache/src/statistics/PoolStatsSampler.cpp @@ -122,7 +122,7 @@ void PoolStatsSampler::putStatsInAdminRegion() { dynCast<SharedPtr<NoAvailableLocatorsException> >(ex.getCause()); LOGDEBUG("No locators available, trying again."); } catch (ClassCastException&) { - LOGDEBUG("Not connected to gemfire, trying again."); + LOGDEBUG("Not connected to geode, trying again."); } } catch (...) { LOGDEBUG("Exception occurred, trying again."); http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/ProcessStats.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/ProcessStats.hpp b/src/cppcache/src/statistics/ProcessStats.hpp index 2af7331..750a948 100644 --- a/src/cppcache/src/statistics/ProcessStats.hpp +++ b/src/cppcache/src/statistics/ProcessStats.hpp @@ -33,7 +33,7 @@ namespace statistics { /** * Abstracts the process statistics that are common on all platforms. - * This is necessary for monitoring the health of GemFire components. + * This is necessary for monitoring the health of Geode components. * */ class CPPCACHE_EXPORT ProcessStats { http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/SolarisProcessStats.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/SolarisProcessStats.cpp b/src/cppcache/src/statistics/SolarisProcessStats.cpp index 3a0320b..1b76253 100644 --- a/src/cppcache/src/statistics/SolarisProcessStats.cpp +++ b/src/cppcache/src/statistics/SolarisProcessStats.cpp @@ -24,7 +24,7 @@ using namespace apache::geode::statistics; /** * <P>This class provides the interface for statistics about a - * Solaris operating system process that is using a GemFire system. + * Solaris operating system process that is using a Geode system. * */ http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/SolarisProcessStats.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/SolarisProcessStats.hpp b/src/cppcache/src/statistics/SolarisProcessStats.hpp index c1a7495..59df2f3 100644 --- a/src/cppcache/src/statistics/SolarisProcessStats.hpp +++ b/src/cppcache/src/statistics/SolarisProcessStats.hpp @@ -36,7 +36,7 @@ namespace geode { namespace statistics { /** * <P>This class provides the interface for statistics about a - * Solaris operating system process that is using a GemFire system. + * Solaris operating system process that is using a Geode system. * */ http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/StatArchiveWriter.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/StatArchiveWriter.cpp b/src/cppcache/src/statistics/StatArchiveWriter.cpp index d600163..fdbd07b 100644 --- a/src/cppcache/src/statistics/StatArchiveWriter.cpp +++ b/src/cppcache/src/statistics/StatArchiveWriter.cpp @@ -73,13 +73,13 @@ void StatDataOutput::flush() { if (len > 0) { if (fwrite(buffBegin, sizeOfUInt8, len, m_fp) != static_cast<size_t>(len)) { LOGERROR("Could not write into the statistics file"); - throw GemfireIOException("Could not write into the statistics file"); + throw GeodeIOException("Could not write into the statistics file"); } } int rVal = fflush(m_fp); if (rVal != 0) { LOGERROR("Could not flush into the statistics file"); - throw GemfireIOException("Could not flush into the statistics file"); + throw GeodeIOException("Could not flush into the statistics file"); } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp b/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp index 78f0a2a..bf01763 100644 --- a/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp +++ b/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp @@ -27,7 +27,7 @@ const char* StatisticDescriptorImpl::DoubleTypeName = "Float"; /** * Describes an individual statistic whose value is updated by an - * application and may be archived by GemFire. These descriptions are + * application and may be archived by Geode. These descriptions are * gathered together in a {@link StatisticsType}. * <P> * To get an instance of this interface use an instance of http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp b/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp index d182168..64ca93b 100644 --- a/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp +++ b/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp @@ -35,7 +35,7 @@ typedef enum { INT_TYPE = 5, LONG_TYPE = 6, DOUBLE_TYPE = 8 } FieldType; /** * Describes an individual statistic whose value is updated by an - * application and may be archived by GemFire. These descriptions are + * application and may be archived by Geode. These descriptions are * gathered together in a {@link StatisticsType}. * * <P> @@ -98,7 +98,7 @@ class StatisticDescriptorImpl : public StatisticDescriptor { int8 statIsCounter, int8 statIsLargerBetter); public: - /** GfFieldType defined in gemfire.h. + /** GfFieldType defined in geode.h. * It describes the date type of an individual descriptor. * Supported date types are INT, LONG, and DOUBLE. */ http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/StatisticsManager.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/StatisticsManager.cpp b/src/cppcache/src/statistics/StatisticsManager.cpp index e42d283..f1b020b 100644 --- a/src/cppcache/src/statistics/StatisticsManager.cpp +++ b/src/cppcache/src/statistics/StatisticsManager.cpp @@ -123,7 +123,7 @@ StatisticsManager::~StatisticsManager() { GeodeStatisticsFactory::clean(); } catch (const Exception& ex) { - Log::warningCatch("~StatisticsManager swallowing GemFire exception", ex); + Log::warningCatch("~StatisticsManager swallowing Geode exception", ex); } catch (const std::exception& ex) { std::string what = "~StatisticsManager swallowing std::exception: "; http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/statistics/WindowsProcessStats.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/WindowsProcessStats.hpp b/src/cppcache/src/statistics/WindowsProcessStats.hpp index 79c4271..ea993da 100644 --- a/src/cppcache/src/statistics/WindowsProcessStats.hpp +++ b/src/cppcache/src/statistics/WindowsProcessStats.hpp @@ -37,7 +37,7 @@ namespace geode { namespace statistics { /** * <P>This class provides the interface for statistics about a - * Windows operating system process that is using a GemFire system. + * Windows operating system process that is using a Geode system. */ class CPPCACHE_EXPORT WindowsProcessStats : public ProcessStats { http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/test/CacheXmlParserTest.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/test/CacheXmlParserTest.cpp b/src/cppcache/test/CacheXmlParserTest.cpp index 59dd705..6b5d9c8 100644 --- a/src/cppcache/test/CacheXmlParserTest.cpp +++ b/src/cppcache/test/CacheXmlParserTest.cpp @@ -100,7 +100,7 @@ std::string valid_cache_config_body = R"(<root-region name = 'Root1' > std::string dtd_prefix = R"(<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE cache PUBLIC - "-//GemStone Systems, Inc.//GemFire Declarative Caching 3.6//EN" + "-//GemStone Systems, Inc.//Geode Declarative Caching 3.6//EN" "http://www.gemstone.com/dtd/gfcpp-cache3600.dtd";> <client-cache>)"; http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cryptoimpl/DHImpl.cpp ---------------------------------------------------------------------- diff --git a/src/cryptoimpl/DHImpl.cpp b/src/cryptoimpl/DHImpl.cpp index 0a36b01..8d6fe24 100644 --- a/src/cryptoimpl/DHImpl.cpp +++ b/src/cryptoimpl/DHImpl.cpp @@ -508,7 +508,7 @@ bool gf_verifyDH(void *dhCtx, const char *subject, X509_get_subject_name(dhimpl->m_serverCerts[item]), NULL, 0); // Ignore first letter for comparision, openssl adds / before subject name - // e.g. /CN=gemfire1 + // e.g. /CN=geode1 if (strcmp((const char *)certsubject + 1, subject) == 0) { evpkey = X509_get_pubkey(dhimpl->m_serverCerts[item]); cert = dhimpl->m_serverCerts[item]; http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/dhimpl/DHImpl.cpp ---------------------------------------------------------------------- diff --git a/src/dhimpl/DHImpl.cpp b/src/dhimpl/DHImpl.cpp index 9ea3609..c86d49f 100644 --- a/src/dhimpl/DHImpl.cpp +++ b/src/dhimpl/DHImpl.cpp @@ -411,7 +411,7 @@ bool gf_verifyDH(const char *subject, const unsigned char *challenge, X509_NAME_oneline(X509_get_subject_name(m_serverCerts[item]), NULL, 0); // Ignore first letter for comparision, openssl adds / before subject name - // e.g. /CN=gemfire1 + // e.g. /CN=geode1 if (strcmp((const char *)certsubject + 1, subject) == 0) { evpkey = X509_get_pubkey(m_serverCerts[item]); cert = m_serverCerts[item]; http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/executables/GacInstall/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/src/executables/GacInstall/AssemblyInfo.cs b/src/executables/GacInstall/AssemblyInfo.cs index 040b4ee..a9e8d9a 100644 --- a/src/executables/GacInstall/AssemblyInfo.cs +++ b/src/executables/GacInstall/AssemblyInfo.cs @@ -22,11 +22,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("GemFireGacInstall")] -[assembly: AssemblyDescription("GemFire utility to install/uninstall to GAC")] +[assembly: AssemblyTitle("GeodeGacInstall")] +[assembly: AssemblyDescription("Geode utility to install/uninstall to GAC")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("GemStone Systems Inc.")] -[assembly: AssemblyProduct("GemFireGacInstall")] +[assembly: AssemblyProduct("GeodeGacInstall")] [assembly: AssemblyCopyright("Copyright © GemStone Systems Inc. 2006")] [assembly: AssemblyTrademark("All Rights Reserved")] [assembly: AssemblyCulture("")] http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/executables/GacInstall/Program.cs ---------------------------------------------------------------------- diff --git a/src/executables/GacInstall/Program.cs b/src/executables/GacInstall/Program.cs index 8825c87..4b1d233 100644 --- a/src/executables/GacInstall/Program.cs +++ b/src/executables/GacInstall/Program.cs @@ -30,7 +30,7 @@ namespace Apache.Geode private const string DOTNETAssemblyFoldersKey = @"SOFTWARE\Microsoft\.NETFramework\AssemblyFolders"; - private const string GemFireProductKey = "Apache.Geode"; + private const string GeodeProductKey = "Apache.Geode"; #endregion @@ -100,7 +100,7 @@ namespace Apache.Geode Registry.LocalMachine.OpenSubKey(DOTNETAssemblyFoldersKey, true); if (dotNETAssemblyFoldersKey != null) { - dotNETAssemblyFoldersKey.DeleteSubKey(GemFireProductKey, false); + dotNETAssemblyFoldersKey.DeleteSubKey(GeodeProductKey, false); } if (doInstall) { @@ -108,7 +108,7 @@ namespace Apache.Geode if (dotNETAssemblyFoldersKey != null) { RegistryKey productKey = - dotNETAssemblyFoldersKey.CreateSubKey(GemFireProductKey); + dotNETAssemblyFoldersKey.CreateSubKey(GeodeProductKey); if (productKey != null) { productKey.SetValue(null, finalDirPath, RegistryValueKind.String); http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/pdxautoserializer/CodeGenerator.hpp ---------------------------------------------------------------------- diff --git a/src/pdxautoserializer/CodeGenerator.hpp b/src/pdxautoserializer/CodeGenerator.hpp index 34fae30..820377d 100644 --- a/src/pdxautoserializer/CodeGenerator.hpp +++ b/src/pdxautoserializer/CodeGenerator.hpp @@ -145,7 +145,7 @@ class CodeGenerator { const std::string& outputVarName) = 0; /** - * Generate the code for typeId function of gemfire + * Generate the code for typeId function of geode * Serializable/DataSerializable interface. */ virtual void genTypeId(const std::string& methodPrefix) = 0; http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/BasicOperations.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/BasicOperations.cs b/src/quickstart/csharp/BasicOperations.cs index 026c016..cc6e884 100644 --- a/src/quickstart/csharp/BasicOperations.cs +++ b/src/quickstart/csharp/BasicOperations.cs @@ -20,7 +20,7 @@ * * This example takes the following steps: * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Create the example Region with generics support programmatically. * 3.a. Put Entries (Key and Value pairs) into the Region. * 3.b. If in 64 bit mode put over 4 GB data to demonstrate capacity. @@ -34,7 +34,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; // To check for available memory. @@ -50,12 +50,12 @@ namespace Apache.Geode.Client.QuickStart { try { - // Create a GemFire Cache. + // Create a Geode Cache. CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); Cache cache = cacheFactory.Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY); @@ -112,15 +112,15 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Destroyed the second Entry in the Region"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("BasicOperations GemFire Exception: {0}", gfex.Message); + Console.WriteLine("BasicOperations Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/CqQuery.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/CqQuery.cs b/src/quickstart/csharp/CqQuery.cs index 27a429d..b4c9b9a 100644 --- a/src/quickstart/csharp/CqQuery.cs +++ b/src/quickstart/csharp/CqQuery.cs @@ -20,7 +20,7 @@ * * This example takes the following steps: * - * 1. Create a GemFire Cache Programmatically. + * 1. Create a Geode Cache Programmatically. * 2. Create the example Region Programmatically. * 3. Populate some query objects on the Region. * 4. Register a cqQuery listener @@ -32,7 +32,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; // Use the "Tests" namespace for the query objects. @@ -72,13 +72,13 @@ namespace Apache.Geode.Client.QuickStart { try { - // Create a GemFire Cache Programmatically. + // Create a Geode Cache Programmatically. CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); Cache cache = cacheFactory.SetSubscriptionEnabled(true) .AddServer("localhost", 50505) .Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY); // Create the example Region programmatically. @@ -173,16 +173,16 @@ namespace Apache.Geode.Client.QuickStart //Close the cq qry.Close(); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("CqQuery GemFire Exception: {0}", gfex.Message); + Console.WriteLine("CqQuery Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/DataExpiration.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/DataExpiration.cs b/src/quickstart/csharp/DataExpiration.cs index b5c6b84..af06b40 100644 --- a/src/quickstart/csharp/DataExpiration.cs +++ b/src/quickstart/csharp/DataExpiration.cs @@ -20,7 +20,7 @@ * * This example takes the following steps: * - * 1. Create a GemFire Cache programmatically. + * 1. Create a Geode Cache programmatically. * 2. Create the example Region with generics support programmatically. * 3. Set the generic SimpleCacheListener plugin on the Region. * 4. Put 3 Entries into the Region. @@ -36,7 +36,7 @@ using System; using System.Threading; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; // Use the .NET generics namespace @@ -51,12 +51,12 @@ namespace Apache.Geode.Client.QuickStart { try { - // Create a GemFire Cache Programmatically. + // Create a Geode Cache Programmatically. CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); Cache cache = cacheFactory.SetSubscriptionEnabled(true) .Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY); // Create the example Region programmatically. @@ -106,16 +106,16 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Got {0} keys after the Entry Idle Timeout duration elapsed", keys.Count); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("DataExpiration GemFire Exception: {0}", gfex.Message); + Console.WriteLine("DataExpiration Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/Delta.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/Delta.cs b/src/quickstart/csharp/Delta.cs index 2403e34..21c4cf6 100644 --- a/src/quickstart/csharp/Delta.cs +++ b/src/quickstart/csharp/Delta.cs @@ -20,7 +20,7 @@ * * This example takes the following steps: * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Get the example Region from the Cache. * 3. Put an Entry into the Region. * 4. Set delta for a value. @@ -35,7 +35,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -47,13 +47,13 @@ namespace Apache.Geode.Client.QuickStart { try { - // Create a GemFire Cache through XMLs/clientDelta.xml + // Create a Geode Cache through XMLs/clientDelta.xml Properties<string, string> prop = Properties<string, string>.Create<string, string>(); prop.Insert("cache-xml-file", "XMLs/clientDelta.xml"); CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(prop); Cache cache = cacheFactory.Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Region from the Cache which is declared in the Cache XML file. IRegion<string, DeltaExample> region = cache.GetRegion<string, DeltaExample>("exampleRegion"); @@ -86,24 +86,24 @@ namespace Apache.Geode.Client.QuickStart //Verification if( retVal.getField1() != 9 ) - throw new GemFireException("First field should have been 9"); + throw new GeodeException("First field should have been 9"); if( retVal.getField2() != 15 ) - throw new GemFireException("Second field should have been 15"); + throw new GeodeException("Second field should have been 15"); if( retVal.getField3() != 20 ) - throw new GemFireException("Third field should have been 20"); + throw new GeodeException("Third field should have been 20"); Console.WriteLine("Delta has been successfully applied at server"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("Delta GemFire Exception: {0}", gfex.Message); + Console.WriteLine("Delta Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/DistributedSystem.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/DistributedSystem.cs b/src/quickstart/csharp/DistributedSystem.cs index a0acaf3..6dd484b 100755 --- a/src/quickstart/csharp/DistributedSystem.cs +++ b/src/quickstart/csharp/DistributedSystem.cs @@ -20,7 +20,7 @@ * This example connects to two distributed systems. * This example takes the following steps: * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Now it creates a Pool with poolName1. * 3. Adds server(localhost:40404) to a pool factory. * 4. Creates a generic region "root1" with the pool then creates a generic subregion "exampleRegion" with the pool. @@ -38,7 +38,7 @@ // Use standard namespaces using System; -// Use the GemFire namespaces +// Use the Geode namespaces //using Apache.Geode.Client; using Apache.Geode.Client; @@ -102,12 +102,12 @@ namespace Apache.Geode.Client.QuickStart { try { - // Create a GemFire Cache. + // Create a Geode Cache. CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); //test on first distributem system TestDistributedSystem(cache, "localhost", 40404, "poolName1", "exampleRegion1"); @@ -115,15 +115,15 @@ namespace Apache.Geode.Client.QuickStart //test on second distributed system TestDistributedSystem(cache, "localhost", 40405, "poolName2", "exampleRegion2"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("DistributedSystem GemFire Exception: {0}", gfex.Message); + Console.WriteLine("DistributedSystem Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/DurableClient.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/DurableClient.cs b/src/quickstart/csharp/DurableClient.cs index b6a55fe..e61fd47 100644 --- a/src/quickstart/csharp/DurableClient.cs +++ b/src/quickstart/csharp/DurableClient.cs @@ -20,7 +20,7 @@ * * This example takes the following steps: * - * 1. Create a GemFire Cache with durable client properties Programmatically. + * 1. Create a Geode Cache with durable client properties Programmatically. * 2. Create the example generic Region programmatically. * 3. Set DurableCacheListener with "AfterRegionLive" implementation to region. * 4. Register Interest to region with durable option. @@ -32,7 +32,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -47,13 +47,13 @@ namespace Apache.Geode.Client.QuickStart durableProp.Insert("durable-client-id", "DurableClientId"); durableProp.Insert("durable-timeout", "300"); - // Create a Gemfire Cache programmatically. + // Create a Geode Cache programmatically. CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(durableProp); Cache cache = cacheFactory.SetSubscriptionEnabled(true) .Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Create the example Region programmatically. RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY); @@ -86,21 +86,21 @@ namespace Apache.Geode.Client.QuickStart //wait for some time to recieve events System.Threading.Thread.Sleep(1000); - // Close the GemFire Cache with keepalive = true. Server will queue events for + // Close the Geode Cache with keepalive = true. Server will queue events for // durable registered keys and will deliver all events when client will reconnect // within timeout period and send "readyForEvents()" cache.Close(true); - Console.WriteLine("Closed the GemFire Cache with keepalive as true"); + Console.WriteLine("Closed the Geode Cache with keepalive as true"); } public void RunFeeder() { - // Create a GemFire Cache Programmatically. + // Create a Geode Cache Programmatically. CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY); @@ -119,10 +119,10 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Created Key-1 and Key-2 in region. Durable interest was registered only for Key-1."); - // Close the GemFire Cache + // Close the Geode Cache cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } static void Main(string[] args) @@ -142,9 +142,9 @@ namespace Apache.Geode.Client.QuickStart } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("DurableClient GemFire Exception: {0}", gfex.Message); + Console.WriteLine("DurableClient Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/Exceptions.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/Exceptions.cs b/src/quickstart/csharp/Exceptions.cs index 5169bca..8d5bed0 100644 --- a/src/quickstart/csharp/Exceptions.cs +++ b/src/quickstart/csharp/Exceptions.cs @@ -21,7 +21,7 @@ * This example takes the following steps: * * 1. Create CacheFactory using the user specified settings or from the gfcpp.properties file by default. - * 2. Create a GemFire Cache. + * 2. Create a Geode Cache. * 3. Get the example generic Regions from the Cache. * 4. Perform some operations which should cause exceptions. * 5. Close the Cache. @@ -32,7 +32,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -52,10 +52,10 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Created CacheFactory"); - // Create a GemFire Cache with the "clientExceptions.xml" Cache XML file. + // Create a Geode Cache with the "clientExceptions.xml" Cache XML file. Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Regions from the Cache which are declared in the Cache XML file. IRegion<object, string> region = cache.GetRegion<object, string>("exampleRegion"); @@ -114,10 +114,10 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Expected IllegalStateException: {0}", gfex.Message); } - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); try { @@ -132,9 +132,9 @@ namespace Apache.Geode.Client.QuickStart } } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("Exceptions GemFire Exception: {0}", gfex.Message); + Console.WriteLine("Exceptions Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/ExecuteFunctions.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/ExecuteFunctions.cs b/src/quickstart/csharp/ExecuteFunctions.cs index 3f898e8..33a06ec 100644 --- a/src/quickstart/csharp/ExecuteFunctions.cs +++ b/src/quickstart/csharp/ExecuteFunctions.cs @@ -20,7 +20,7 @@ * * This example takes the following steps: * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Get the example Region from the Cache. * 3. Populate some query objects on the Region. * 4. Create Execute Objects @@ -32,7 +32,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; using System.Collections.Generic; using System.Collections; @@ -54,7 +54,7 @@ namespace Apache.Geode.Client.QuickStart Cache cache = cacheFactory.SetSubscriptionEnabled(true).AddServer("localhost", 50505).AddServer("localhost", 40404).Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); IRegion<string, string> region = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY).Create<string, string>("partition_region"); Console.WriteLine("Created the Region"); @@ -150,15 +150,15 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("on all servers:result[{0}]={1}.", i, (string)resultList2[i]); } - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("ExecuteFunctions GemFire Exception: {0}", gfex.Message); + Console.WriteLine("ExecuteFunctions Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/HACache.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/HACache.cs b/src/quickstart/csharp/HACache.cs index d667657..62d57a8 100644 --- a/src/quickstart/csharp/HACache.cs +++ b/src/quickstart/csharp/HACache.cs @@ -20,8 +20,8 @@ * * This example takes the following steps: * - * 1. Connect to a GemFire Distributed System which has two cache servers. - * 2. Create a GemFire Cache with redundancy level = 1. + * 1. Connect to a Geode Distributed System which has two cache servers. + * 2. Create a Geode Cache with redundancy level = 1. * 3. Get the example generic Region from the Cache. * 4. Call registerKeys() on the Region. * 5. Call registerRegex() on the Region. @@ -35,7 +35,7 @@ using System; using System.Threading; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -47,7 +47,7 @@ namespace Apache.Geode.Client.QuickStart { try { - // Create a GemFire Cache. + // Create a Geode Cache. Apache.Geode.Client.CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientHACache.xml") @@ -57,7 +57,7 @@ namespace Apache.Geode.Client.QuickStart .SetSubscriptionEnabled(true) .Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Region from the Cache which is declared in the Cache XML file. IRegion<object, int> region = cache.GetRegion<object, int>("/exampleRegion"); @@ -116,15 +116,15 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Unregistered keys"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("HACache GemFire Exception: {0}", gfex.Message); + Console.WriteLine("HACache Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/LoaderListenerWriter.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/LoaderListenerWriter.cs b/src/quickstart/csharp/LoaderListenerWriter.cs index ddba119..d7f8c5f 100644 --- a/src/quickstart/csharp/LoaderListenerWriter.cs +++ b/src/quickstart/csharp/LoaderListenerWriter.cs @@ -20,8 +20,8 @@ * * This example takes the following steps: * - * 1. Connect to a GemFire Distributed System. - * 2. Create a GemFire Cache. + * 1. Connect to a Geode Distributed System. + * 2. Create a Geode Cache. * 3. Get the generic example Region from the Cache. * 4. Set the generic SimpleCacheLoader, SimpleCacheListener and SimpleCacheWriter plugins on the Region. * 5. Put 3 Entries into the Region. @@ -38,7 +38,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -50,14 +50,14 @@ namespace Apache.Geode.Client.QuickStart { try { - // Create a GemFire Cache. + // Create a Geode Cache. CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientLoaderListenerWriter.xml") .SetSubscriptionEnabled(true) .Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Region from the Cache which is declared in the Cache XML file. IRegion<string, string> region = cache.GetRegion<string, string>("/exampleRegion"); @@ -112,15 +112,15 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Got expected KeyNotFoundException: {0}", knfex.Message); } - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("LoaderListenerWriter GemFire Exception: {0}", gfex.Message); + Console.WriteLine("LoaderListenerWriter Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/MultiuserSecurity.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/MultiuserSecurity.cs b/src/quickstart/csharp/MultiuserSecurity.cs index 9b08642..4c78718 100755 --- a/src/quickstart/csharp/MultiuserSecurity.cs +++ b/src/quickstart/csharp/MultiuserSecurity.cs @@ -20,7 +20,7 @@ * * This example takes the following steps: * - * 1. Create a GemFire Cache with multiuser enabled. + * 1. Create a Geode Cache with multiuser enabled. * 2. Creates userCache using user "root". Who is authorized to do get and put operations. * 3. Creates userCache using user "writer2". Who is authorized to do only put operation. It tries to do get operation and gets NotAuthorizedException. * 4. Close the Cache. @@ -30,7 +30,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; using System.Collections.Generic; using System.Collections; @@ -50,13 +50,13 @@ namespace Apache.Geode.Client.QuickStart //to do this one need to setup OpenSSL. //secProp.Insert("security-client-dhalgo", "Blowfish:128"); - // Connect to the GemFire Distributed System using the settings from the gfcpp.properties file by default. - // Create a GemFire Cache. + // Connect to the Geode Distributed System using the settings from the gfcpp.properties file by default. + // Create a Geode Cache. CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(null); Cache cache = cacheFactory.SetMultiuserAuthentication(true).Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY); @@ -69,7 +69,7 @@ namespace Apache.Geode.Client.QuickStart cache.Close(); - Console.WriteLine("Client disconnected from the GemFire Distributed System"); + Console.WriteLine("Client disconnected from the Geode Distributed System"); } void runWithUserRoot(Cache cache) @@ -187,9 +187,9 @@ namespace Apache.Geode.Client.QuickStart } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("FAILED: MultiuserSecurityExample GemFire Exception: {0}", gfex.Message); + Console.WriteLine("FAILED: MultiuserSecurityExample Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/PdxInstance.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/PdxInstance.cs b/src/quickstart/csharp/PdxInstance.cs index 6900fdf..1bb2d06 100755 --- a/src/quickstart/csharp/PdxInstance.cs +++ b/src/quickstart/csharp/PdxInstance.cs @@ -21,7 +21,7 @@ * * This example shows IPdxInstanceFactory and IPdxInstance usage. * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Creates the PdxInstanceFactory for Person class. * 3. Then creates instance of PdxInstance * 4. It does put. @@ -32,7 +32,7 @@ // Use standard namespaces using System; using System.Reflection; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; @@ -80,13 +80,13 @@ namespace Apache.Geode.Client.QuickStart CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); - Console.WriteLine("Connected to the GemFire Distributed System"); + Console.WriteLine("Connected to the Geode Distributed System"); - // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML file. + // Create a Geode Cache with the "clientPdxRemoteQuery.xml" Cache XML file. // Set SetPdxReadSerialized to true to access PdxInstance Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientPdxInstance.xml").Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Region from the Cache which is declared in the Cache XML file. IRegion<string, IPdxInstance> region = cache.GetRegion<string, IPdxInstance>("Person"); @@ -121,16 +121,16 @@ namespace Apache.Geode.Client.QuickStart else Console.WriteLine("PdxInstance doesn't returns all fields value expected"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("PdxInstance GemFire Exception: {0}", gfex.Message); + Console.WriteLine("PdxInstance Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/PdxRemoteQuery.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/PdxRemoteQuery.cs b/src/quickstart/csharp/PdxRemoteQuery.cs index 73cbde6..cf90a83 100644 --- a/src/quickstart/csharp/PdxRemoteQuery.cs +++ b/src/quickstart/csharp/PdxRemoteQuery.cs @@ -22,7 +22,7 @@ * This example shows IPdxSerializable usage with remote query. It can query .NET objects without having corresponding java classes at server. * Look PortfolioPdx.cs and PositionPdx.cs to know more. * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Get the example Region from the Cache. * 3. Populate some query Pdx objects on the Region. * 4. Get the pool, get the Query Service from Pool. Pool is define in clientPdxRemoteQuery.xml. @@ -35,7 +35,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; // Use the "Tests" namespace for the query objects. @@ -53,12 +53,12 @@ namespace Apache.Geode.Client.QuickStart CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); - Console.WriteLine("Connected to the GemFire Distributed System"); + Console.WriteLine("Connected to the Geode Distributed System"); - // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML file. + // Create a Geode Cache with the "clientPdxRemoteQuery.xml" Cache XML file. Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientPdxRemoteQuery.xml").Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Region from the Cache which is declared in the Cache XML file. IRegion<string, PortfolioPdx> region = cache.GetRegion<string, PortfolioPdx>("Portfolios"); @@ -126,16 +126,16 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Region existsValue() returned {0}", existsValue ? "true" : "false"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("PdxRemoteQuery GemFire Exception: {0}", gfex.Message); + Console.WriteLine("PdxRemoteQuery Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/PdxSerializer.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/PdxSerializer.cs b/src/quickstart/csharp/PdxSerializer.cs index 9f3a826..5d08633 100755 --- a/src/quickstart/csharp/PdxSerializer.cs +++ b/src/quickstart/csharp/PdxSerializer.cs @@ -34,7 +34,7 @@ * * After that test demonstrartes query on .NET objects without having corresponding java classes at server. * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Get the Person from the Cache. * 3. Populate some query Person objects on the Region. * 4. Get the pool, get the Query Service from Pool. Pool is define in clientPdxRemoteQuery.xml. @@ -47,7 +47,7 @@ // Use standard namespaces using System; using System.Reflection; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; @@ -173,12 +173,12 @@ namespace Apache.Geode.Client.QuickStart CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); - Console.WriteLine("Connected to the GemFire Distributed System"); + Console.WriteLine("Connected to the Geode Distributed System"); - // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML file. + // Create a Geode Cache with the "clientPdxRemoteQuery.xml" Cache XML file. Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientPdxSerializer.xml").Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Region from the Cache which is declared in the Cache XML file. IRegion<string, Person> region = cache.GetRegion<string, Person>("Person"); @@ -234,16 +234,16 @@ namespace Apache.Geode.Client.QuickStart } - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("PdxSerializer GemFire Exception: {0}", gfex.Message); + Console.WriteLine("PdxSerializer Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/PoolCqQuery.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/PoolCqQuery.cs b/src/quickstart/csharp/PoolCqQuery.cs index 81b70c7..33ece96 100755 --- a/src/quickstart/csharp/PoolCqQuery.cs +++ b/src/quickstart/csharp/PoolCqQuery.cs @@ -21,7 +21,7 @@ * This example takes the following steps: * * 1. Create CacheFactory using the user specified properties or from the gfcpp.properties file by default. - * 2. Create a GemFire Cache. + * 2. Create a Geode Cache. * 3. Get the Portfolios Region from the Pool. * 4. Populate some query objects on the Region. * 5. Get the Query Service from cache. @@ -34,7 +34,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; // Use the "Tests" namespace for the query objects. @@ -81,10 +81,10 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Created CacheFactory"); - // Create a GemFire Cache with the "clientPoolCqQuery.xml" Cache XML file. + // Create a Geode Cache with the "clientPoolCqQuery.xml" Cache XML file. Cache cache = cacheFactory.Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the Portfolios Region from the Cache which is declared in the Cache XML file. IRegion<string, Portfolio> region = cache.GetRegion<string, Portfolio>("Portfolios"); @@ -176,15 +176,15 @@ namespace Apache.Geode.Client.QuickStart //Close the cq qry.Close(); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("PoolCqQuery GemFire Exception: {0}", gfex.Message); + Console.WriteLine("PoolCqQuery Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/PoolRemoteQuery.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/PoolRemoteQuery.cs b/src/quickstart/csharp/PoolRemoteQuery.cs index 9b34e4a..1978e6a 100755 --- a/src/quickstart/csharp/PoolRemoteQuery.cs +++ b/src/quickstart/csharp/PoolRemoteQuery.cs @@ -20,7 +20,7 @@ * This examples creates pool using locator. * This example takes the following steps: * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Get the example Region from the Cache. * 3. Populate some query objects on the Region. * 4. Get the pool, get the Query Service from Pool. Pool is define in clientRemoteQueryWithPool.xml. Pool has locator to get the server. Apart from that pool is bind to server group "ServerGroup1". @@ -33,7 +33,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; // Use the "Tests" namespace for the query objects. @@ -51,12 +51,12 @@ namespace Apache.Geode.Client.QuickStart CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(); - Console.WriteLine("Connected to the GemFire Distributed System"); + Console.WriteLine("Connected to the Geode Distributed System"); - // Create a GemFire Cache with the "clientPoolRemoteQuery.xml" Cache XML file. + // Create a Geode Cache with the "clientPoolRemoteQuery.xml" Cache XML file. Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientPoolRemoteQuery.xml").Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Region from the Cache which is declared in the Cache XML file. IRegion<string, Portfolio> region = cache.GetRegion<string, Portfolio>("Portfolios"); @@ -124,16 +124,16 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Region existsValue() returned {0}", existsValue ? "true" : "false"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("PoolRemoteQuery GemFire Exception: {0}", gfex.Message); + Console.WriteLine("PoolRemoteQuery Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/PoolWithEndpoints.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/PoolWithEndpoints.cs b/src/quickstart/csharp/PoolWithEndpoints.cs index 124a300..4b2dafa 100755 --- a/src/quickstart/csharp/PoolWithEndpoints.cs +++ b/src/quickstart/csharp/PoolWithEndpoints.cs @@ -21,7 +21,7 @@ * This example takes the following steps: * * 1. Create CacheFactory using the settings from the gfcpp.properties file by default. - * 2. Create a GemFire Cache. + * 2. Create a Geode Cache. * 3. Create Poolfactory with endpoint and then create pool using poolfactory. * 4. Create a Example Region programmatically. * 5. Put Entries (Key and Value pairs) into the Region. @@ -35,7 +35,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -52,10 +52,10 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Created CacheFactory"); - // Create a GemFire Cache. + // Create a Geode Cache. Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); //Create Poolfactory with endpoint and then create pool using poolfactory. PoolFactory pfact = PoolManager.CreateFactory(); @@ -101,15 +101,15 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Destroyed the second Entry in the Region"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("PoolWithEndpoints GemFire Exception: {0}", gfex.Message); + Console.WriteLine("PoolWithEndpoints Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/PutAllGetAllOperations.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/PutAllGetAllOperations.cs b/src/quickstart/csharp/PutAllGetAllOperations.cs index 26cd54c..1b8f562 100644 --- a/src/quickstart/csharp/PutAllGetAllOperations.cs +++ b/src/quickstart/csharp/PutAllGetAllOperations.cs @@ -20,7 +20,7 @@ * * This example takes the following steps: * - * 1. Create a GemFire Cache using CacheFactory. By default it will connect to "localhost" at port 40404". + * 1. Create a Geode Cache using CacheFactory. By default it will connect to "localhost" at port 40404". * 2. Create a Example Region. * 3. PutAll Entries (Key and Value pairs) into the Region. * 4. GetAll Entries from the Region. @@ -32,7 +32,7 @@ using System; using System.Collections.Generic; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -44,10 +44,10 @@ namespace Apache.Geode.Client.QuickStart { try { - //Create a GemFire Cache using CacheFactory. By default it will connect to "localhost" at port 40404". + //Create a Geode Cache using CacheFactory. By default it will connect to "localhost" at port 40404". Cache cache = CacheFactory.CreateCacheFactory().Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); //Set Attributes for the region. RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY); @@ -80,15 +80,15 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Obtained 100 entries from the Region"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("PutAllGetAllOperations GemFire Exception: {0}", gfex.Message); + Console.WriteLine("PutAllGetAllOperations Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/RefIDExample.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/RefIDExample.cs b/src/quickstart/csharp/RefIDExample.cs index ad892c4..c34a966 100644 --- a/src/quickstart/csharp/RefIDExample.cs +++ b/src/quickstart/csharp/RefIDExample.cs @@ -20,7 +20,7 @@ * This example creates two pools through XML and sets region attributes using refid. * This example takes the following steps: * - * 1. Create a GemFire Cache. + * 1. Create a Geode Cache. * 2. Now it creates 2 Pools with the names poolName1, poolName2 respectively. * 3. Sets the region attribute using refid. * 4. Gets the region "root1" with poolName1, and region "root2" with poolName2. @@ -36,7 +36,7 @@ // Use standard namespaces using System; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -53,7 +53,7 @@ namespace Apache.Geode.Client.QuickStart CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(prop); Cache cache = cacheFactory.Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the Regions from the Cache which is declared in the Cache XML file. IRegion<string, string> region1 = cache.GetRegion<string, string>("root1"); @@ -105,15 +105,15 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Destroyed the second Entry in both the Regions"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("RefIDExample GemFire Exception: {0}", gfex.Message); + Console.WriteLine("RefIDExample Geode Exception: {0}", gfex.Message); } } } http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/quickstart/csharp/RegisterInterest.cs ---------------------------------------------------------------------- diff --git a/src/quickstart/csharp/RegisterInterest.cs b/src/quickstart/csharp/RegisterInterest.cs index ef4a751..ff70d12 100644 --- a/src/quickstart/csharp/RegisterInterest.cs +++ b/src/quickstart/csharp/RegisterInterest.cs @@ -21,7 +21,7 @@ * This example takes the following steps: * * 1. Create CacheFactory using the user specified properties or from the gfcpp.properties file by default. - * 2. Create a GemFire Cache. + * 2. Create a Geode Cache. * 3. Get the example Region from the Cache. * 4. Call registerAllKeys() and unregisterAllKeys() on the Region. * 5. Call registerKeys() and unregisterKeys() on the Region. @@ -33,7 +33,7 @@ using System; using System.Collections.Generic; -// Use the GemFire namespace +// Use the Geode namespace using Apache.Geode.Client; namespace Apache.Geode.Client.QuickStart @@ -52,10 +52,10 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Created CacheFactory"); - // Create a GemFire Cache with the "clientRegisterInterest.xml" Cache XML file. + // Create a Geode Cache with the "clientRegisterInterest.xml" Cache XML file. Cache cache = cacheFactory.Create(); - Console.WriteLine("Created the GemFire Cache"); + Console.WriteLine("Created the Geode Cache"); // Get the example Region from the Cache which is declared in the Cache XML file. IRegion<string, string> region = cache.GetRegion<string, string>("exampleRegion"); @@ -105,15 +105,15 @@ namespace Apache.Geode.Client.QuickStart Console.WriteLine("Called RegisterRegex() and UnregisterRegex() with getInitialValues argument"); - // Close the GemFire Cache. + // Close the Geode Cache. cache.Close(); - Console.WriteLine("Closed the GemFire Cache"); + Console.WriteLine("Closed the Geode Cache"); } // An exception should not occur - catch (GemFireException gfex) + catch (GeodeException gfex) { - Console.WriteLine("RegisterInterest GemFire Exception: {0}", gfex.Message); + Console.WriteLine("RegisterInterest Geode Exception: {0}", gfex.Message); } } }
