geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [48/50] [abbrv] geode-native git commit: GEODE-2422: Switch remaining GemFire strings to Geode.
Date Thu, 09 Feb 2017 18:09:45 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/CacheHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheHelper.hpp b/src/cppcache/integration-test/CacheHelper.hpp
index d143aa2..7c9b086 100644
--- a/src/cppcache/integration-test/CacheHelper.hpp
+++ b/src/cppcache/integration-test/CacheHelper.hpp
@@ -304,10 +304,10 @@ class CacheHelper {
   static int staticMcastAddress;
 
  private:
-  static std::string generateGemfireProperties(const std::string& path,
-                                               const bool ssl = false,
-                                               const int dsId = -1,
-                                               const int remoteLocator = 0);
+  static std::string generateGeodeProperties(const std::string& path,
+                                             const bool ssl = false,
+                                             const int dsId = -1,
+                                             const int remoteLocator = 0);
 };
 
 #ifndef test_cppcache_utils_static

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/InitSmartHeap.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/InitSmartHeap.cpp b/src/cppcache/integration-test/InitSmartHeap.cpp
index b58b5b7..326d2d1 100644
--- a/src/cppcache/integration-test/InitSmartHeap.cpp
+++ b/src/cppcache/integration-test/InitSmartHeap.cpp
@@ -17,7 +17,7 @@
 
 #include <smrtheap.hpp>
 
-namespace gemfire_smartheap {
+namespace geode_smartheap {
 
 class InitSmartHeap {
  public:

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/ThinClientDistOps.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDistOps.hpp b/src/cppcache/integration-test/ThinClientDistOps.hpp
index 17b73b6..455ad8f 100644
--- a/src/cppcache/integration-test/ThinClientDistOps.hpp
+++ b/src/cppcache/integration-test/ThinClientDistOps.hpp
@@ -404,8 +404,8 @@ void createEntryTwice(const char* name, const char* key, const char* value) {
   regPtr->create(keyPtr, valPtr);
   try {
     regPtr->create(keyPtr, valPtr);
-  } catch (const EntryExistsException& gemfireExcp) {
-    LOG(gemfireExcp.getMessage());
+  } catch (const EntryExistsException& geodeExcp) {
+    LOG(geodeExcp.getMessage());
     LOG("createEntryTwice() Clean Exit.");
     return;
   }
@@ -761,8 +761,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepEight_Pool)
       reg->create(keyPtr, valPtr);
       sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
       LOG(message);
-    } catch (const EntryExistsException& gemfireExcp) {
-      LOG(gemfireExcp.getMessage());
+    } catch (const EntryExistsException& geodeExcp) {
+      LOG(geodeExcp.getMessage());
       ASSERT(false,
              "Creating KEY Twice on a caching-enabled false region should be "
              "allowed.");
@@ -802,8 +802,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepEight_Pool_Sticky)
       reg->create(keyPtr, valPtr);
       sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
       LOG(message);
-    } catch (const EntryExistsException& gemfireExcp) {
-      LOG(gemfireExcp.getMessage());
+    } catch (const EntryExistsException& geodeExcp) {
+      LOG(geodeExcp.getMessage());
       ASSERT(false,
              "Creating KEY Twice on a caching-enabled false region should be "
              "allowed.");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
index 22fd16a..f0d0df0 100644
--- a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
+++ b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
@@ -96,7 +96,7 @@ END_TASK_DEFINITION
 
 DUNIT_TASK_DEFINITION(CLIENT1, SetupClient)
   {
-    // Create a GemFire Cache with the "client_Loader.xml" Cache XML file.
+    // Create a Geode Cache with the "client_Loader.xml" Cache XML file.
     const char* clientXmlFile = "client_Loader.xml";
     static char* path = ACE_OS::getenv("TESTSRC");
     std::string clientXml = path;
@@ -105,7 +105,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, SetupClient)
     CacheFactoryPtr cacheFactoryPtr = CacheFactory::createCacheFactory()->set(
         "cache-xml-file", clientXml.c_str());
     cachePtr = cacheFactoryPtr->create();
-    LOGINFO("Created the GemFire Cache");
+    LOGINFO("Created the Geode Cache");
 
     // Get the example Region from the Cache which is declared in the Cache XML
     // file.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/ThinClientTransactions.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTransactions.hpp b/src/cppcache/integration-test/ThinClientTransactions.hpp
index a84ed55..7674b2f 100644
--- a/src/cppcache/integration-test/ThinClientTransactions.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactions.hpp
@@ -268,8 +268,8 @@ void createEntryTwice(const char* name, const char* key, const char* value) {
   regPtr->create(keyPtr, valPtr);
   try {
     regPtr->create(keyPtr, valPtr);
-  } catch (const EntryExistsException& gemfireExcp) {
-    LOG(gemfireExcp.getMessage());
+  } catch (const EntryExistsException& geodeExcp) {
+    LOG(geodeExcp.getMessage());
     LOG("createEntryTwice() Clean Exit.");
     return;
   }
@@ -1043,8 +1043,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateClient1KeyThriceWithoutSticky)
       reg->create(keyPtr, valPtr);
       sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
       LOG(message);
-    } catch (const EntryExistsException& gemfireExcp) {
-      LOG(gemfireExcp.getMessage());
+    } catch (const EntryExistsException& geodeExcp) {
+      LOG(geodeExcp.getMessage());
       ASSERT(false,
              "Creating KEY Twice on a caching-enabled false region should be "
              "allowed.");
@@ -1084,8 +1084,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateClient1KeyThriceWithSticky)
       reg->create(keyPtr, valPtr);
       sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
       LOG(message);
-    } catch (const EntryExistsException& gemfireExcp) {
-      LOG(gemfireExcp.getMessage());
+    } catch (const EntryExistsException& geodeExcp) {
+      LOG(geodeExcp.getMessage());
       ASSERT(false,
              "Creating KEY Twice on a caching-enabled false region should be "
              "allowed.");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
index c2aaa11..cba8bcc 100644
--- a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
@@ -268,8 +268,8 @@ void createEntryTwice(const char* name, const char* key, const char* value) {
   regPtr->create(keyPtr, valPtr);
   try {
     regPtr->create(keyPtr, valPtr);
-  } catch (const EntryExistsException& gemfireExcp) {
-    LOG(gemfireExcp.getMessage());
+  } catch (const EntryExistsException& geodeExcp) {
+    LOG(geodeExcp.getMessage());
     LOG("createEntryTwice() Clean Exit.");
     return;
   }
@@ -1059,8 +1059,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepEight_Pool)
       reg->create(keyPtr, valPtr);
       sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
       LOG(message);
-    } catch (const EntryExistsException& gemfireExcp) {
-      LOG(gemfireExcp.getMessage());
+    } catch (const EntryExistsException& geodeExcp) {
+      LOG(geodeExcp.getMessage());
       ASSERT(false,
              "Creating KEY Twice on a caching-enabled false region should be "
              "allowed.");
@@ -1100,8 +1100,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepEight_Pool_Sticky)
       reg->create(keyPtr, valPtr);
       sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
       LOG(message);
-    } catch (const EntryExistsException& gemfireExcp) {
-      LOG(gemfireExcp.getMessage());
+    } catch (const EntryExistsException& geodeExcp) {
+      LOG(geodeExcp.getMessage());
       ASSERT(false,
              "Creating KEY Twice on a caching-enabled false region should be "
              "allowed.");

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testLinkage.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testLinkage.cpp b/src/cppcache/integration-test/testLinkage.cpp
index 778d014..b2fc869 100644
--- a/src/cppcache/integration-test/testLinkage.cpp
+++ b/src/cppcache/integration-test/testLinkage.cpp
@@ -71,8 +71,8 @@ BEGIN_TEST(LinkageTest)
     UnknownException aUnknownException("UnknownException");
     ClassCastException aClassCastException("ClassCastException");
     EntryNotFoundException aEntryNotFoundException("EntryNotFoundException");
-    GemfireIOException aGemfireIOException("GemfireIOException");
-    GemfireConfigException aGemfireConfigException("GemfireConfigException");
+    GeodeIOException aGeodeIOException("GeodeIOException");
+    GeodeConfigException aGeodeConfigException("GeodeConfigException");
     NullPointerException aNullPointerException("NullPointerException");
     EntryExistsException aEntryExistsException("EntryExistsException");
   }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientCq.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCq.cpp b/src/cppcache/integration-test/testThinClientCq.cpp
index 453f287..26097ec 100644
--- a/src/cppcache/integration-test/testThinClientCq.cpp
+++ b/src/cppcache/integration-test/testThinClientCq.cpp
@@ -435,9 +435,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepThree)
         LOGINFO("ResultSet Query returned %d rows", resultsPtr->size());
         LOG("Testing bug #1026 Complete");
         // Iterate through the rows of the query result.
-      } catch (const Exception& gemfireExcp) {
-        LOGERROR("CqQuery GemFire Exception: %s", gemfireExcp.getMessage());
-        FAIL(gemfireExcp.getMessage());
+      } catch (const Exception& geodeExcp) {
+        LOGERROR("CqQuery Geode Exception: %s", geodeExcp.getMessage());
+        FAIL(geodeExcp.getMessage());
       }
     }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientCqDurable.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqDurable.cpp b/src/cppcache/integration-test/testThinClientCqDurable.cpp
index a743477..2cda0cd 100644
--- a/src/cppcache/integration-test/testThinClientCqDurable.cpp
+++ b/src/cppcache/integration-test/testThinClientCqDurable.cpp
@@ -181,14 +181,14 @@ void RunDurableCqClient() {
   pp->insert("durable-client-id", "DurableClientId");
   pp->insert("durable-timeout", 3600);
 
-  // Create a GemFire Cache Programmatically.
+  // Create a Geode Cache Programmatically.
   CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory(pp);
   CachePtr cachePtr = cacheFactory->setSubscriptionEnabled(true)
                           ->setSubscriptionAckInterval(5000)
                           ->setSubscriptionMessageTrackingTimeout(50000)
                           ->create();
 
-  LOGINFO("Created the GemFire Cache Programmatically");
+  LOGINFO("Created the Geode Cache Programmatically");
 
   RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(CACHING_PROXY);
 
@@ -229,23 +229,23 @@ void RunDurableCqClient() {
   // wait for some time to recieve events
   apache::geode::client::millisleep(10000);
 
-  // Close the GemFire Cache with keepalive = true.  Server will queue events
+  // 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()"
   cachePtr->close(true);
 
-  LOGINFO("Closed the GemFire Cache with keepalive as true");
+  LOGINFO("Closed the Geode Cache with keepalive as true");
 }
 
 void RunFeederClient() {
   CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
-  LOGINFO("Feeder connected to the GemFire Distributed System");
+  LOGINFO("Feeder connected to the Geode Distributed System");
 
   CachePtr cachePtr = cacheFactory->create();
 
-  LOGINFO("Created the GemFire Cache");
+  LOGINFO("Created the Geode Cache");
 
   RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(PROXY);
 
@@ -266,19 +266,19 @@ void RunFeederClient() {
   apache::geode::client::millisleep(10000);
   LOGINFO("put on 0-10 keys done.");
 
-  // Close the GemFire Cache
+  // Close the Geode Cache
   cachePtr->close();
 
-  LOGINFO("Closed the GemFire Cache");
+  LOGINFO("Closed the Geode Cache");
 }
 
 void RunFeederClient1() {
   CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
-  LOGINFO("Feeder connected to the GemFire Distributed System");
+  LOGINFO("Feeder connected to the Geode Distributed System");
 
   CachePtr cachePtr = cacheFactory->create();
 
-  LOGINFO("Created the GemFire Cache");
+  LOGINFO("Created the Geode Cache");
 
   RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(PROXY);
 
@@ -299,10 +299,10 @@ void RunFeederClient1() {
   apache::geode::client::millisleep(10000);
   LOGINFO("put on 0-10 keys done.");
 
-  // Close the GemFire Cache
+  // Close the Geode Cache
   cachePtr->close();
 
-  LOGINFO("Closed the GemFire Cache");
+  LOGINFO("Closed the Geode Cache");
 }
 
 DUNIT_TASK_DEFINITION(CLIENT1, RunDurableClient)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp b/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
index 88acab0..cff214a 100644
--- a/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
+++ b/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
@@ -243,8 +243,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckUpdateBug1001)
       CacheableStringPtr lCStringP = CacheableString::create(
           str, static_cast<int32_t>(wcslen(str) + 1) * sizeof(wchar_t));
       const wchar_t* lRtnCd ATTR_UNUSED = lCStringP->asWChar();
-    } catch (const Exception& gemfireExcp) {
-      printf("%s: %s", gemfireExcp.getName(), gemfireExcp.getMessage());
+    } catch (const Exception& geodeExcp) {
+      printf("%s: %s", geodeExcp.getName(), geodeExcp.getMessage());
       FAIL("Should not have got exception.");
     }
 
@@ -253,8 +253,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckUpdateBug1001)
       CacheableStringPtr lCStringP = CacheableString::create(
           str, static_cast<int32_t>(wcslen(str) + 1) * sizeof(wchar_t));
       const wchar_t* lRtnCd ATTR_UNUSED = lCStringP->asWChar();
-    } catch (const Exception& gemfireExcp) {
-      printf("%s: %s", gemfireExcp.getName(), gemfireExcp.getMessage());
+    } catch (const Exception& geodeExcp) {
+      printf("%s: %s", geodeExcp.getName(), geodeExcp.getMessage());
       FAIL("Should not have got exception.");
     }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientListenerEvents.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientListenerEvents.cpp b/src/cppcache/integration-test/testThinClientListenerEvents.cpp
index a11d438..8455fde 100644
--- a/src/cppcache/integration-test/testThinClientListenerEvents.cpp
+++ b/src/cppcache/integration-test/testThinClientListenerEvents.cpp
@@ -33,7 +33,7 @@ class SimpleCacheListener;
 typedef apache::geode::client::SharedPtr<SimpleCacheListener>
     SimpleCacheListenerPtr;
 
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
 using namespace apache::geode::client;
 
 // The SimpleCacheListener class.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientPdxTests.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTests.cpp b/src/cppcache/integration-test/testThinClientPdxTests.cpp
index e331533..3d68597 100644
--- a/src/cppcache/integration-test/testThinClientPdxTests.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTests.cpp
@@ -4016,7 +4016,7 @@ DUNIT_MAIN
     // MixedVersionNestedPdxOps
     { runNestedPdxOpsWithVersioning(); }
 
-    // Pdxobject In Gemfire Serializable Ops
+    // Pdxobject In Geode Serializable Ops
     //{
     //  runPdxInGFSOps();
     //}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
index 2e437cf..c66b384 100644
--- a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
@@ -3548,7 +3548,7 @@ DUNIT_MAIN
       runNestedPdxOps(true, true);  // pool with locators
     }
 
-    // Pdxobject In Gemfire Serializable Ops
+    // Pdxobject In Geode Serializable Ops
     {
       runPdxInGFSOps(true);        // pool with server endpoints
       runPdxInGFSOps(true, true);  // pool with locators

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientRemoveOps.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoveOps.cpp b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
index 00c740e..2c1dff2 100644
--- a/src/cppcache/integration-test/testThinClientRemoveOps.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
@@ -268,8 +268,8 @@ void createEntryTwice(const char* name, const char* key, const char* value) {
   regPtr->create(keyPtr, valPtr);
   try {
     regPtr->create(keyPtr, valPtr);
-  } catch (const EntryExistsException& gemfireExcp) {
-    LOG(gemfireExcp.getMessage());
+  } catch (const EntryExistsException& geodeExcp) {
+    LOG(geodeExcp.getMessage());
     LOG("createEntryTwice() Clean Exit.");
     return;
   }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientSecurityDH.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityDH.cpp b/src/cppcache/integration-test/testThinClientSecurityDH.cpp
index 88d0173..e2b3d40 100644
--- a/src/cppcache/integration-test/testThinClientSecurityDH.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityDH.cpp
@@ -109,7 +109,7 @@ void initClientAuth(char credentialsType, const char* dhAlgo) {
 
   config->insert("security-client-dhalgo", dhAlgo);
   std::string testsrc = ACE_OS::getenv("TESTSRC");
-  testsrc += "/keystore/gemfire.pem";
+  testsrc += "/keystore/geode.pem";
   printf("KeyStore Path is: %s", testsrc.c_str());
   config->insert("security-client-kspath", testsrc.c_str());
 
@@ -228,15 +228,15 @@ void initSecurityServer(int instance) {
         cmdServerAuthenticator += " security-server-kspath=";
         cmdServerAuthenticator += testsrc;
         cmdServerAuthenticator +=
-            " security-server-ksalias=gemfire1 "
-            "security-server-kspasswd=gemfire";
+            " security-server-ksalias=geode1 "
+            "security-server-kspasswd=geode";
       } else if (instance == 2) {
         testsrc += "/keystore/gemfire2.keystore";
         cmdServerAuthenticator += " security-server-kspath=";
         cmdServerAuthenticator += testsrc;
         cmdServerAuthenticator +=
-            " security-server-ksalias=gemfire2 "
-            "security-server-kspasswd=gemfire";
+            " security-server-ksalias=geode2 "
+            "security-server-kspasswd=geode";
       }
 
       printf("Input to server cmd is -->  %s\n",

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
index ba9a77c..384885d 100644
--- a/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
@@ -115,7 +115,7 @@ void initClientAuth(char credentialsType, const char* dhAlgo) {
 
   config->insert("security-client-dhalgo", dhAlgo);
   std::string testsrc = ACE_OS::getenv("TESTSRC");
-  testsrc += "/keystore/gemfire.pem";
+  testsrc += "/keystore/geode.pem";
   printf("KeyStore Path is: %s", testsrc.c_str());
   config->insert("security-client-kspath", testsrc.c_str());
 
@@ -260,15 +260,15 @@ void initSecurityServer(int instance) {
         cmdServerAuthenticator += " security-server-kspath=";
         cmdServerAuthenticator += testsrc;
         cmdServerAuthenticator +=
-            " security-server-ksalias=gemfire1 "
-            "security-server-kspasswd=gemfire";
+            " security-server-ksalias=geode1 "
+            "security-server-kspasswd=geode";
       } else if (instance == 2) {
         testsrc += "/keystore/gemfire2.keystore";
         cmdServerAuthenticator += " security-server-kspath=";
         cmdServerAuthenticator += testsrc;
         cmdServerAuthenticator +=
-            " security-server-ksalias=gemfire2 "
-            "security-server-kspasswd=gemfire";
+            " security-server-ksalias=geode2 "
+            "security-server-kspasswd=geode";
       }
 
       printf("Input to server cmd is -->  %s\n",

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp b/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
index 9596fde..6fdd776 100644
--- a/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
@@ -171,8 +171,7 @@ class UserThread : public ACE_Task_Base {
       other.printStackTrace();
       m_failed = true;
       char tmp[256] = {'\0'};
-      sprintf(tmp, "Some other gemfire exception got for user id = %d",
-              m_userId);
+      sprintf(tmp, "Some other geode exception got for user id = %d", m_userId);
       LOG(tmp);
       LOG(other.getMessage());
       m_failed = true;
@@ -212,8 +211,7 @@ class UserThread : public ACE_Task_Base {
       other.printStackTrace();
       m_failed = true;
       char tmp[256] = {'\0'};
-      sprintf(tmp, "Some other gemfire exception got for user id = %d",
-              m_userId);
+      sprintf(tmp, "Some other geode exception got for user id = %d", m_userId);
       LOG(tmp);
       LOG(other.getMessage());
       m_failed = true;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp b/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
index 0697e68..2667585 100644
--- a/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
@@ -72,20 +72,20 @@ void initClientAuth(char userType, int clientNum = 1) {
                  "createUserPasswordAuthInitInstance");
   switch (userType) {
     case 'W': {
-      config->insert("security-username", "gemfire9");
-      config->insert("security-password", "gemfire9");
+      config->insert("security-username", "geode9");
+      config->insert("security-password", "geode9");
       break;
     }
     case 'R': {
       char clientStr[32];
-      sprintf(clientStr, "gemfire%d", clientNum);
+      sprintf(clientStr, "geode%d", clientNum);
       config->insert("security-username", clientStr);
       config->insert("security-password", clientStr);
       break;
     }
     case 'A': {
-      config->insert("security-username", "gemfire1");
-      config->insert("security-password", "gemfire1");
+      config->insert("security-username", "geode1");
+      config->insert("security-password", "geode1");
       break;
     }
     default: { break; }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/integration-test/testThinClientStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientStatistics.cpp b/src/cppcache/integration-test/testThinClientStatistics.cpp
index 3a37976..8a7f13b 100644
--- a/src/cppcache/integration-test/testThinClientStatistics.cpp
+++ b/src/cppcache/integration-test/testThinClientStatistics.cpp
@@ -193,7 +193,7 @@ void DoRegionOpsAndVerify() {
     regEntry->getStatistics(cacheStatptr);
   } catch (StatisticsDisabledException& ex) {
     LOGINFO("Exception Caught:: StatisticsDisabledException");
-  } catch (GemfireConfigException& e) {
+  } catch (GeodeConfigException& e) {
     LOGINFO("Exception Caught:: %s", e.getMessage());
   } catch (Exception& ex) {
     LOGINFO("Exception Caught:: %s", ex.getMessage());

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/CacheFactory.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheFactory.cpp b/src/cppcache/src/CacheFactory.cpp
index 151c65e..2571585 100644
--- a/src/cppcache/src/CacheFactory.cpp
+++ b/src/cppcache/src/CacheFactory.cpp
@@ -37,8 +37,8 @@
 
 #include "version.h"
 
-#define DEFAULT_DS_NAME "default_GemfireDS"
-#define DEFAULT_CACHE_NAME "default_GemfireCache"
+#define DEFAULT_DS_NAME "default_GeodeDS"
+#define DEFAULT_CACHE_NAME "default_GeodeCache"
 #define DEFAULT_SERVER_PORT 40404
 #define DEFAULT_SERVER_HOST "localhost"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/CacheImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheImpl.hpp b/src/cppcache/src/CacheImpl.hpp
index 2bfc05a..0c81837 100644
--- a/src/cppcache/src/CacheImpl.hpp
+++ b/src/cppcache/src/CacheImpl.hpp
@@ -64,7 +64,7 @@ class ExpiryTaskManager;
 
 /**
  * @class Cache Cache.hpp
- * GemFire's implementation of a distributed C++ Cache.
+ * Geode's implementation of a distributed C++ Cache.
  *
  * Caches are obtained from static methods on the {@link CacheFactory} class.
  * <p>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/CacheTransactionManagerImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CacheTransactionManagerImpl.cpp b/src/cppcache/src/CacheTransactionManagerImpl.cpp
index 98a8028..fbb37b4 100644
--- a/src/cppcache/src/CacheTransactionManagerImpl.cpp
+++ b/src/cppcache/src/CacheTransactionManagerImpl.cpp
@@ -44,12 +44,12 @@ CacheTransactionManagerImpl::CacheTransactionManagerImpl(Cache* cache)
 CacheTransactionManagerImpl::~CacheTransactionManagerImpl() {}
 
 void CacheTransactionManagerImpl::begin() {
-  if (TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL) {
+  if (TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL) {
     GfErrTypeThrowException("Transaction already in progress",
                             GF_CACHE_ILLEGAL_STATE_EXCEPTION);
   }
   TXState* txState = new TXState(m_cache);
-  TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(txState);
+  TSSTXStateWrapper::s_geodeTSSTXState->setTXState(txState);
   addTx(txState->getTransactionId()->getId());
 }
 
@@ -313,7 +313,7 @@ GfErrType CacheTransactionManagerImpl::rollback(TXState* txState,
 }
 
 ThinClientPoolDM* CacheTransactionManagerImpl::getDM() {
-  TcrConnection* conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+  TcrConnection* conn = TssConnectionWrapper::s_geodeTSSConn->getConnection();
   if (conn != NULL) {
     ThinClientPoolDM* dm = conn->getEndpointObject()->getPoolHADM();
     if (dm != NULL) {
@@ -327,14 +327,14 @@ Cache* CacheTransactionManagerImpl::getCache() { return m_cache; }
 
 TransactionIdPtr CacheTransactionManagerImpl::suspend() {
   // get the current state of the thread
-  TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+  TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
   if (txState == NULL) {
     LOGFINE("Transaction not in progress. Returning NULL transaction Id.");
     return NULLPTR;
   }
 
   // get the current connection that this transaction is using
-  TcrConnection* conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+  TcrConnection* conn = TssConnectionWrapper::s_geodeTSSConn->getConnection();
   if (conn == NULL) {
     LOGFINE("Thread local connection is null. Returning NULL transaction Id.");
     return NULLPTR;
@@ -366,7 +366,7 @@ TransactionIdPtr CacheTransactionManagerImpl::suspend() {
   addSuspendedTx(txState->getTransactionId()->getId(), txState);
 
   // set the current transaction state as null
-  TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(NULL);
+  TSSTXStateWrapper::s_geodeTSSTXState->setTXState(NULL);
 
   // return the transaction ID
   return txState->getTransactionId();
@@ -374,7 +374,7 @@ TransactionIdPtr CacheTransactionManagerImpl::suspend() {
 
 void CacheTransactionManagerImpl::resume(TransactionIdPtr transactionId) {
   // get the current state of the thread
-  if (TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL) {
+  if (TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL) {
     GfErrTypeThrowException("A transaction is already in progress",
                             GF_CACHE_ILLEGAL_STATE_EXCEPTION);
   }
@@ -400,7 +400,7 @@ bool CacheTransactionManagerImpl::tryResume(TransactionIdPtr transactionId) {
 bool CacheTransactionManagerImpl::tryResume(TransactionIdPtr transactionId,
                                             bool cancelExpiryTask) {
   // get the current state of the thread
-  if (TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL) {
+  if (TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL) {
     LOGFINE("A transaction is already in progress. Cannot resume transaction.");
     return false;
   }
@@ -417,7 +417,7 @@ bool CacheTransactionManagerImpl::tryResume(TransactionIdPtr transactionId,
 bool CacheTransactionManagerImpl::tryResume(TransactionIdPtr transactionId,
                                             int32_t waitTimeInMillisec) {
   // get the current state of the thread
-  if (TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL) {
+  if (TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL) {
     LOGFINE("A transaction is already in progress. Cannot resume transaction.");
     return false;
   }
@@ -452,7 +452,7 @@ void CacheTransactionManagerImpl::resumeTxUsingTxState(TXState* txState,
   }
 
   // set the current state as the state of the suspended transaction
-  TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(txState);
+  TSSTXStateWrapper::s_geodeTSSTXState->setTXState(txState);
 
   LOGFINE("Get connection for transaction id %d",
           txState->getTransactionId()->getId());
@@ -462,7 +462,7 @@ void CacheTransactionManagerImpl::resumeTxUsingTxState(TXState* txState,
   if (conn == NULL || error != GF_NOERR) {
     // throw an exception and set the current state as NULL because
     // the transaction cannot be resumed
-    TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(NULL);
+    TSSTXStateWrapper::s_geodeTSSTXState->setTXState(NULL);
     GfErrTypeThrowException(
         "Could not get a connection for the transaction id.",
         GF_CACHE_ILLEGAL_STATE_EXCEPTION);
@@ -478,7 +478,7 @@ bool CacheTransactionManagerImpl::exists(TransactionIdPtr transactionId) {
 }
 
 bool CacheTransactionManagerImpl::exists() {
-  return TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL;
+  return TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL;
 }
 
 void CacheTransactionManagerImpl::addTx(int32_t txId) {
@@ -564,7 +564,7 @@ bool CacheTransactionManagerImpl::isSuspendedTx(int32_t txId) {
   }
 }
 TransactionIdPtr CacheTransactionManagerImpl::getTransactionId() {
-  TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+  TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
   if (txState == NULL) {
     return NULLPTR;
   } else {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ClientProxyMembershipID.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientProxyMembershipID.cpp b/src/cppcache/src/ClientProxyMembershipID.cpp
index e7ae787..2e546d3 100644
--- a/src/cppcache/src/ClientProxyMembershipID.cpp
+++ b/src/cppcache/src/ClientProxyMembershipID.cpp
@@ -380,7 +380,7 @@ Serializable* ClientProxyMembershipID::fromData(DataInput& input) {
   aStringArray->fromData(input);
   // #925 - currently reading empty string keep watch here,
   // server might remove even sending this string
-  // (https://svn.gemstone.com/trac/gemfire/changeset/44566).
+  // (https://svn.gemstone.com/trac/geode/changeset/44566).
   input.readObject(dsName);            // name
   input.readObject(uniqueTag);         // unique tag
   input.readObject(durableClientId);   // durable client id
@@ -439,7 +439,7 @@ Serializable* ClientProxyMembershipID::readEssentialData(DataInput& input) {
 
   // #925 - currently reading empty string keep watch here,
   // server might remove even sending this string
-  // (https://svn.gemstone.com/trac/gemfire/changeset/44566).
+  // (https://svn.gemstone.com/trac/geode/changeset/44566).
   input.readObject(dsName);  // name
 
   if (vmKind != ClientProxyMembershipID::LONER_DM_TYPE) {
@@ -506,7 +506,7 @@ int16_t ClientProxyMembershipID::compareTo(DSMemberForVersionStampPtr other) {
   }
   // #925 - currently reading empty string keep watch here,
   // server might remove even sending this string
-  // (https://svn.gemstone.com/trac/gemfire/changeset/44566).
+  // (https://svn.gemstone.com/trac/geode/changeset/44566).
   // InternalDistributedMember no longer uses "name" in comparisons.
   // std::string myDSName = getDSName();
   // std::string otherDSName = otherMember->getDSName();

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/Connector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Connector.hpp b/src/cppcache/src/Connector.hpp
index 73d23d0..579e9ba 100644
--- a/src/cppcache/src/Connector.hpp
+++ b/src/cppcache/src/Connector.hpp
@@ -53,7 +53,7 @@ class Connector {
    * is thrown.
    *
    * <p> If <code>len</code> bytes cannot be read for any reason, then an
-   * <code>GemfireIOException</code> is thrown.
+   * <code>GeodeIOException</code> is thrown.
    *
    * <p> The <code>read(b)</code> method for class <code>InputStream</code>
    * has the same effect as: <pre><code> read(b, 0, b.length) </code></pre>
@@ -64,7 +64,7 @@ class Connector {
    * complete.
    * @return     the total number of bytes read into the buffer, or
    *             <code>-1</code> if an error was encountered.
-   * @exception  GemfireIOException, TimeoutException, IllegalArgumentException,
+   * @exception  GeodeIOException, TimeoutException, IllegalArgumentException,
    * OutOfMemoryException.
    */
   virtual int32_t receive(char *b, int32_t len, uint32_t waitSeconds,
@@ -79,7 +79,7 @@ class Connector {
    * @param      waitSeconds   the number of seconds to allow the write to
    * complete.
    * @return     the actual number of bytes written.
-   * @exception  GemfireIOException, TimeoutException, IllegalArgumentException.
+   * @exception  GeodeIOException, TimeoutException, IllegalArgumentException.
    */
   virtual int32_t send(const char *b, int32_t len, uint32_t waitSeconds,
                        uint32_t waitMicroSeconds) = 0;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/CppCacheLibrary.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CppCacheLibrary.cpp b/src/cppcache/src/CppCacheLibrary.cpp
index 0c5dd5b..f953d37 100644
--- a/src/cppcache/src/CppCacheLibrary.cpp
+++ b/src/cppcache/src/CppCacheLibrary.cpp
@@ -93,7 +93,7 @@ CppCacheLibrary* CppCacheLibrary::initLib(void) {
 void CppCacheLibrary::closeLib(void) {
   // ACE::fini(); This should not happen..... Things might be using ace beyond
   // the life of
-  // using gemfire.
+  // using geode.
 }
 
 // called during DLL initialization

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/CqService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CqService.cpp b/src/cppcache/src/CqService.cpp
index 0fa3bbf..7ed426f 100644
--- a/src/cppcache/src/CqService.cpp
+++ b/src/cppcache/src/CqService.cpp
@@ -116,8 +116,8 @@ CqQueryPtr CqService::newCq(std::string& cqName, std::string& queryString,
   UserAttributesPtr ua;
   ua = NULLPTR;
   if (m_tccdm != NULL && m_tccdm->isMultiUserMode()) {
-    ua = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
-             ->getUserAttributes();
+    ua =
+        TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes();
   }
 
   CqServicePtr cqs(this);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DistributedSystem.cpp b/src/cppcache/src/DistributedSystem.cpp
index ef535b7..d6915b9 100644
--- a/src/cppcache/src/DistributedSystem.cpp
+++ b/src/cppcache/src/DistributedSystem.cpp
@@ -175,7 +175,7 @@ DistributedSystemPtr DistributedSystem::connect(
       Log::init(g_sysProps->logLevel(), logFilename,
                 g_sysProps->logFileSizeLimit(),
                 g_sysProps->logDiskSpaceLimit());
-    } catch (const GemfireIOException&) {
+    } catch (const GeodeIOException&) {
       Log::close();
       TcrMessage::cleanup();
       CppCacheLibrary::closeLib();
@@ -191,8 +191,7 @@ DistributedSystemPtr DistributedSystem::connect(
 
   try {
     std::string gfcpp = CppCacheLibrary::getProductDir();
-    LOGCONFIG("Using GemFire Native Client Product Directory: %s",
-              gfcpp.c_str());
+    LOGCONFIG("Using Geode Native Client Product Directory: %s", gfcpp.c_str());
   } catch (const Exception&) {
     LOGERROR(
         "Unable to determine Product Directory. Please set the "
@@ -228,7 +227,7 @@ DistributedSystemPtr DistributedSystem::connect(
     LOGCONFIG("Operators new and delete have been set.");
   }
 #endif
-  // Log the Gemfire system properties
+  // Log the Geode system properties
   g_sysProps->logSettings();
 
   /* if (strlen(g_sysProps->securityClientDhAlgo())>0) {
@@ -290,7 +289,7 @@ DistributedSystemPtr DistributedSystem::connect(
   m_connected = true;
   dptr = dp;
   *m_instance_ptr = dptr;
-  LOGCONFIG("Starting the GemFire Native Client");
+  LOGCONFIG("Starting the Geode Native Client");
 
   return dptr;
 }
@@ -373,7 +372,7 @@ void DistributedSystem::disconnect() {
   // Free up library resources
   CppCacheLibrary::closeLib();
 
-  LOGCONFIG("Stopped the GemFire Native Client");
+  LOGCONFIG("Stopped the Geode Native Client");
 
   Log::close();
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/DistributedSystemImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/DistributedSystemImpl.hpp b/src/cppcache/src/DistributedSystemImpl.hpp
index 15fed6b..78f59a7 100644
--- a/src/cppcache/src/DistributedSystemImpl.hpp
+++ b/src/cppcache/src/DistributedSystemImpl.hpp
@@ -46,7 +46,7 @@ class SystemProperties;
 
 /**
 * @class DistributedSystemImpl DistributedSystemImpl.hpp
-* A "connection" to a GemFire distributed system.
+* A "connection" to a Geode distributed system.
 * The connection will be through a (host, port) pair.
 */
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ExceptionTypes.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExceptionTypes.cpp b/src/cppcache/src/ExceptionTypes.cpp
index 9a2979c..ea03c72 100644
--- a/src/cppcache/src/ExceptionTypes.cpp
+++ b/src/cppcache/src/ExceptionTypes.cpp
@@ -40,7 +40,7 @@ void GfErrTypeThrowException(const char* str, GfErrType err) {
   switch (err) {
     case GF_NOTCON: {
       NotConnectedException ex(
-          str, (exMsg != NULL ? exMsg : ": not connected to GemFire"));
+          str, (exMsg != NULL ? exMsg : ": not connected to Geode"));
       setTSSExceptionMessage(NULL);
       throw ex;
     }
@@ -124,7 +124,7 @@ void GfErrTypeThrowException(const char* str, GfErrType err) {
       throw ex;
     }
     case GF_IOERR: {
-      GemfireIOException ex(
+      GeodeIOException ex(
           str, (exMsg != NULL ? exMsg : ": Input/Output error in operation"));
       setTSSExceptionMessage(NULL);
       throw ex;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ExecutionImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ExecutionImpl.cpp b/src/cppcache/src/ExecutionImpl.cpp
index 0d101db..9b1b6a1 100644
--- a/src/cppcache/src/ExecutionImpl.cpp
+++ b/src/cppcache/src/ExecutionImpl.cpp
@@ -155,7 +155,7 @@ ResultCollectorPtr ExecutionImpl::execute(const char* fn, uint32_t timeout,
 
   LOGDEBUG("ExecutionImpl::execute: isHAHasResultOptimizeForWrite = %d",
            isHAHasResultOptimizeForWrite);
-  TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+  TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
 
   if (txState != NULL && m_allServer == true) {
     throw UnsupportedOperationException(

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
index f23898a..1267ae2 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
@@ -45,7 +45,7 @@ InternalCacheTransactionManager2PCImpl::
 
 void InternalCacheTransactionManager2PCImpl::prepare() {
   try {
-    TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_gemfireTSSTXState;
+    TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_geodeTSSTXState;
     TXState* txState = txStateWrapper->getTXState();
 
     if (txState == NULL) {
@@ -120,7 +120,7 @@ void InternalCacheTransactionManager2PCImpl::rollback() {
 
 void InternalCacheTransactionManager2PCImpl::afterCompletion(int32_t status) {
   try {
-    TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_gemfireTSSTXState;
+    TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_geodeTSSTXState;
     TXState* txState = txStateWrapper->getTXState();
 
     if (txState == NULL) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/LocalRegion.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocalRegion.cpp b/src/cppcache/src/LocalRegion.cpp
index 8adc23c..57b582c 100644
--- a/src/cppcache/src/LocalRegion.cpp
+++ b/src/cppcache/src/LocalRegion.cpp
@@ -742,7 +742,7 @@ void LocalRegion::release(bool invokeCallbacks) {
 * @return true if there is an entry in this region for the specified key
 *@throw RegionDestroyedException,  if region is destroyed.
 *@throw IllegalArgumentException, if the key is 'null'.
-*@throw NotConnectedException, if not connected to gemfire system.
+*@throw NotConnectedException, if not connected to geode system.
 */
 bool LocalRegion::containsKey_internal(const CacheableKeyPtr& keyPtr) const {
   if (keyPtr == NULLPTR) {
@@ -1047,7 +1047,7 @@ class PutActions {
   TXState* m_txState;
 
   inline explicit PutActions(LocalRegion& region) : m_region(region) {
-    m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+    m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
   }
 
   inline static const char* name() { return "Region::put"; }
@@ -1138,7 +1138,7 @@ class CreateActions {
   TXState* m_txState;
 
   inline explicit CreateActions(LocalRegion& region) : m_region(region) {
-    m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+    m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
   }
 
   inline static const char* name() { return "Region::create"; }
@@ -1206,7 +1206,7 @@ class DestroyActions {
   TXState* m_txState;
 
   inline explicit DestroyActions(LocalRegion& region) : m_region(region) {
-    m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+    m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
   }
 
   inline static const char* name() { return "Region::destroy"; }
@@ -1322,7 +1322,7 @@ class RemoveActions {
 
   inline explicit RemoveActions(LocalRegion& region)
       : m_region(region), m_ServerResponse(GF_ENOENT) {
-    m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+    m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
     allowNULLValue = false;
   }
 
@@ -1542,7 +1542,7 @@ class InvalidateActions {
   TXState* m_txState;
 
   inline explicit InvalidateActions(LocalRegion& region) : m_region(region) {
-    m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+    m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
   }
 
   inline static const char* name() { return "Region::invalidate"; }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/LocalRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/LocalRegion.hpp b/src/cppcache/src/LocalRegion.hpp
index e5a8945..128b119 100644
--- a/src/cppcache/src/LocalRegion.hpp
+++ b/src/cppcache/src/LocalRegion.hpp
@@ -391,7 +391,7 @@ class CPPCACHE_EXPORT LocalRegion : public RegionInternal {
   void setPool(const PoolPtr& p) { m_attachedPool = p; }
 
   TXState* getTXState() const {
-    return TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+    return TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
   }
 
   CacheablePtr handleReplay(GfErrType& err, CacheablePtr value) const;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/Log.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Log.cpp b/src/cppcache/src/Log.cpp
index c2a17ed..972452a 100644
--- a/src/cppcache/src/Log.cpp
+++ b/src/cppcache/src/Log.cpp
@@ -71,8 +71,8 @@ std::string* g_logFileWithExt = NULL;
 size_t g_bytesWritten = 0;
 bool g_isLogFileOpened = false;
 
-size_t g_fileSizeLimit = GEMFIRE_MAX_LOG_FILE_LIMIT;
-size_t g_diskSpaceLimit = GEMFIRE_MAX_LOG_DISK_LIMIT;
+size_t g_fileSizeLimit = GEODE_MAX_LOG_FILE_LIMIT;
+size_t g_diskSpaceLimit = GEODE_MAX_LOG_DISK_LIMIT;
 
 char g_logFileNameBuffer[2048] = {0};
 
@@ -204,12 +204,12 @@ void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
   if (g_logMutex == NULL) g_logMutex = new ACE_Thread_Mutex("Log::logMutex");
 
   if (logDiskSpaceLimit <
-      0 /*|| logDiskSpaceLimit > GEMFIRE_MAX_LOG_DISK_LIMIT*/) {
-    logDiskSpaceLimit = GEMFIRE_MAX_LOG_DISK_LIMIT;
+      0 /*|| logDiskSpaceLimit > GEODE_MAX_LOG_DISK_LIMIT*/) {
+    logDiskSpaceLimit = GEODE_MAX_LOG_DISK_LIMIT;
   }
 
-  if (logFileLimit < 0 || logFileLimit > GEMFIRE_MAX_LOG_FILE_LIMIT) {
-    logFileLimit = GEMFIRE_MAX_LOG_FILE_LIMIT;
+  if (logFileLimit < 0 || logFileLimit > GEODE_MAX_LOG_FILE_LIMIT) {
+    logFileLimit = GEODE_MAX_LOG_FILE_LIMIT;
   }
 
   ACE_Guard<ACE_Thread_Mutex> guard(*g_logMutex);
@@ -417,7 +417,7 @@ void Log::init(LogLevel level, const char* logFileName, int32 logFileLimit,
       if (renameResult < 0) {
         std::string msg = "Could not rename: " +
           *g_logFileWithExt + " to: " + rollFile;
-        throw GemfireIOException(msg.c_str());
+        throw GeodeIOException(msg.c_str());
       }
       */
     }
@@ -462,7 +462,7 @@ void Log::writeBanner() {
   if (GF_FILEEXISTS(dirname) != 0 && ACE_OS::mkdir(dirname) != 0) {
     std::string msg =
         "Error in creating directories for: " + std::string(dirname);
-    throw GemfireIOException(msg.c_str());
+    throw GeodeIOException(msg.c_str());
   }
   // retry some number of times before giving up when file is busy etc.
   int maxTries = 10;
@@ -488,7 +488,7 @@ void Log::writeBanner() {
     g_isLogFileOpened = false;
     return;
     // std::string msg = "Error in opening log file: " + *g_logFile;
-    // throw GemfireIOException(msg.c_str());
+    // throw GeodeIOException(msg.c_str());
   } else {
     g_isLogFileOpened = true;
   }
@@ -509,7 +509,7 @@ void Log::writeBanner() {
     // we should be continue,
     // fclose( g_log );
     // std::string msg = "Error in writing banner to log file: " + *g_logFile;
-    // throw GemfireIOException(msg.c_str());
+    // throw GeodeIOException(msg.c_str());
     return;
   }
 
@@ -716,7 +716,7 @@ void Log::put(LogLevel level, const char* msg) {
                 ACE_OS::thr_self(), g_bytesWritten);*/
         // std::string msg =
         // "Could not rename: " + *g_logFileWithExt + " to: " + rollFile;
-        // throw GemfireIOException(msg.c_str());
+        // throw GeodeIOException(msg.c_str());
         return;  // no need to throw exception try next time
       }
 
@@ -799,7 +799,7 @@ void Log::put(LogLevel level, const char* msg) {
       g_log = NULL;
       // g_isLogFileOpened = false;
       // std::string msg = "Error in writing to log file: " + *g_logFile;
-      // throw GemfireIOException(msg.c_str());
+      // throw GeodeIOException(msg.c_str());
     } else {
       fflush(g_log);
     }
@@ -808,13 +808,13 @@ void Log::put(LogLevel level, const char* msg) {
 
 void Log::putThrow(LogLevel level, const char* msg, const Exception& ex) {
   char buf[128] = {0};
-  ACE_OS::snprintf(buf, 128, "GemFire exception %s thrown: ", ex.getName());
+  ACE_OS::snprintf(buf, 128, "Geode exception %s thrown: ", ex.getName());
   put(level, (std::string(buf) + ex.getMessage() + "\n" + msg).c_str());
 }
 
 void Log::putCatch(LogLevel level, const char* msg, const Exception& ex) {
   char buf[128] = {0};
-  ACE_OS::snprintf(buf, 128, "GemFire exception %s caught: ", ex.getName());
+  ACE_OS::snprintf(buf, 128, "Geode exception %s caught: ", ex.getName());
   put(level, (std::string(buf) + ex.getMessage() + "\n" + msg).c_str());
 }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/PdxInstanceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstanceImpl.hpp b/src/cppcache/src/PdxInstanceImpl.hpp
index 0536ae9..05a8f95 100644
--- a/src/cppcache/src/PdxInstanceImpl.hpp
+++ b/src/cppcache/src/PdxInstanceImpl.hpp
@@ -1019,7 +1019,7 @@ class CPPCACHE_EXPORT PdxInstanceImpl : public WritablePdxInstance {
 
   // From PdxSerializable
   /**
-   * @brief serialize this object in gemfire PDX format. This is an internal
+   * @brief serialize this object in geode PDX format. This is an internal
    * method.
    * @param PdxWriter to serialize the PDX object
    */

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/PdxType.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxType.cpp b/src/cppcache/src/PdxType.cpp
index 3b709cb..5b39d36 100644
--- a/src/cppcache/src/PdxType.cpp
+++ b/src/cppcache/src/PdxType.cpp
@@ -56,7 +56,7 @@ PdxType::PdxType() : Serializable() {
   m_pdxFieldTypes = new std::vector<PdxFieldTypePtr>();
   m_localToRemoteFieldMap = NULL;
   m_remoteToLocalFieldMap = NULL;
-  m_gemfireTypeId = 0;
+  m_geodeTypeId = 0;
   /* adongre
    * Coverity - II
    * CID 29288: Uninitialized scalar field (UNINIT_CTOR)
@@ -80,7 +80,7 @@ PdxType::PdxType(const char* pdxDomainClassName, bool isLocal)
   m_pdxFieldTypes = new std::vector<PdxFieldTypePtr>();
   m_localToRemoteFieldMap = NULL;
   m_remoteToLocalFieldMap = NULL;
-  m_gemfireTypeId = 0;
+  m_geodeTypeId = 0;
   /* adongre
    * Coverity - II
    * CID 29287: Uninitialized scalar field (UNINIT_CTOR)
@@ -104,8 +104,8 @@ void PdxType::toData(DataOutput& output) const {
   // m_noJavaClass
   output.writeBoolean(m_noJavaClass);
 
-  // m_gemfireTypeId
-  output.writeInt(m_gemfireTypeId);
+  // m_geodeTypeId
+  output.writeInt(m_geodeTypeId);
 
   // m_varLenFieldIdx
   output.writeInt(m_varLenFieldIdx);
@@ -136,7 +136,7 @@ Serializable* PdxType::fromData(DataInput& input) {
 
   input.readBoolean(&m_noJavaClass);
 
-  input.readInt(&m_gemfireTypeId);
+  input.readInt(&m_geodeTypeId);
 
   input.readInt(&m_varLenFieldIdx);
 
@@ -478,7 +478,7 @@ PdxTypePtr PdxType::isContains(PdxTypePtr first, PdxTypePtr second) {
 
 PdxTypePtr PdxType::clone() {
   PdxTypePtr clone(new PdxType(m_className, false));
-  clone->m_gemfireTypeId = 0;
+  clone->m_geodeTypeId = 0;
   clone->m_numberOfVarLenFields = m_numberOfVarLenFields;
 
   for (std::vector<PdxFieldTypePtr>::iterator it = m_pdxFieldTypes->begin();

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/PdxType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxType.hpp b/src/cppcache/src/PdxType.hpp
index 3c20afb..921f9b6 100644
--- a/src/cppcache/src/PdxType.hpp
+++ b/src/cppcache/src/PdxType.hpp
@@ -70,7 +70,7 @@ class PdxType : public Serializable,
 
   char* m_className;
 
-  int32 m_gemfireTypeId;
+  int32 m_geodeTypeId;
 
   bool m_isLocal;
 
@@ -163,9 +163,9 @@ class PdxType : public Serializable,
     return size;
   }
 
-  virtual int32 getTypeId() const { return m_gemfireTypeId; }
+  virtual int32 getTypeId() const { return m_geodeTypeId; }
 
-  virtual void setTypeId(int32 typeId) { m_gemfireTypeId = typeId; }
+  virtual void setTypeId(int32 typeId) { m_geodeTypeId = typeId; }
 
   int32 getNumberOfVarLenFields() const { return m_numberOfVarLenFields; }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ProxyRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRegion.hpp b/src/cppcache/src/ProxyRegion.hpp
index 3aa27cf..7756bf2 100644
--- a/src/cppcache/src/ProxyRegion.hpp
+++ b/src/cppcache/src/ProxyRegion.hpp
@@ -165,7 +165,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * @throws CacheServerException If an exception is received from the Java cache
   * server.
   *         Only for Native Client regions.
-  * @throws NotConnectedException if not connected to the gemfire system because
+  * @throws NotConnectedException if not connected to the geode system because
   * the client
   *         cannot establish usable connections to any of the servers given to
   * it
@@ -612,7 +612,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * and provides a user-defined argument to the <code>CacheListener</code>.
   * Invalidate only removes the value from the entry, the key is kept intact.
   * To completely remove the entry, destroy should be used.
-  * The invalidate is not propogated to the Gemfire cache server to which it is
+  * The invalidate is not propogated to the Geode cache server to which it is
   * connected with.
   * <p>Updates the {@link CacheStatistics::getLastAccessedTime} and
   * {@link CacheStatistics::getLastModifiedTime} for this region and the entry.
@@ -681,7 +681,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * Destroy removes
   * not only the value, but also the key and entry from this region.
   *
-  * The destroy is propogated to the Gemfire cache server to which it is
+  * The destroy is propogated to the Geode cache server to which it is
   * connected with. If the destroy fails due to an exception on server
   * throwing back <code>CacheServerException</code> or security exception,
   * then the local entry is still destroyed.
@@ -697,7 +697,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * @throws IllegalArgumentException if key is NULLPTR
   * @throws CacheWriterException if CacheWriter aborts the operation
   * @throws CacheListenerException if CacheListener throws an exception
-  * @throws CacheServerException If an exception is received from the Gemfire
+  * @throws CacheServerException If an exception is received from the Geode
   * cache server.
   *         Only for Native Client regions.
   * @throws NotConnectedException if it is not connected to the cache because
@@ -773,7 +773,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * remove removes
   * not only the value, but also the key and entry from this region.
   *
-  * The remove is propogated to the Gemfire cache server to which it is
+  * The remove is propogated to the Geode cache server to which it is
   * connected with. If the destroy fails due to an exception on server
   * throwing back <code>CacheServerException</code> or security exception,
   * then the local entry is still removed.
@@ -790,7 +790,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * @throws IllegalArgumentException if key is NULLPTR
   * @throws CacheWriterException if CacheWriter aborts the operation
   * @throws CacheListenerException if CacheListener throws an exception
-  * @throws CacheServerException If an exception is received from the Gemfire
+  * @throws CacheServerException If an exception is received from the Geode
   * cache server.
   *         Only for Native Client regions.
   * @throws NotConnectedException if it is not connected to the cache because
@@ -847,7 +847,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * remove removes
   * not only the value, but also the key and entry from this region.
   *
-  * The remove is propogated to the Gemfire cache server to which it is
+  * The remove is propogated to the Geode cache server to which it is
   * connected with. If the destroy fails due to an exception on server
   * throwing back <code>CacheServerException</code> or security exception,
   * then the local entry is still removed.
@@ -863,7 +863,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * @throws IllegalArgumentException if key is NULLPTR
   * @throws CacheWriterException if CacheWriter aborts the operation
   * @throws CacheListenerException if CacheListener throws an exception
-  * @throws CacheServerException If an exception is received from the Gemfire
+  * @throws CacheServerException If an exception is received from the Geode
   * cache server.
   *         Only for Native Client regions.
   * @throws NotConnectedException if it is not connected to the cache because
@@ -1006,7 +1006,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   * distributed system.
   * The vector v will contain only the server keys. Any prior contents in the
   * vector will be removed.
-  * @throws CacheServerException If an exception is received from the Gemfire
+  * @throws CacheServerException If an exception is received from the Geode
   * cache server.
   *         Only for Native Client regions.
   * @throws NotConnectedException if it is not connected to the cache because
@@ -1046,7 +1046,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
 
   /**
   * This operations checks for the value in the local cache .
-  * It is not propagated to the Gemfire cache server
+  * It is not propagated to the Geode cache server
   * to which it is connected.
   */
   virtual bool containsValueForKey(const CacheableKeyPtr& keyPtr) const {
@@ -1057,7 +1057,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   /**
   * Convenience method allowing key to be a const char*
   * This operations checks for the value in the local cache .
-  * It is not propagated to the Gemfire cache server
+  * It is not propagated to the Geode cache server
   * to which it is connected.
   */
   template <class KEYTYPE>
@@ -1107,7 +1107,7 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
   /**
   * Convenience method allowing key to be a const char*
   * This operations checks for the key in the local cache .
-  * It is not propagated to the Gemfire cache server
+  * It is not propagated to the Geode cache server
   * to which it is connected.
   */
   template <class KEYTYPE>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/PutAllPartialResultServerException.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResultServerException.hpp b/src/cppcache/src/PutAllPartialResultServerException.hpp
index dce27fd..a5233a2 100644
--- a/src/cppcache/src/PutAllPartialResultServerException.hpp
+++ b/src/cppcache/src/PutAllPartialResultServerException.hpp
@@ -35,7 +35,7 @@ typedef SharedPtr<PutAllPartialResultServerException>
 
 /**
  * @brief PutAllPartialResultServerException class is used to encapsulate
- *gemfire PutAllPartialResultServerException in case of PutAll execution.
+ *geode PutAllPartialResultServerException in case of PutAll execution.
  **/
 class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
   /**
@@ -123,7 +123,7 @@ class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
   virtual int8_t typeId() const;
 
   /**
-  *@brief return as CacheableStringPtr the Exception name returned from gemfire
+  *@brief return as CacheableStringPtr the Exception name returned from geode
   *sendException api.
   **/
   CacheableStringPtr getName() {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/RemoteQueryService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQueryService.cpp b/src/cppcache/src/RemoteQueryService.cpp
index f176685..791f13d 100644
--- a/src/cppcache/src/RemoteQueryService.cpp
+++ b/src/cppcache/src/RemoteQueryService.cpp
@@ -65,8 +65,8 @@ QueryPtr RemoteQueryService::newQuery(const char* querystring) {
     return QueryPtr(
         new RemoteQuery(querystring, RemoteQueryServicePtr(this), m_tccdm));
   } else {
-    UserAttributesPtr ua = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
-                               ->getUserAttributes();
+    UserAttributesPtr ua =
+        TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes();
     TryReadGuard guard(m_rwLock, m_invalid);
 
     if (m_invalid) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/SerializationRegistry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SerializationRegistry.cpp b/src/cppcache/src/SerializationRegistry.cpp
index d17a5e2..730c126 100644
--- a/src/cppcache/src/SerializationRegistry.cpp
+++ b/src/cppcache/src/SerializationRegistry.cpp
@@ -103,7 +103,7 @@ class TheTypeMap : private NonCopyable, private NonAssignable {
   }
 
   inline void setup() {
-    // Register GemFire builtins here!!
+    // Register Geode builtins here!!
     // update type ids in GeodeTypeIds.hpp
 
     bind(CacheableByte::createDeserializable);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/StackFrame.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackFrame.hpp b/src/cppcache/src/StackFrame.hpp
index 933e4b0..d57f0d4 100644
--- a/src/cppcache/src/StackFrame.hpp
+++ b/src/cppcache/src/StackFrame.hpp
@@ -103,7 +103,7 @@ class StackFrame {
     /*
     This code receives a stacktrace line in the forms:
 
-    /export/hoth2/framework/lib/debug/libeventtest.so(_ZN7gemfire13testframework9EventTest17doEventOperationsEv+0x4a0)
+    /export/hoth2/framework/lib/debug/libeventtest.so(_ZN7geode13testframework9EventTest17doEventOperationsEv+0x4a0)
     [0x93a1a0]
     /export/hoth2/framework/lib/debug/libeventtest.so(doRegionOperations+0x13d)
     [0x92c9e3]

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/SystemProperties.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SystemProperties.cpp b/src/cppcache/src/SystemProperties.cpp
index 20f1a46..709f9dd 100644
--- a/src/cppcache/src/SystemProperties.cpp
+++ b/src/cppcache/src/SystemProperties.cpp
@@ -314,7 +314,7 @@ SystemProperties::~SystemProperties() {
 
 void SystemProperties::throwError(const char* msg) {
   LOGERROR(msg);
-  throw GemfireConfigException(msg);
+  throw GeodeConfigException(msg);
 }
 
 void SystemProperties::processProperty(const char* property,
@@ -747,7 +747,7 @@ void SystemProperties::processProperty(const char* property,
 void SystemProperties::logSettings() {
   // *** PLEASE ADD IN ALPHABETICAL ORDER - USER VISIBLE ***
 
-  std::string settings = "GemFire Native Client System Properties:";
+  std::string settings = "Geode Native Client System Properties:";
 
   char buf[2048];
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TSSTXStateWrapper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TSSTXStateWrapper.cpp b/src/cppcache/src/TSSTXStateWrapper.cpp
index 1f2a685..f4c2d45 100644
--- a/src/cppcache/src/TSSTXStateWrapper.cpp
+++ b/src/cppcache/src/TSSTXStateWrapper.cpp
@@ -27,7 +27,7 @@
 namespace apache {
 namespace geode {
 namespace client {
-ACE_TSS<TSSTXStateWrapper> TSSTXStateWrapper::s_gemfireTSSTXState;
+ACE_TSS<TSSTXStateWrapper> TSSTXStateWrapper::s_geodeTSSTXState;
 
 TSSTXStateWrapper::TSSTXStateWrapper() { m_txState = NULL; }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TSSTXStateWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TSSTXStateWrapper.hpp b/src/cppcache/src/TSSTXStateWrapper.hpp
index f2d9621..fcadf43 100644
--- a/src/cppcache/src/TSSTXStateWrapper.hpp
+++ b/src/cppcache/src/TSSTXStateWrapper.hpp
@@ -40,7 +40,7 @@ class TSSTXStateWrapper {
   TSSTXStateWrapper();
   virtual ~TSSTXStateWrapper();
 
-  static ACE_TSS<TSSTXStateWrapper> s_gemfireTSSTXState;
+  static ACE_TSS<TSSTXStateWrapper> s_geodeTSSTXState;
   TXState* getTXState() { return m_txState; }
   void setTXState(TXState* conn) { m_txState = conn; }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TXCleaner.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXCleaner.cpp b/src/cppcache/src/TXCleaner.cpp
index 2aafea5..3c9a0fc 100644
--- a/src/cppcache/src/TXCleaner.cpp
+++ b/src/cppcache/src/TXCleaner.cpp
@@ -28,7 +28,7 @@ namespace geode {
 namespace client {
 
 TXCleaner::TXCleaner(CacheTransactionManagerImpl* cacheTxMgr) {
-  m_txStateWrapper = TSSTXStateWrapper::s_gemfireTSSTXState;
+  m_txStateWrapper = TSSTXStateWrapper::s_geodeTSSTXState;
   m_txState = m_txStateWrapper->getTXState();
   m_cacheTxMgr = cacheTxMgr;
 }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TXState.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TXState.cpp b/src/cppcache/src/TXState.cpp
index 5b25fcf..d500c34 100644
--- a/src/cppcache/src/TXState.cpp
+++ b/src/cppcache/src/TXState.cpp
@@ -110,7 +110,7 @@ void TXState::releaseStickyConnection() {
   // Since this is called during cleanup or through destructor, we should not
   // throw exception from here,
   // which can cause undefined cleanup.
-  TcrConnection* conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+  TcrConnection* conn = TssConnectionWrapper::s_geodeTSSConn->getConnection();
   if (conn != NULL) {
     ThinClientPoolDM* dm = conn->getEndpointObject()->getPoolHADM();
     if (dm != NULL) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TcpConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index 1a4583b..d6b469a 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -123,7 +123,7 @@ void TcpConn::init() {
     char msg[256];
     ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
                      lastError, ACE_OS::strerror(lastError));
-    throw GemfireIOException(msg);
+    throw GeodeIOException(msg);
   }
 
   clearNagle(sock);
@@ -208,7 +208,7 @@ void TcpConn::listen(ACE_INET_Addr addr, uint32_t waitSeconds) {
     }
     ACE_OS::snprintf(msg, 256, "TcpConn::listen failed with errno: %d: %s",
                      lastError, ACE_OS::strerror(lastError));
-    throw GemfireIOException(msg);
+    throw GeodeIOException(msg);
   }
 }
 
@@ -270,7 +270,7 @@ void TcpConn::connect() {
                      lastError, ACE_OS::strerror(lastError));
     //  this is only called by constructor, so we must delete m_io
     GF_SAFE_DELETE(m_io);
-    throw GemfireIOException(msg);
+    throw GeodeIOException(msg);
   }
   int rc = this->m_io->enable(ACE_NONBLOCK);
   if (-1 == rc) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TcpSslConn.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcpSslConn.cpp b/src/cppcache/src/TcpSslConn.cpp
index fc452c1..bbd055d 100644
--- a/src/cppcache/src/TcpSslConn.cpp
+++ b/src/cppcache/src/TcpSslConn.cpp
@@ -90,7 +90,7 @@ void TcpSslConn::listen(ACE_INET_Addr addr, uint32_t waitSeconds) {
     // ACE_OS::strerror(lastError) );
     ACE_OS::snprintf(msg, 255, "TcpSslConn::listen failed with errno: %d: %s",
                      lastError, ACE_OS::strerror(lastError));
-    throw GemfireIOException(msg);
+    throw GeodeIOException(msg);
   }
 }
 
@@ -131,7 +131,7 @@ void TcpSslConn::connect() {
                      lastError, ACE_OS::strerror(lastError));
     // this is only called by constructor, so we must delete m_ssl
     GF_SAFE_DELETE(m_ssl);
-    throw GemfireIOException(msg);
+    throw GeodeIOException(msg);
   }
 }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TcrConnection.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrConnection.cpp b/src/cppcache/src/TcrConnection.cpp
index 04178c2..2875f99 100644
--- a/src/cppcache/src/TcrConnection.cpp
+++ b/src/cppcache/src/TcrConnection.cpp
@@ -399,8 +399,8 @@ bool TcrConnection::InitTcrConnection(
               "connection timed out during diffie-hellman handshake"));
         } else {
           throwException(
-              GemfireIOException("TcrConnection::TcrConnection: "
-                                 "Handshake failure during diffie-hellman"));
+              GeodeIOException("TcrConnection::TcrConnection: "
+                               "Handshake failure during diffie-hellman"));
         }
       }
     }
@@ -553,7 +553,7 @@ bool TcrConnection::InitTcrConnection(
           "TcrConnection::TcrConnection: "
           "connection timed out during handshake");
     } else {
-      throw GemfireIOException(
+      throw GeodeIOException(
           "TcrConnection::TcrConnection: "
           "Handshake failure");
     }
@@ -884,7 +884,7 @@ void TcrConnection::send(uint32_t& timeSpent, const char* buffer, int len,
           TimeoutException("TcrConnection::send: connection timed out"));
     } else {
       throwException(
-          GemfireIOException("TcrConnection::send: connection failure"));
+          GeodeIOException("TcrConnection::send: connection failure"));
     }
   }
 }
@@ -920,7 +920,7 @@ char* TcrConnection::readMessage(size_t* recvLen, uint32_t receiveTimeoutSec,
     //  the !isNotificationMessage ensures that notification channel
     // gets the TimeoutException when no data was received and is ignored by
     // notification channel; when data has been received then it throws
-    // GemfireIOException that causes the channel to close as required
+    // GeodeIOException that causes the channel to close as required
     if (error == CONN_NODATA ||
         (error == CONN_TIMEOUT && !isNotificationMessage)) {
       if (isNotificationMessage) {
@@ -937,7 +937,7 @@ char* TcrConnection::readMessage(size_t* recvLen, uint32_t receiveTimeoutSec,
         *opErr = CONN_IOERR;
         return NULL;
       }
-      throwException(GemfireIOException(
+      throwException(GeodeIOException(
           "TcrConnection::readMessage: "
           "connection failure while receiving message header"));
     }
@@ -978,7 +978,7 @@ char* TcrConnection::readMessage(size_t* recvLen, uint32_t receiveTimeoutSec,
   if (error != CONN_NOERR) {
     delete[] fullMessage;
     //  the !isNotificationMessage ensures that notification channel
-    // gets the GemfireIOException and not TimeoutException;
+    // gets the GeodeIOException and not TimeoutException;
     // this is required since header has already been read meaning there could
     // be stale data on socket and so it should close the notification channel
     // while TimeoutException is normally ignored by notification channel
@@ -991,9 +991,9 @@ char* TcrConnection::readMessage(size_t* recvLen, uint32_t receiveTimeoutSec,
         *opErr = CONN_IOERR;
         return NULL;
       }
-      throwException(GemfireIOException(
-          "TcrConnection::readMessage: "
-          "connection failure while receiving message body"));
+      throwException(
+          GeodeIOException("TcrConnection::readMessage: "
+                           "connection failure while receiving message body"));
     }
   }
 
@@ -1046,7 +1046,7 @@ void TcrConnection::readMessageChunked(TcrMessageReply& reply,
           "TcrConnection::readMessageChunked: "
           "connection timed out while receiving message header"));
     } else {
-      throwException(GemfireIOException(
+      throwException(GeodeIOException(
           "TcrConnection::readMessageChunked: "
           "connection failure while receiving message header"));
     }
@@ -1107,7 +1107,7 @@ void TcrConnection::readMessageChunked(TcrMessageReply& reply,
               "TcrConnection::readMessageChunked: "
               "connection timed out while receiving chunk header"));
         } else {
-          throwException(GemfireIOException(
+          throwException(GeodeIOException(
               "TcrConnection::readMessageChunked: "
               "connection failure while receiving chunk header"));
         }
@@ -1144,9 +1144,9 @@ void TcrConnection::readMessageChunked(TcrMessageReply& reply,
             "TcrConnection::readMessageChunked: "
             "connection timed out while receiving chunk body"));
       } else {
-        throwException(GemfireIOException(
-            "TcrConnection::readMessageChunked: "
-            "connection failure while receiving chunk body"));
+        throwException(
+            GeodeIOException("TcrConnection::readMessageChunked: "
+                             "connection failure while receiving chunk body"));
       }
     }
 
@@ -1224,8 +1224,8 @@ CacheableBytesPtr TcrConnection::readHandshakeData(int32_t msgLength,
       GF_SAFE_DELETE_ARRAY(recvMessage);
       GF_SAFE_DELETE_CON(m_conn);
       throwException(
-          GemfireIOException("TcrConnection::TcrConnection: "
-                             "Handshake failure"));
+          GeodeIOException("TcrConnection::TcrConnection: "
+                           "Handshake failure"));
     }
   } else {
     return CacheableBytes::createNoCopy(reinterpret_cast<uint8_t*>(recvMessage),
@@ -1263,8 +1263,8 @@ CacheableBytesPtr TcrConnection::readHandshakeRawData(int32_t msgLength,
       GF_SAFE_DELETE_ARRAY(recvMessage);
       GF_SAFE_DELETE_CON(m_conn);
       throwException(
-          GemfireIOException("TcrConnection::TcrConnection: "
-                             "Handshake failure"));
+          GeodeIOException("TcrConnection::TcrConnection: "
+                           "Handshake failure"));
     }
     // not expected to be reached
     return NULLPTR;
@@ -1362,8 +1362,8 @@ void TcrConnection::readHandShakeBytes(int numberOfBytes,
       GF_SAFE_DELETE_ARRAY(recvMessage);
       GF_SAFE_DELETE_CON(m_conn);
       throwException(
-          GemfireIOException("TcrConnection::TcrConnection: "
-                             "Handshake failure"));
+          GeodeIOException("TcrConnection::TcrConnection: "
+                           "Handshake failure"));
     }
   }
 
@@ -1387,8 +1387,8 @@ int32_t TcrConnection::readHandShakeInt(uint32_t connectTimeout) {
       GF_SAFE_DELETE_ARRAY(recvMessage);
       GF_SAFE_DELETE_CON(m_conn);
       throwException(
-          GemfireIOException("TcrConnection::TcrConnection: "
-                             "Handshake failure"));
+          GeodeIOException("TcrConnection::TcrConnection: "
+                           "Handshake failure"));
     }
   }
 
@@ -1414,8 +1414,8 @@ CacheableStringPtr TcrConnection::readHandshakeString(uint32_t connectTimeout) {
     } else {
       LOGFINE("IO error receiving string typeid");
       throwException(
-          GemfireIOException("TcrConnection::TcrConnection: "
-                             "Handshake failure reading string type ID"));
+          GeodeIOException("TcrConnection::TcrConnection: "
+                           "Handshake failure reading string type ID"));
     }
   }
 
@@ -1438,8 +1438,8 @@ CacheableStringPtr TcrConnection::readHandshakeString(uint32_t connectTimeout) {
     default: {
       GF_SAFE_DELETE_CON(m_conn);
       throwException(
-          GemfireIOException("TcrConnection::TcrConnection: "
-                             "Handshake failure: Unexpected string type ID"));
+          GeodeIOException("TcrConnection::TcrConnection: "
+                           "Handshake failure: Unexpected string type ID"));
     }
   }
 
@@ -1467,8 +1467,8 @@ CacheableStringPtr TcrConnection::readHandshakeString(uint32_t connectTimeout) {
       GF_SAFE_DELETE_CON(m_conn);
       LOGFINE("IO error receiving string data");
       throwException(
-          GemfireIOException("TcrConnection::TcrConnection: "
-                             "Handshake failure reading string bytes"));
+          GeodeIOException("TcrConnection::TcrConnection: "
+                           "Handshake failure reading string bytes"));
     }
     // not expected to be reached
     return NULLPTR;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TcrConnection.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrConnection.hpp b/src/cppcache/src/TcrConnection.hpp
index 9a97fa8..3550c9a 100644
--- a/src/cppcache/src/TcrConnection.hpp
+++ b/src/cppcache/src/TcrConnection.hpp
@@ -152,7 +152,7 @@ class CPPCACHE_EXPORT TcrConnection {
   * @param      recvLen output parameter for length of the received message
   * @param      receiveTimeoutSec read timeout in sec
   * @return     byte arrary of response. '0' ended.
-  * @exception  GemfireIOException  if an I/O error occurs (socket failure).
+  * @exception  GeodeIOException  if an I/O error occurs (socket failure).
   * @exception  TimeoutException  if timeout happens at any of the 3 socket
   * operation: 1 write, 2 read
   */
@@ -169,7 +169,7 @@ class CPPCACHE_EXPORT TcrConnection {
   *             message vector, which will return chunked TcrMessage.
   *             sendTimeoutSec write timeout in sec
   *             receiveTimeoutSec read timeout in sec
-  * @exception  GemfireIOException  if an I/O error occurs (socket failure).
+  * @exception  GeodeIOException  if an I/O error occurs (socket failure).
   * @exception  TimeoutException  if timeout happens at any of the 3 socket
   * operation: 1 write, 2 read
   */
@@ -186,7 +186,7 @@ class CPPCACHE_EXPORT TcrConnection {
   *             len length of the data to send
   *             sendTimeoutSec write timeout in sec
   * @return     no return. Because it either succeeds, or throw exception.
-  * @exception  GemfireIOException  if an I/O error occurs (socket failure).
+  * @exception  GeodeIOException  if an I/O error occurs (socket failure).
   * @exception  TimeoutException  if timeout happens at any of the 3 socket
   * operation: 1 write, 2 read
   */
@@ -207,7 +207,7 @@ class CPPCACHE_EXPORT TcrConnection {
   * @param      recvLen output parameter for length of the received message
   * @param      receiveTimeoutSec read timeout in sec
   * @return     byte arrary of response. '0' ended.
-  * @exception  GemfireIOException  if an I/O error occurs (socket failure).
+  * @exception  GeodeIOException  if an I/O error occurs (socket failure).
   * @exception  TimeoutException  if timeout happens at any of the 3 socket
   * operation: 1 write, 2 read
   */
@@ -222,7 +222,7 @@ class CPPCACHE_EXPORT TcrConnection {
   * @param      receiveTimeoutSec read timeout in seconds
   * @param      doHeaderTimeoutRetries retry when header receive times out
   * @return     byte array of response. '0' ended.
-  * @exception  GemfireIOException  if an I/O error occurs (socket failure).
+  * @exception  GeodeIOException  if an I/O error occurs (socket failure).
   * @exception  TimeoutException  if timeout happens during read
   */
   char* readMessage(size_t* recvLen, uint32_t receiveTimeoutSec,
@@ -236,7 +236,7 @@ class CPPCACHE_EXPORT TcrConnection {
   * @param      reply response message
   * @param      receiveTimeoutSec read timeout in sec
   * @param      doHeaderTimeoutRetries retry when header receive times out
-  * @exception  GemfireIOException  if an I/O error occurs (socket failure).
+  * @exception  GeodeIOException  if an I/O error occurs (socket failure).
   * @exception  TimeoutException  if timeout happens during read
   */
   void readMessageChunked(TcrMessageReply& reply, uint32_t receiveTimeoutSec,

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TcrEndpoint.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrEndpoint.cpp b/src/cppcache/src/TcrEndpoint.cpp
index 46099c1..b80c0fc 100644
--- a/src/cppcache/src/TcrEndpoint.cpp
+++ b/src/cppcache/src/TcrEndpoint.cpp
@@ -237,7 +237,7 @@ GfErrType TcrEndpoint::createNewConnection(
       err = GF_TIMOUT;
       m_needToConnectInLock = true;  // while creating the connection
       apache::geode::client::millisleep(50);
-    } catch (const GemfireIOException& ex) {
+    } catch (const GeodeIOException& ex) {
       LOGINFO("IO error[%d] in handshake with endpoint[%s]: %s",
               ACE_OS::last_error(), m_name.c_str(), ex.getMessage());
       err = GF_IOERR;
@@ -696,12 +696,12 @@ int TcrEndpoint::receiveNotification(volatile bool& isRunning) {
       // If there is no notification, this exception is expected
       // But this is valid only when *no* data has been received
       // otherwise if data has been read then TcrConnection will throw
-      // a GemfireIOException which will cause the channel to close.
+      // a GeodeIOException which will cause the channel to close.
       LOGDEBUG(
           "receiveNotification timed out: no data received from "
           "endpoint %s",
           m_name.c_str());
-    } catch (const GemfireIOException& e) {
+    } catch (const GeodeIOException& e) {
       // Endpoint is disconnected, this exception is expected
       LOGFINER(
           "IO exception while receiving subscription event for endpoint %s: %s",
@@ -1000,7 +1000,7 @@ GfErrType TcrEndpoint::sendRequestWithRetry(
         // epFailure = true;
         failReason = "timed out waiting for endpoint";
         createNewConn = true;
-      } catch (const GemfireIOException& ex) {
+      } catch (const GeodeIOException& ex) {
         error = GF_IOERR;
         epFailure = true;
         failReason = "IO error for endpoint";

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/TcrMessage.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TcrMessage.cpp b/src/cppcache/src/TcrMessage.cpp
index b33d41c..71fd6d7 100644
--- a/src/cppcache/src/TcrMessage.cpp
+++ b/src/cppcache/src/TcrMessage.cpp
@@ -724,7 +724,7 @@ void TcrMessage::writeHeader(uint32_t msgType, uint32_t numOfParts) {
                                     // the end write the length at the (buffer +
                                     // 4) offset.
   m_request->writeInt(static_cast<int32_t>(numOfParts));
-  TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+  TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
   if (txState == NULL) {
     m_txId = -1;
   } else {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/04c53479/src/cppcache/src/ThinClientBaseDM.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ThinClientBaseDM.cpp b/src/cppcache/src/ThinClientBaseDM.cpp
index 2b5e381..0ff6726 100644
--- a/src/cppcache/src/ThinClientBaseDM.cpp
+++ b/src/cppcache/src/ThinClientBaseDM.cpp
@@ -281,7 +281,7 @@ void ThinClientBaseDM::beforeSendingRequest(const TcrMessage& request,
       uniqueId = conn->getEndpointObject()->getUniqueId();
     } else {
       UserAttributesPtr userAttribute =
-          TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+          TSSUserAttributesWrapper::s_geodeTSSUserAttributes
               ->getUserAttributes();
       connId = conn->getConnectionId();
       if (!(request.getMessageType() == TcrMessage::USER_CREDENTIAL_MESSAGE)) {
@@ -313,7 +313,7 @@ void ThinClientBaseDM::afterSendingRequest(const TcrMessage& request,
       if (TcrMessage::RESPONSE == reply.getMessageType()) {
         if (this->isMultiUserMode()) {
           UserAttributesPtr userAttribute =
-              TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+              TSSUserAttributesWrapper::s_geodeTSSUserAttributes
                   ->getUserAttributes();
           userAttribute->setConnectionAttributes(conn->getEndpointObject(),
                                                  reply.getUniqueId(conn));


Mime
View raw message