geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [05/50] [abbrv] geode git commit: GEODE-2316: Rename namespace gemfire to apache::geode::client.
Date Mon, 23 Jan 2017 19:16:57 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxInstantiator.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxInstantiator.hpp b/src/cppcache/src/PdxInstantiator.hpp
index 9f2d1a0..452177b 100644
--- a/src/cppcache/src/PdxInstantiator.hpp
+++ b/src/cppcache/src/PdxInstantiator.hpp
@@ -26,7 +26,9 @@
 
 #include <gfcpp/Serializable.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxInstantiator : public Serializable {
  private:
@@ -49,5 +51,7 @@ class PdxInstantiator : public Serializable {
 
   CacheableStringPtr toString() const;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* _GEMFIRE_PDXINSTANTIATOR_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxLocalReader.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalReader.cpp b/src/cppcache/src/PdxLocalReader.cpp
index 7911e3f..7e464ba 100644
--- a/src/cppcache/src/PdxLocalReader.cpp
+++ b/src/cppcache/src/PdxLocalReader.cpp
@@ -23,7 +23,9 @@
 #include "PdxLocalReader.hpp"
 #include "PdxTypeRegistry.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxLocalReader::PdxLocalReader()
     : m_dataInput(NULL),
@@ -377,4 +379,6 @@ PdxUnreadFieldsPtr PdxLocalReader::readUnreadFields() {
   m_isDataNeedToPreserve = false;
   return m_pdxRemotePreserveData;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxLocalReader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalReader.hpp b/src/cppcache/src/PdxLocalReader.hpp
index aa39fff..0777647 100644
--- a/src/cppcache/src/PdxLocalReader.hpp
+++ b/src/cppcache/src/PdxLocalReader.hpp
@@ -29,7 +29,9 @@
 #include <gfcpp/CacheableObjectArray.hpp>
 #include <gfcpp/CacheableDate.hpp>
 #include "PdxRemotePreservedData.hpp"
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxLocalReader : public PdxReader {
  protected:
@@ -216,5 +218,7 @@ class PdxLocalReader : public PdxReader {
   virtual PdxUnreadFieldsPtr readUnreadFields();
 };
 typedef SharedPtr<PdxLocalReader> PdxLocalReaderPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXLOCALREADER_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxLocalWriter.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalWriter.cpp b/src/cppcache/src/PdxLocalWriter.cpp
index c5ee878..beb4c40 100644
--- a/src/cppcache/src/PdxLocalWriter.cpp
+++ b/src/cppcache/src/PdxLocalWriter.cpp
@@ -27,7 +27,9 @@
 #include <gfcpp/CacheableEnum.hpp>
 #include "GemfireTypeIdsImpl.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /* adongre  - Coverity II
  * Non-static class member "m_currentOffsetIndex" is not initialized in this
@@ -526,4 +528,6 @@ uint8_t* PdxLocalWriter::getPdxStream(int& pdxLen) {
 }
 
 void PdxLocalWriter::writeByte(int8_t byte) { m_dataOutput->write(byte); }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxLocalWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxLocalWriter.hpp b/src/cppcache/src/PdxLocalWriter.hpp
index 711a842..a9708bc 100644
--- a/src/cppcache/src/PdxLocalWriter.hpp
+++ b/src/cppcache/src/PdxLocalWriter.hpp
@@ -31,7 +31,9 @@
 #include "PdxRemotePreservedData.hpp"
 #include <gfcpp/CacheableObjectArray.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxLocalWriter : public PdxWriter {
  protected:
@@ -337,5 +339,7 @@ class PdxLocalWriter : public PdxWriter {
   inline int32_t getStartPositionOffset() { return m_startPositionOffset; }
 };
 typedef SharedPtr<PdxLocalWriter> PdxLocalWriterPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXLOCALWRITER_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxReaderWithTypeCollector.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxReaderWithTypeCollector.cpp b/src/cppcache/src/PdxReaderWithTypeCollector.cpp
index 523d190..baf006e 100644
--- a/src/cppcache/src/PdxReaderWithTypeCollector.cpp
+++ b/src/cppcache/src/PdxReaderWithTypeCollector.cpp
@@ -26,7 +26,9 @@
 #include <gfcpp/PdxFieldTypes.hpp>
 #include <ace/OS_NS_stdio.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxReaderWithTypeCollector::PdxReaderWithTypeCollector(DataInput& dataInput,
                                                        PdxTypePtr pdxType,
@@ -619,10 +621,12 @@ CacheableDatePtr PdxReaderWithTypeCollector::readDate(const char* fieldName) {
 
 void PdxReaderWithTypeCollector::readCollection(
     const char* fieldName, CacheableArrayListPtr& collection) {
-  checkType(fieldName, gemfire::GemfireTypeIds::CacheableArrayList,
+  checkType(fieldName,
+            apache::geode::client::GemfireTypeIds::CacheableArrayList,
             "Collection");
   m_newPdxType->addVariableLengthTypeField(
-      fieldName, "Collection", gemfire::GemfireTypeIds::CacheableArrayList);
+      fieldName, "Collection",
+      apache::geode::client::GemfireTypeIds::CacheableArrayList);
   int position = m_pdxType->getFieldPosition(fieldName, m_offsetsBuffer,
                                              m_offsetSize, m_serializedLength);
   LOGDEBUG("PdxReaderWithTypeCollector::readCollection() position = %d",
@@ -635,4 +639,6 @@ void PdxReaderWithTypeCollector::readCollection(
     collection = NULLPTR;
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxReaderWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxReaderWithTypeCollector.hpp b/src/cppcache/src/PdxReaderWithTypeCollector.hpp
index 2111a03..4530012 100644
--- a/src/cppcache/src/PdxReaderWithTypeCollector.hpp
+++ b/src/cppcache/src/PdxReaderWithTypeCollector.hpp
@@ -26,7 +26,9 @@
 
 #include "PdxLocalReader.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxReaderWithTypeCollector : public PdxLocalReader {
  private:
@@ -177,6 +179,8 @@ class PdxReaderWithTypeCollector : public PdxLocalReader {
                               CacheableArrayListPtr& collection);
 };
 typedef SharedPtr<PdxReaderWithTypeCollector> PdxReaderWithTypeCollectorPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* PDXREADERWITHTYPECOLLECTOR_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxRemotePreservedData.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemotePreservedData.hpp b/src/cppcache/src/PdxRemotePreservedData.hpp
index 89e756e..33ff5f3 100644
--- a/src/cppcache/src/PdxRemotePreservedData.hpp
+++ b/src/cppcache/src/PdxRemotePreservedData.hpp
@@ -27,7 +27,9 @@
 #include <gfcpp/PdxUnreadFields.hpp>
 #include <vector>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class PdxRemotePreservedData;
 typedef SharedPtr<PdxRemotePreservedData> PdxRemotePreservedDataPtr;
 
@@ -112,5 +114,7 @@ class PdxRemotePreservedData : public PdxUnreadFields {
     return 0;
   }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxRemoteReader.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemoteReader.cpp b/src/cppcache/src/PdxRemoteReader.cpp
index 2fa9d48..b085347 100644
--- a/src/cppcache/src/PdxRemoteReader.cpp
+++ b/src/cppcache/src/PdxRemoteReader.cpp
@@ -24,7 +24,9 @@
 #include "PdxRemoteReader.hpp"
 #include "PdxTypes.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxRemoteReader::~PdxRemoteReader() {
   // TODO Auto-generated destructor stub
@@ -1055,4 +1057,6 @@ void PdxRemoteReader::readCollection(const char* fieldName,
     }
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxRemoteReader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemoteReader.hpp b/src/cppcache/src/PdxRemoteReader.hpp
index 851190b..2a7eb9e 100644
--- a/src/cppcache/src/PdxRemoteReader.hpp
+++ b/src/cppcache/src/PdxRemoteReader.hpp
@@ -25,7 +25,9 @@
 
 #include "PdxLocalReader.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxRemoteReader : public PdxLocalReader {
  private:
@@ -211,5 +213,7 @@ class PdxRemoteReader : public PdxLocalReader {
                               CacheableArrayListPtr& collection);
 };
 typedef SharedPtr<PdxRemoteReader> PdxRemoteReaderPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXREMOTEREADER_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxRemoteWriter.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemoteWriter.cpp b/src/cppcache/src/PdxRemoteWriter.cpp
index fb63405..b1496ab 100644
--- a/src/cppcache/src/PdxRemoteWriter.cpp
+++ b/src/cppcache/src/PdxRemoteWriter.cpp
@@ -24,7 +24,9 @@
 #include "PdxRemoteWriter.hpp"
 #include "PdxTypeRegistry.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /* adongre
  * Coverity - II
  * Non-static class member "m_currentDataIdx" is not initialized in this
@@ -321,4 +323,6 @@ PdxWriterPtr PdxRemoteWriter::writeArrayOfByteArrays(const char* fieldName,
                                          elementLength);
   return PdxWriterPtr(this);
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxRemoteWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxRemoteWriter.hpp b/src/cppcache/src/PdxRemoteWriter.hpp
index 4284c86..da05bb9 100644
--- a/src/cppcache/src/PdxRemoteWriter.hpp
+++ b/src/cppcache/src/PdxRemoteWriter.hpp
@@ -26,7 +26,9 @@
 
 #include "PdxLocalWriter.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxRemoteWriter : public PdxLocalWriter {
  private:
@@ -233,5 +235,7 @@ class PdxRemoteWriter : public PdxLocalWriter {
                                               int* elementLength);
 };
 typedef SharedPtr<PdxRemoteWriter> PdxRemoteWriterPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXREMOTEWRITER_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxSerializable.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxSerializable.cpp b/src/cppcache/src/PdxSerializable.cpp
index 053fc64..1ccc85e 100644
--- a/src/cppcache/src/PdxSerializable.cpp
+++ b/src/cppcache/src/PdxSerializable.cpp
@@ -27,7 +27,9 @@
 #include <PdxHelper.hpp>
 #include <gfcpp/CacheableKeys.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 PdxSerializable::PdxSerializable() {}
 
 PdxSerializable::~PdxSerializable() {}
@@ -57,6 +59,8 @@ bool PdxSerializable::operator==(const CacheableKey& other) const {
 
 uint32_t PdxSerializable::hashcode() const {
   uint64_t hash = static_cast<uint64_t>((intptr_t)this);
-  return gemfire::serializer::hashcode(hash);
+  return apache::geode::client::serializer::hashcode(hash);
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxType.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxType.cpp b/src/cppcache/src/PdxType.cpp
index 628f555..4e98213 100644
--- a/src/cppcache/src/PdxType.cpp
+++ b/src/cppcache/src/PdxType.cpp
@@ -30,7 +30,9 @@
 #include "PdxHelper.hpp"
 #include <ace/OS.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 const char* PdxType::m_javaPdxClass = "org.apache.geode.pdx.internal.PdxType";
 
@@ -626,4 +628,6 @@ bool PdxType::Equals(PdxTypePtr otherObj) {
 bool PdxType::operator<(const PdxType& other) const {
   return ACE_OS::strcmp(this->m_className, other.m_className) < 0;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxType.hpp b/src/cppcache/src/PdxType.hpp
index d33c9f2..4c6cd1a 100644
--- a/src/cppcache/src/PdxType.hpp
+++ b/src/cppcache/src/PdxType.hpp
@@ -37,7 +37,9 @@
 
 #include "NonCopyable.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 typedef std::map<std::string, PdxFieldTypePtr> NameVsPdxType;
 class PdxType;
@@ -45,12 +47,12 @@ typedef SharedPtr<PdxType> PdxTypePtr;
 /* adongre
  * Coverity - II
  * CID 29178: Other violation (MISSING_COPY)
- * Class "gemfire::PdxType" owns resources that are managed
+ * Class "apache::geode::client::PdxType" owns resources that are managed
  * in its constructor and destructor but has no user-written copy constructor.
  * Fix : Make the class Non Copyable
  *
  * CID 29173: Other violation (MISSING_ASSIGN)
- * Class "gemfire::PdxType" owns resources that are managed in its
+ * Class "apache::geode::client::PdxType" owns resources that are managed in its
  * constructor and destructor but has no user-written assignment operator.
  * Fix : Make the class Non Assignable
  */
@@ -219,5 +221,7 @@ class PdxType : public Serializable,
   // This is for PdxType as key in std map.
   bool operator<(const PdxType& other) const;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXTYPE_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxTypeRegistry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxTypeRegistry.cpp b/src/cppcache/src/PdxTypeRegistry.cpp
index 5f321f2..2858040 100644
--- a/src/cppcache/src/PdxTypeRegistry.cpp
+++ b/src/cppcache/src/PdxTypeRegistry.cpp
@@ -24,7 +24,9 @@
 #include "PdxTypeRegistry.hpp"
 #include "SerializationRegistry.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 TypeIdVsPdxType* PdxTypeRegistry::typeIdToPdxType = NULL;
 
@@ -66,7 +68,8 @@ void PdxTypeRegistry::init() {
   intToEnum = CacheableHashMap::create();
   pdxTypeToTypeIdMap = new PdxTypeToTypeIdMap();
   /*}catch(const std::bad_alloc&){
-  throw gemfire::OutOfMemoryException( "Out of Memory while executing new in
+  throw apache::geode::client::OutOfMemoryException( "Out of Memory while
+  executing new in
   PdxTypeRegistry::init()");
   }*/
 }
@@ -299,4 +302,6 @@ EnumInfoPtr PdxTypeRegistry::getEnum(int32_t enumVal) {
   intToEnum = tmp;
   return ret;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxTypeRegistry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxTypeRegistry.hpp b/src/cppcache/src/PdxTypeRegistry.hpp
index c974f33..c54d5ec 100644
--- a/src/cppcache/src/PdxTypeRegistry.hpp
+++ b/src/cppcache/src/PdxTypeRegistry.hpp
@@ -34,7 +34,9 @@
 #include "EnumInfo.hpp"
 #include "PreservedDataExpiryHandler.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 struct PdxTypeLessThan {
   bool operator()(PdxTypePtr const& n1, PdxTypePtr const& n2) const {
@@ -138,5 +140,7 @@ class CPPCACHE_EXPORT PdxTypeRegistry {
  private:
   static PdxTypeToTypeIdMap* pdxTypeToTypeIdMap;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXTYPEREGISTRY_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxWrapper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxWrapper.cpp b/src/cppcache/src/PdxWrapper.cpp
index 6390c2e..0ededfd 100644
--- a/src/cppcache/src/PdxWrapper.cpp
+++ b/src/cppcache/src/PdxWrapper.cpp
@@ -26,7 +26,9 @@
 #include <PdxHelper.hpp>
 #include <SerializationRegistry.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxWrapper::PdxWrapper(void *userObject, const char *className) {
   m_userObject = userObject;
@@ -124,7 +126,7 @@ bool PdxWrapper::operator==(const CacheableKey &other) const {
 
 uint32_t PdxWrapper::hashcode() const {
   uint64_t hash = static_cast<uint64_t>((intptr_t)m_userObject);
-  return gemfire::serializer::hashcode(hash);
+  return apache::geode::client::serializer::hashcode(hash);
 }
 
 void PdxWrapper::toData(PdxWriterPtr output) {
@@ -171,5 +173,6 @@ PdxWrapper::~PdxWrapper() {
   }
   delete[] m_className;
 }
-
-} /* namespace gemfire */
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxWriterWithTypeCollector.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxWriterWithTypeCollector.cpp b/src/cppcache/src/PdxWriterWithTypeCollector.cpp
index 048b383..2b9b6e7 100644
--- a/src/cppcache/src/PdxWriterWithTypeCollector.cpp
+++ b/src/cppcache/src/PdxWriterWithTypeCollector.cpp
@@ -27,7 +27,9 @@
 #include "PdxTypes.hpp"
 #include <gfcpp/PdxFieldTypes.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PdxWriterWithTypeCollector::PdxWriterWithTypeCollector() {}
 
@@ -329,4 +331,6 @@ PdxWriterPtr PdxWriterWithTypeCollector::markIdentityField(
   pft->setIdentityField(true);
   return PdxWriterPtr(this);
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PdxWriterWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PdxWriterWithTypeCollector.hpp b/src/cppcache/src/PdxWriterWithTypeCollector.hpp
index 523ee14..d598d54 100644
--- a/src/cppcache/src/PdxWriterWithTypeCollector.hpp
+++ b/src/cppcache/src/PdxWriterWithTypeCollector.hpp
@@ -27,7 +27,9 @@
 #include "PdxLocalWriter.hpp"
 //#include <map>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PdxWriterWithTypeCollector : public PdxLocalWriter {
  private:
@@ -226,5 +228,7 @@ class PdxWriterWithTypeCollector : public PdxLocalWriter {
   virtual PdxWriterPtr writeUnreadFields(PdxUnreadFieldsPtr unread);
 };
 typedef SharedPtr<PdxWriterWithTypeCollector> PdxWriterWithTypeCollectorPtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif /* PDXWRITERWITHTYPECOLLECTOR_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PersistenceManager.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PersistenceManager.cpp b/src/cppcache/src/PersistenceManager.cpp
index 055500e..b78d775 100644
--- a/src/cppcache/src/PersistenceManager.cpp
+++ b/src/cppcache/src/PersistenceManager.cpp
@@ -18,7 +18,7 @@
 #include <gfcpp/PersistenceManager.hpp>
 #include <gfcpp/Region.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 PersistenceManager::PersistenceManager(const RegionPtr& regionPtr)
     : m_regionPtr(regionPtr) {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Pool.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Pool.cpp b/src/cppcache/src/Pool.cpp
index 33bdafe..ea63938 100644
--- a/src/cppcache/src/Pool.cpp
+++ b/src/cppcache/src/Pool.cpp
@@ -25,7 +25,7 @@
  * @file
  */
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 Pool::Pool(PoolAttributesPtr attr) : m_attrs(attr) {}
 Pool::~Pool() {}

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PoolAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolAttributes.cpp b/src/cppcache/src/PoolAttributes.cpp
index d22bca1..31be9dd 100644
--- a/src/cppcache/src/PoolAttributes.cpp
+++ b/src/cppcache/src/PoolAttributes.cpp
@@ -18,7 +18,7 @@
 #include <gfcpp/ExceptionTypes.hpp>
 #include <gfcpp/PoolFactory.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 PoolAttributes::PoolAttributes()
     : m_isThreadLocalConn(PoolFactory::DEFAULT_THREAD_LOCAL_CONN),

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PoolAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolAttributes.hpp b/src/cppcache/src/PoolAttributes.hpp
index 2f276dd..9218044 100644
--- a/src/cppcache/src/PoolAttributes.hpp
+++ b/src/cppcache/src/PoolAttributes.hpp
@@ -28,7 +28,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class PoolAttributes : public SharedBase {
  public:
   PoolAttributes();
@@ -154,7 +156,8 @@ class PoolAttributes : public SharedBase {
 
   friend class ThinClientPoolDM;
 };
-
-};  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_POOL_ATTRIBUTES_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PoolFactory.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolFactory.cpp b/src/cppcache/src/PoolFactory.cpp
index 9d928b7..74568f1 100644
--- a/src/cppcache/src/PoolFactory.cpp
+++ b/src/cppcache/src/PoolFactory.cpp
@@ -26,7 +26,7 @@
 #include <ace/INET_Addr.h>
 #include <ThinClientPoolStickyDM.hpp>
 #include <ThinClientPoolStickyHADM.hpp>
-using namespace gemfire;
+using namespace apache::geode::client;
 const char* PoolFactory::DEFAULT_SERVER_GROUP = "";
 extern HashMapOfPools* connectionPools;
 extern ACE_Recursive_Thread_Mutex connectionPoolsLock;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PoolManager.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolManager.cpp b/src/cppcache/src/PoolManager.cpp
index ba914a3..c964628 100644
--- a/src/cppcache/src/PoolManager.cpp
+++ b/src/cppcache/src/PoolManager.cpp
@@ -18,7 +18,7 @@
 #include <ace/Recursive_Thread_Mutex.h>
 #include <ace/Guard_T.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 // TODO: make this a member of TcrConnectionManager.
 HashMapOfPools* connectionPools = NULL; /*new HashMapOfPools( )*/

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PoolStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolStatistics.cpp b/src/cppcache/src/PoolStatistics.cpp
index 99f7beb..b007f83 100644
--- a/src/cppcache/src/PoolStatistics.cpp
+++ b/src/cppcache/src/PoolStatistics.cpp
@@ -25,7 +25,9 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 using namespace gemfire_statistics;
 
@@ -292,5 +294,6 @@ PoolStats::~PoolStats() {
     m_poolStats = NULL;
   }
 }
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PoolStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolStatistics.hpp b/src/cppcache/src/PoolStatistics.hpp
index 4adac2e..c4a2442 100644
--- a/src/cppcache/src/PoolStatistics.hpp
+++ b/src/cppcache/src/PoolStatistics.hpp
@@ -24,7 +24,9 @@
 #include <statistics/StatisticsManager.hpp>
 #include "SpinLock.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 using namespace gemfire_statistics;
 
@@ -241,6 +243,8 @@ class PoolStatType {
   int32_t getQueryExecutionId() { return m_queryExecutionsId; }
   int32_t getQueryExecutionTimeId() { return m_queryExecutionTimeId; }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_POOLSTATS_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PoolXmlCreation.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolXmlCreation.cpp b/src/cppcache/src/PoolXmlCreation.cpp
index 7318b5b..ecb42d6 100644
--- a/src/cppcache/src/PoolXmlCreation.cpp
+++ b/src/cppcache/src/PoolXmlCreation.cpp
@@ -17,7 +17,7 @@
 
 #include "PoolXmlCreation.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 /*
 void PoolXmlCreation::addLocator(const char * host, const char * port)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PoolXmlCreation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PoolXmlCreation.hpp b/src/cppcache/src/PoolXmlCreation.hpp
index ed1a078..b26c3f2 100644
--- a/src/cppcache/src/PoolXmlCreation.hpp
+++ b/src/cppcache/src/PoolXmlCreation.hpp
@@ -25,7 +25,9 @@
 #include "PoolXmlCreation.hpp"
 #include <gfcpp/PoolFactory.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class Cache;
 
 /**
@@ -79,5 +81,7 @@ class CPPCACHE_EXPORT PoolXmlCreation {
    */
   PoolPtr create();
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // #ifndef  _GEMFIRE_POOLXMLCREATION_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PooledBase.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PooledBase.cpp b/src/cppcache/src/PooledBase.cpp
index d98b549..c892eb3 100644
--- a/src/cppcache/src/PooledBase.cpp
+++ b/src/cppcache/src/PooledBase.cpp
@@ -25,7 +25,9 @@
 
 #include <typeinfo>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PooledBase::PooledBase(PooledBasePool* pool) : m_refCount(0), m_pool(pool) {
   GF_D_ASSERT(m_pool != NULL);
@@ -48,4 +50,6 @@ void PooledBase::releaseSB() const {
 void PooledBase::prePool() {}
 
 void PooledBase::postPool() {}
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PooledBase.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PooledBase.hpp b/src/cppcache/src/PooledBase.hpp
index 001c5d6..d47e15e 100644
--- a/src/cppcache/src/PooledBase.hpp
+++ b/src/cppcache/src/PooledBase.hpp
@@ -22,7 +22,9 @@
 
 #include <gfcpp/gfcpp_globals.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PooledBasePool;
 
@@ -55,7 +57,9 @@ class CPPCACHE_EXPORT PooledBase {
 
   void operator=(const PooledBase& rhs);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PooledBasePool.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PooledBasePool.hpp b/src/cppcache/src/PooledBasePool.hpp
index eb33931..99e6c15 100644
--- a/src/cppcache/src/PooledBasePool.hpp
+++ b/src/cppcache/src/PooledBasePool.hpp
@@ -23,7 +23,9 @@
 #include "PooledBase.hpp"
 #include <deque>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CPPCACHE_EXPORT PooledBasePool {
   SpinLock m_poolLock;
@@ -73,6 +75,8 @@ class CPPCACHE_EXPORT PooledBasePool {
     }
   }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PreservedDataExpiryHandler.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PreservedDataExpiryHandler.cpp b/src/cppcache/src/PreservedDataExpiryHandler.cpp
index 781c06e..be41284 100644
--- a/src/cppcache/src/PreservedDataExpiryHandler.cpp
+++ b/src/cppcache/src/PreservedDataExpiryHandler.cpp
@@ -30,7 +30,7 @@
 #include "PreservedDataExpiryHandler.hpp"
 #include "PdxTypeRegistry.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 PreservedDataExpiryHandler::PreservedDataExpiryHandler(
     PdxSerializablePtr pdxObjectPtr, uint32_t duration)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PreservedDataExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PreservedDataExpiryHandler.hpp b/src/cppcache/src/PreservedDataExpiryHandler.hpp
index 1c66de4..3f3feae 100644
--- a/src/cppcache/src/PreservedDataExpiryHandler.hpp
+++ b/src/cppcache/src/PreservedDataExpiryHandler.hpp
@@ -34,7 +34,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 // class CacheTransactionManagerImpl;
 /**
  * @class PreservedDataExpiryHandler
@@ -66,6 +68,8 @@ class CPPCACHE_EXPORT PreservedDataExpiryHandler : public ACE_Event_Handler {
   // UNUSED uint32_t m_duration;
   PdxSerializablePtr m_pdxObjectPtr;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* __PRESERVEDDATAEXPIRYHANDLER_HPP__*/

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Properties.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Properties.cpp b/src/cppcache/src/Properties.cpp
index 29cf17e..48a739d 100644
--- a/src/cppcache/src/Properties.cpp
+++ b/src/cppcache/src/Properties.cpp
@@ -25,29 +25,31 @@
 #include "ace/Versioned_Namespace.h"
 #include <ace/OS_NS_stdio.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <>
-class ACE_Hash<gemfire::CacheableKeyPtr> {
+class ACE_Hash<apache::geode::client::CacheableKeyPtr> {
  public:
-  u_long operator()(const gemfire::CacheableKeyPtr& key) {
+  u_long operator()(const apache::geode::client::CacheableKeyPtr& key) {
     return key->hashcode();
   }
 };
 
 template <>
-class ACE_Equal_To<gemfire::CacheableKeyPtr> {
+class ACE_Equal_To<apache::geode::client::CacheableKeyPtr> {
  public:
-  int operator()(const gemfire::CacheableKeyPtr& lhs,
-                 const gemfire::CacheableKeyPtr& rhs) const {
+  int operator()(const apache::geode::client::CacheableKeyPtr& lhs,
+                 const apache::geode::client::CacheableKeyPtr& rhs) const {
     return (*lhs.ptr() == *rhs.ptr());
   }
 };
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 typedef ACE_Hash_Map_Manager_Ex<
     CacheableKeyPtr, CacheablePtr, ACE_Hash<CacheableKeyPtr>,
@@ -332,4 +334,6 @@ Serializable* Properties::fromData(DataInput& input) {
   }
   return this;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ProxyCache.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyCache.cpp b/src/cppcache/src/ProxyCache.cpp
index 6e00998..699d339 100644
--- a/src/cppcache/src/ProxyCache.cpp
+++ b/src/cppcache/src/ProxyCache.cpp
@@ -34,7 +34,7 @@
 #include "ThinClientPoolDM.hpp"
 #include "PdxInstanceFactoryImpl.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 /**
  * Indicates if this cache has been closed.

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ProxyCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyCache.hpp b/src/cppcache/src/ProxyCache.hpp
index fdc1e05..0ae3265 100644
--- a/src/cppcache/src/ProxyCache.hpp
+++ b/src/cppcache/src/ProxyCache.hpp
@@ -29,7 +29,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class FunctionServiceImpl;
 
@@ -128,6 +130,7 @@ class CPPCACHE_EXPORT ProxyCache : public RegionService {
   friend class FunctionService;
   friend class GuardUserAttribures;
 };
-
-};      // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_PROXYCACHE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ProxyRegion.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRegion.hpp b/src/cppcache/src/ProxyRegion.hpp
index f51a9b7..f69719d 100644
--- a/src/cppcache/src/ProxyRegion.hpp
+++ b/src/cppcache/src/ProxyRegion.hpp
@@ -43,7 +43,9 @@
 #include <gfcpp/Query.hpp>
 #include "ProxyCache.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class FunctionService;
 /**
 * @class ProxyRegion ProxyRegion.hpp
@@ -1513,6 +1515,8 @@ class CPPCACHE_EXPORT ProxyRegion : public Region {
 };
 
 typedef SharedPtr<ProxyRegion> ProxyRegionPtr;
-};  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_PROXYREGION_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ProxyRemoteQueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ProxyRemoteQueryService.hpp b/src/cppcache/src/ProxyRemoteQueryService.hpp
index 3abcd9a..8a73d12 100644
--- a/src/cppcache/src/ProxyRemoteQueryService.hpp
+++ b/src/cppcache/src/ProxyRemoteQueryService.hpp
@@ -26,7 +26,9 @@
 
 #include <ace/Recursive_Thread_Mutex.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CacheImpl;
 class ThinClientPoolDM;
@@ -64,6 +66,7 @@ class CPPCACHE_EXPORT ProxyRemoteQueryService : public QueryService {
 };
 
 typedef SharedPtr<ProxyRemoteQueryService> ProxyRemoteQueryServicePtr;
-
-};      // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_PROXYREMOTEQUERYSERVICE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PutAllPartialResult.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResult.cpp b/src/cppcache/src/PutAllPartialResult.cpp
index dcbfe4c..4ca4b68 100644
--- a/src/cppcache/src/PutAllPartialResult.cpp
+++ b/src/cppcache/src/PutAllPartialResult.cpp
@@ -16,7 +16,9 @@
  */
 #include "PutAllPartialResult.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PutAllPartialResult::PutAllPartialResult(
     int totalMapSize, ACE_Recursive_Thread_Mutex& responseLock) {
@@ -61,4 +63,6 @@ PutAllPartialResult::getSucceededKeysAndVersions() {
 bool PutAllPartialResult::hasSucceededKeys() {
   return this->m_succeededKeys->size() > 0;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PutAllPartialResult.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResult.hpp b/src/cppcache/src/PutAllPartialResult.hpp
index 9f0b1ab..f3595bc 100644
--- a/src/cppcache/src/PutAllPartialResult.hpp
+++ b/src/cppcache/src/PutAllPartialResult.hpp
@@ -22,7 +22,9 @@
 #include "VersionedCacheableObjectPartList.hpp"
 #include <ace/Task.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class PutAllPartialResult;
 typedef SharedPtr<PutAllPartialResult> PutAllPartialResultPtr;
 
@@ -128,5 +130,7 @@ class PutAllPartialResult : public Serializable {
 
   int8_t typeId() const { return static_cast<int8_t>(0); }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PutAllPartialResultServerException.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResultServerException.cpp b/src/cppcache/src/PutAllPartialResultServerException.cpp
index 832de98..b0c9a2a 100644
--- a/src/cppcache/src/PutAllPartialResultServerException.cpp
+++ b/src/cppcache/src/PutAllPartialResultServerException.cpp
@@ -16,7 +16,9 @@
  */
 #include "PutAllPartialResultServerException.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 PutAllPartialResultServerException::PutAllPartialResultServerException(
     PutAllPartialResultPtr result) {
@@ -96,4 +98,6 @@ int8_t PutAllPartialResultServerException::typeId() const {
 PutAllPartialResultServerException::PutAllPartialResultServerException(
     CacheableStringPtr msg)
     : m_message(msg) {}
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/PutAllPartialResultServerException.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/PutAllPartialResultServerException.hpp b/src/cppcache/src/PutAllPartialResultServerException.hpp
index 9d8cfdd..9746a80 100644
--- a/src/cppcache/src/PutAllPartialResultServerException.hpp
+++ b/src/cppcache/src/PutAllPartialResultServerException.hpp
@@ -22,7 +22,9 @@
 #include "VersionedCacheableObjectPartList.hpp"
 #include "PutAllPartialResult.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class PutAllPartialResultServerException;
 typedef SharedPtr<PutAllPartialResultServerException>
@@ -136,5 +138,7 @@ class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
   CacheableStringPtr m_message;  // error message
   PutAllPartialResultPtr m_result;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Queue.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Queue.hpp b/src/cppcache/src/Queue.hpp
index fb3e8b6..f5fcc01 100644
--- a/src/cppcache/src/Queue.hpp
+++ b/src/cppcache/src/Queue.hpp
@@ -23,7 +23,9 @@
 #include <ace/Condition_Recursive_Thread_Mutex.h>
 #include <ace/Guard_T.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 template <class T>
 class CPPCACHE_EXPORT Queue {
@@ -159,7 +161,8 @@ class CPPCACHE_EXPORT Queue {
   const uint32_t m_maxSize;
   bool m_closed;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_QUEUE_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/QueueConnectionRequest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionRequest.cpp b/src/cppcache/src/QueueConnectionRequest.cpp
index a2fb76b..7ddf1b4 100644
--- a/src/cppcache/src/QueueConnectionRequest.cpp
+++ b/src/cppcache/src/QueueConnectionRequest.cpp
@@ -18,7 +18,7 @@
 #include "GemfireTypeIdsImpl.hpp"
 #include <gfcpp/DataInput.hpp>
 #include <gfcpp/DataOutput.hpp>
-using namespace gemfire;
+using namespace apache::geode::client;
 
 void QueueConnectionRequest::toData(DataOutput& output) const {
   // CacheableStringPtr abe = CacheableString::create(m_serverGp.c_str());

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/QueueConnectionRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionRequest.hpp b/src/cppcache/src/QueueConnectionRequest.hpp
index 9fe6aba..ba9f4ff 100644
--- a/src/cppcache/src/QueueConnectionRequest.hpp
+++ b/src/cppcache/src/QueueConnectionRequest.hpp
@@ -21,7 +21,9 @@
 #include "ClientProxyMembershipID.hpp"
 #include <set>
 #include <string>
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class QueueConnectionRequest : public ServerLocationRequest {
  public:
   QueueConnectionRequest(const ClientProxyMembershipID& memId,
@@ -55,5 +57,7 @@ class QueueConnectionRequest : public ServerLocationRequest {
   const bool m_findDurable;
   std::string m_serverGp;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/QueueConnectionResponse.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionResponse.cpp b/src/cppcache/src/QueueConnectionResponse.cpp
index 8efaf71..e9796c9 100644
--- a/src/cppcache/src/QueueConnectionResponse.cpp
+++ b/src/cppcache/src/QueueConnectionResponse.cpp
@@ -19,7 +19,7 @@
 #include "GemfireTypeIdsImpl.hpp"
 #include <gfcpp/DataInput.hpp>
 #include "ServerLocation.hpp"
-using namespace gemfire;
+using namespace apache::geode::client;
 QueueConnectionResponse* QueueConnectionResponse::fromData(DataInput& input) {
   input.readBoolean(&m_durableQueueFound);
   readList(input);

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/QueueConnectionResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/QueueConnectionResponse.hpp b/src/cppcache/src/QueueConnectionResponse.hpp
index c0dae89..b3260a6 100644
--- a/src/cppcache/src/QueueConnectionResponse.hpp
+++ b/src/cppcache/src/QueueConnectionResponse.hpp
@@ -20,7 +20,9 @@
 #include "ServerLocationResponse.hpp"
 #include <gfcpp/DataInput.hpp>
 #include "ServerLocation.hpp"
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class QueueConnectionResponse : public ServerLocationResponse {
  public:
   QueueConnectionResponse()
@@ -44,5 +46,7 @@ class QueueConnectionResponse : public ServerLocationResponse {
   bool m_durableQueueFound;
 };
 typedef SharedPtr<QueueConnectionResponse> QueueConnectionResponsePtr;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ReadWriteLock.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ReadWriteLock.cpp b/src/cppcache/src/ReadWriteLock.cpp
index 5dba4d5..e80c514 100644
--- a/src/cppcache/src/ReadWriteLock.cpp
+++ b/src/cppcache/src/ReadWriteLock.cpp
@@ -18,7 +18,7 @@
 #include "ReadWriteLock.hpp"
 #include <ace/Guard_T.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 TimedTryWriteGuard::TimedTryWriteGuard(ACE_RW_Thread_Mutex& lock, uint32_t usec)
     : lock_(lock), isAcquired_(false), mutex_(), cond_(mutex_) {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ReadWriteLock.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ReadWriteLock.hpp b/src/cppcache/src/ReadWriteLock.hpp
index a96ea1e..df04619 100644
--- a/src/cppcache/src/ReadWriteLock.hpp
+++ b/src/cppcache/src/ReadWriteLock.hpp
@@ -20,7 +20,9 @@
 #include <ace/RW_Thread_Mutex.h>
 #include "Condition.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class TimedTryWriteGuard {
  public:
   TimedTryWriteGuard(ACE_RW_Thread_Mutex& lock, uint32_t usec);
@@ -83,6 +85,8 @@ class TryWriteGuard {
   ACE_RW_Thread_Mutex& lock_;
   bool isAcquired_;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Region.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Region.cpp b/src/cppcache/src/Region.cpp
index 08196c4..af393eb 100644
--- a/src/cppcache/src/Region.cpp
+++ b/src/cppcache/src/Region.cpp
@@ -17,7 +17,11 @@
 
 #include <gfcpp/Region.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 Region::Region() {}
 Region::~Region() {}
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionAttributes.cpp b/src/cppcache/src/RegionAttributes.cpp
index 32aa9dc..30df986 100644
--- a/src/cppcache/src/RegionAttributes.cpp
+++ b/src/cppcache/src/RegionAttributes.cpp
@@ -27,7 +27,7 @@
 #include <gfcpp/DataInput.hpp>
 #include <gfcpp/Properties.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 RegionAttributes::RegionAttributes()
     : Serializable(),
       m_regionTimeToLiveExpirationAction(ExpirationAction::INVALIDATE),

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionCommit.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionCommit.cpp b/src/cppcache/src/RegionCommit.cpp
index ca16ed3..ca60857 100644
--- a/src/cppcache/src/RegionCommit.cpp
+++ b/src/cppcache/src/RegionCommit.cpp
@@ -23,7 +23,9 @@
 
 #include "RegionCommit.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 RegionCommit::RegionCommit() {
   // TODO Auto-generated constructor stub
@@ -72,4 +74,6 @@ void RegionCommit::fillEvents(Cache* cache,
     ops.push_back(*iter);
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionCommit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionCommit.hpp b/src/cppcache/src/RegionCommit.hpp
index 3dad6a3..4e10881 100644
--- a/src/cppcache/src/RegionCommit.hpp
+++ b/src/cppcache/src/RegionCommit.hpp
@@ -33,11 +33,13 @@
 #include <vector>
 #include "FarSideEntryOp.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 _GF_PTR_DEF_(RegionCommit, RegionCommitPtr);
 
-class RegionCommit : public gemfire::SharedBase {
+class RegionCommit : public apache::geode::client::SharedBase {
  public:
   RegionCommit();
   virtual ~RegionCommit();
@@ -54,6 +56,8 @@ class RegionCommit : public gemfire::SharedBase {
   CacheableStringPtr m_parentRegionPath;
   VectorOfSharedBase m_farSideEntryOps;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* REGIONCOMMIT_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionConfig.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionConfig.cpp b/src/cppcache/src/RegionConfig.cpp
index 8aa9cb5..e86fd38 100644
--- a/src/cppcache/src/RegionConfig.cpp
+++ b/src/cppcache/src/RegionConfig.cpp
@@ -28,7 +28,9 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 RegionConfig::RegionConfig(const std::string& s, const std::string& c)
     : m_capacity(c) {}
@@ -60,4 +62,6 @@ bool RegionConfig::getCaching() {
     return true;
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionConfig.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionConfig.hpp b/src/cppcache/src/RegionConfig.hpp
index 9be6def..003e98d 100644
--- a/src/cppcache/src/RegionConfig.hpp
+++ b/src/cppcache/src/RegionConfig.hpp
@@ -34,7 +34,9 @@
 #include <gfcpp/Properties.hpp>
 #include <stdlib.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class RegionConfig;
 typedef SharedPtr<RegionConfig> RegionConfigPtr;
@@ -57,6 +59,8 @@ class CPPCACHE_EXPORT RegionConfig : virtual public SharedBase {
   std::string m_concurrency;
   std::string m_caching;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // !defined(AFX_CACHEREGION_H__B8A44D1C_F9A4_49A8_A3A2_86CAE5E73C6F__INCLUDED_)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionEntry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionEntry.cpp b/src/cppcache/src/RegionEntry.cpp
index 5345f6b..351a981 100644
--- a/src/cppcache/src/RegionEntry.cpp
+++ b/src/cppcache/src/RegionEntry.cpp
@@ -19,7 +19,7 @@
 #include <gfcpp/CacheableKey.hpp>
 #include <CacheableToken.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 RegionEntry::RegionEntry(const RegionPtr& region, const CacheableKeyPtr& key,
                          const CacheablePtr& value)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionEvent.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionEvent.cpp b/src/cppcache/src/RegionEvent.cpp
index a919aa2..099f401 100644
--- a/src/cppcache/src/RegionEvent.cpp
+++ b/src/cppcache/src/RegionEvent.cpp
@@ -16,7 +16,9 @@
  */
 #include <gfcpp/RegionEvent.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 RegionEvent::RegionEvent(const RegionPtr& region,
                          const UserDataPtr& aCallbackArgument,
@@ -28,4 +30,6 @@ RegionEvent::RegionEvent(const RegionPtr& region,
 RegionEvent::RegionEvent() : m_remoteOrigin(false) {}
 
 RegionEvent::~RegionEvent() {}
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionExpiryHandler.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionExpiryHandler.cpp b/src/cppcache/src/RegionExpiryHandler.cpp
index 808b3da..3def51b 100644
--- a/src/cppcache/src/RegionExpiryHandler.cpp
+++ b/src/cppcache/src/RegionExpiryHandler.cpp
@@ -28,7 +28,7 @@
 #include "RegionExpiryHandler.hpp"
 #include "RegionInternal.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 RegionExpiryHandler::RegionExpiryHandler(RegionInternalPtr& rptr,
                                          ExpirationAction::Action action,

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionExpiryHandler.hpp b/src/cppcache/src/RegionExpiryHandler.hpp
index e3b64d3..d593e97 100644
--- a/src/cppcache/src/RegionExpiryHandler.hpp
+++ b/src/cppcache/src/RegionExpiryHandler.hpp
@@ -26,7 +26,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /**
  * @class RegionExpiryHandler RegionExpiryHandler.hpp
  *
@@ -63,7 +65,8 @@ class CPPCACHE_EXPORT RegionExpiryHandler : public ACE_Event_Handler {
   // perform the actual expiration action
   void DoTheExpirationAction();
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_REGIONEXPIRYTASK_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionFactory.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionFactory.cpp b/src/cppcache/src/RegionFactory.cpp
index e6b66fd..4ab8d1f 100644
--- a/src/cppcache/src/RegionFactory.cpp
+++ b/src/cppcache/src/RegionFactory.cpp
@@ -31,7 +31,9 @@
 
 extern ACE_Recursive_Thread_Mutex* g_disconnectLock;
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 RegionFactory::RegionFactory(RegionShortcut preDefinedRegion) {
   m_preDefinedRegion = preDefinedRegion;
@@ -231,4 +233,6 @@ RegionFactoryPtr RegionFactory::setCloningEnabled(bool isClonable) {
   RegionFactoryPtr rfPtr(this);
   return rfPtr;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionGlobalLocks.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionGlobalLocks.hpp b/src/cppcache/src/RegionGlobalLocks.hpp
index 803fa2b..38ced58 100644
--- a/src/cppcache/src/RegionGlobalLocks.hpp
+++ b/src/cppcache/src/RegionGlobalLocks.hpp
@@ -20,7 +20,9 @@
 
 #include "LocalRegion.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CPPCACHE_EXPORT RegionGlobalLocks {
  public:
@@ -35,6 +37,8 @@ class CPPCACHE_EXPORT RegionGlobalLocks {
   LocalRegion* m_region;
   bool m_isFailover;
 };
-};  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_REGIONGLOBAL_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionInternal.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionInternal.cpp b/src/cppcache/src/RegionInternal.cpp
index 89caea3..c0b5491 100644
--- a/src/cppcache/src/RegionInternal.cpp
+++ b/src/cppcache/src/RegionInternal.cpp
@@ -18,7 +18,9 @@
 #include <gfcpp/RegionEntry.hpp>
 #include "TombstoneList.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 // Static initializers for CacheEventFlags
 const CacheEventFlags CacheEventFlags::NORMAL(CacheEventFlags::GF_NORMAL);
@@ -251,4 +253,6 @@ void RegionInternal::txPut(const CacheableKeyPtr& key,
   throw UnsupportedOperationException(
       "txPut only supported by Thin Client Region.");
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionInternal.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionInternal.hpp b/src/cppcache/src/RegionInternal.hpp
index 5ccc7c0..56c7078 100644
--- a/src/cppcache/src/RegionInternal.hpp
+++ b/src/cppcache/src/RegionInternal.hpp
@@ -24,7 +24,9 @@
 #include <map>
 #include "EventId.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class CacheEventFlags RegionInternal.hpp
@@ -289,7 +291,8 @@ class RegionInternal : public Region {
 };
 
 typedef SharedPtr<RegionInternal> RegionInternalPtr;
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_REGIONINTERNAL_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionStats.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionStats.cpp b/src/cppcache/src/RegionStats.cpp
index 4570d56..a96deb2 100644
--- a/src/cppcache/src/RegionStats.cpp
+++ b/src/cppcache/src/RegionStats.cpp
@@ -28,7 +28,9 @@ const char* statsDesc = (const char*)"Statistics for this region";
 
 ////////////////////////////////////////////////////////////////////////////////
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 using namespace gemfire_statistics;
 
@@ -278,5 +280,6 @@ RegionStats::~RegionStats() {
     m_regionStats = NULL;
   }
 }
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionStats.hpp b/src/cppcache/src/RegionStats.hpp
index 921fcc0..67e261f 100644
--- a/src/cppcache/src/RegionStats.hpp
+++ b/src/cppcache/src/RegionStats.hpp
@@ -26,7 +26,9 @@
 //#include <SystemProperties.hpp>
 //#include <../DistributedSystem.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 using namespace gemfire_statistics;
 
@@ -225,6 +227,8 @@ class RegionStatType {
 
   inline int32_t getClearsId() { return m_clearsId; }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __GEMFIRE_REGIONSTATS_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionXmlCreation.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionXmlCreation.cpp b/src/cppcache/src/RegionXmlCreation.cpp
index 34f3102..8e496e3 100644
--- a/src/cppcache/src/RegionXmlCreation.cpp
+++ b/src/cppcache/src/RegionXmlCreation.cpp
@@ -19,7 +19,7 @@
 #include <CacheRegionHelper.hpp>
 #include "RegionXmlCreation.hpp"
 #include "CacheImpl.hpp"
-using namespace gemfire;
+using namespace apache::geode::client;
 extern bool Cache_CreatedFromCacheFactory;
 
 void RegionXmlCreation::addSubregion(RegionXmlCreation* regionPtr) {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RegionXmlCreation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionXmlCreation.hpp b/src/cppcache/src/RegionXmlCreation.hpp
index 5b50e68..43ea663 100644
--- a/src/cppcache/src/RegionXmlCreation.hpp
+++ b/src/cppcache/src/RegionXmlCreation.hpp
@@ -25,7 +25,9 @@
 #include "RegionXmlCreation.hpp"
 #include <gfcpp/RegionAttributes.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class Cache;
 
 /**
@@ -122,5 +124,7 @@ class CPPCACHE_EXPORT RegionXmlCreation {
   std::string getAttrId() const;
   void setAttrId(const std::string& attrId);
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // #ifndef  _GEMFIRE_REGIONXMLCREATION_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RemoteQuery.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQuery.cpp b/src/cppcache/src/RemoteQuery.cpp
index 23fd599..701a094 100644
--- a/src/cppcache/src/RemoteQuery.cpp
+++ b/src/cppcache/src/RemoteQuery.cpp
@@ -25,7 +25,7 @@
 #include "EventId.hpp"
 #include "ThinClientPoolDM.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 RemoteQuery::RemoteQuery(const char* querystr,
                          const RemoteQueryServicePtr& queryService,

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RemoteQuery.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQuery.hpp b/src/cppcache/src/RemoteQuery.hpp
index 8164373..ff92ac7 100644
--- a/src/cppcache/src/RemoteQuery.hpp
+++ b/src/cppcache/src/RemoteQuery.hpp
@@ -35,7 +35,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CPPCACHE_EXPORT RemoteQuery : public Query {
   std::string m_queryString;
@@ -76,7 +78,8 @@ class CPPCACHE_EXPORT RemoteQuery : public Query {
 };
 
 typedef SharedPtr<RemoteQuery> RemoteQueryPtr;
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_REMOTEQUERY_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RemoteQueryService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQueryService.cpp b/src/cppcache/src/RemoteQueryService.cpp
index 31c9a2f..f176685 100644
--- a/src/cppcache/src/RemoteQueryService.cpp
+++ b/src/cppcache/src/RemoteQueryService.cpp
@@ -22,7 +22,7 @@
 #include "ThinClientPoolDM.hpp"
 #include "UserAttributes.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 RemoteQueryService::RemoteQueryService(CacheImpl* cptr,
                                        ThinClientPoolDM* poolDM)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/RemoteQueryService.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RemoteQueryService.hpp b/src/cppcache/src/RemoteQueryService.hpp
index 47e3736..e2dda52 100644
--- a/src/cppcache/src/RemoteQueryService.hpp
+++ b/src/cppcache/src/RemoteQueryService.hpp
@@ -25,7 +25,9 @@
 
 #include <ace/Recursive_Thread_Mutex.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CacheImpl;
 class ThinClientPoolDM;
@@ -81,6 +83,7 @@ class CPPCACHE_EXPORT RemoteQueryService : public QueryService {
 };
 
 typedef SharedPtr<RemoteQueryService> RemoteQueryServicePtr;
-
-};      // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef __GEMFIRE_REMOTEQUERYSERVICE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ResultCollector.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ResultCollector.cpp b/src/cppcache/src/ResultCollector.cpp
index 4d60586..1963050 100644
--- a/src/cppcache/src/ResultCollector.cpp
+++ b/src/cppcache/src/ResultCollector.cpp
@@ -18,7 +18,7 @@
 #include <gfcpp/ExceptionTypes.hpp>
 #include <TimeoutTimer.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 ResultCollector::ResultCollector()
     : m_resultList(CacheableVector::create()), m_isResultReady(false) {}
 ResultCollector::~ResultCollector() {}

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ResultSetImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ResultSetImpl.cpp b/src/cppcache/src/ResultSetImpl.cpp
index 4e9926d..63610bf 100644
--- a/src/cppcache/src/ResultSetImpl.cpp
+++ b/src/cppcache/src/ResultSetImpl.cpp
@@ -21,7 +21,7 @@
  * @file
  */
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 ResultSetImpl::ResultSetImpl(const CacheableVectorPtr& response)
     : m_resultSetVector(response)

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ResultSetImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ResultSetImpl.hpp b/src/cppcache/src/ResultSetImpl.hpp
index 62ea791..d6f7acc 100644
--- a/src/cppcache/src/ResultSetImpl.hpp
+++ b/src/cppcache/src/ResultSetImpl.hpp
@@ -29,7 +29,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CPPCACHE_EXPORT ResultSetImpl : public ResultSet {
  public:
@@ -55,7 +57,8 @@ class CPPCACHE_EXPORT ResultSetImpl : public ResultSet {
   CacheableVectorPtr m_resultSetVector;
   // UNUSED int32_t m_nextIndex;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_RESULTSETIMPL_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SelectResultsIterator.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SelectResultsIterator.cpp b/src/cppcache/src/SelectResultsIterator.cpp
index 154225b..3b2dbb4 100644
--- a/src/cppcache/src/SelectResultsIterator.cpp
+++ b/src/cppcache/src/SelectResultsIterator.cpp
@@ -21,7 +21,9 @@
 
 #include <gfcpp/SelectResultsIterator.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 SelectResultsIterator::SelectResultsIterator(const CacheableVectorPtr& vectorSR,
                                              SelectResultsPtr srp)
@@ -53,5 +55,6 @@ const SerializablePtr SelectResultsIterator::current() const {
 }
 
 void SelectResultsIterator::reset() { m_nextIndex = 0; }
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Serializable.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Serializable.cpp b/src/cppcache/src/Serializable.cpp
index 761ff66..a12da97 100644
--- a/src/cppcache/src/Serializable.cpp
+++ b/src/cppcache/src/Serializable.cpp
@@ -21,7 +21,9 @@
 #include <Utils.hpp>
 #include <gfcpp/CacheableString.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 int8_t Serializable::typeId() const {
   int32_t classIdToCheck = classId();
@@ -55,4 +57,6 @@ void Serializable::registerPdxSerializer(PdxSerializerPtr pdxSerializer) {
 CacheableStringPtr Serializable::toString() const {
   return Utils::demangleTypeName(typeid(*this).name());
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SerializationRegistry.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SerializationRegistry.cpp b/src/cppcache/src/SerializationRegistry.cpp
index 339220e..34309a3 100644
--- a/src/cppcache/src/SerializationRegistry.cpp
+++ b/src/cppcache/src/SerializationRegistry.cpp
@@ -59,14 +59,17 @@
 
 #include "NonCopyable.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 /* adongre
  * CID 28729: Other violation (MISSING_COPY)
- * Class "gemfire::TheTypeMap" owns resources that are managed in its
+ * Class "apache::geode::client::TheTypeMap" owns resources that are managed in
+ * its
  * constructor and destructor but has no user-written copy constructor.
  *
  * CID 28715: Other violation (MISSING_ASSIGN)
- * Class "gemfire::TheTypeMap" owns resources that are managed
+ * Class "apache::geode::client::TheTypeMap" owns resources that are managed
  * in its constructor and destructor but has no user-written assignment
  * operator.
  *
@@ -555,4 +558,6 @@ PoolPtr SerializationRegistry::getPool() {
   }
   return pool;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SerializationRegistry.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SerializationRegistry.hpp b/src/cppcache/src/SerializationRegistry.hpp
index f9b4f7e..7971807 100644
--- a/src/cppcache/src/SerializationRegistry.hpp
+++ b/src/cppcache/src/SerializationRegistry.hpp
@@ -46,7 +46,9 @@ class ACE_Export ACE_Hash<int64_t> {
 ACE_END_VERSIONED_NAMESPACE_DECL
 #endif
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 typedef ACE_Hash_Map_Manager<int64_t, TypeFactoryMethod, ACE_Null_Mutex>
     IdToFactoryMap;
@@ -150,6 +152,8 @@ class CPPCACHE_EXPORT SerializationRegistry {
   static IdToFactoryMap* s_typeMap;
   static PdxSerializerPtr m_pdxSerializer;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ServerLocation.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ServerLocation.cpp b/src/cppcache/src/ServerLocation.cpp
index bc99469..e35c9c6 100644
--- a/src/cppcache/src/ServerLocation.cpp
+++ b/src/cppcache/src/ServerLocation.cpp
@@ -18,7 +18,9 @@
 #include "ServerLocation.hpp"
 #include <ace/OS_NS_stdio.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 void ServerLocation::makeEpString() {
   if (m_serverName != NULLPTR) {
     char epstring[1024] = {0};
@@ -26,4 +28,6 @@ void ServerLocation::makeEpString() {
     m_epString = epstring;
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ServerLocation.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ServerLocation.hpp b/src/cppcache/src/ServerLocation.hpp
index 977377d..4776e8b 100644
--- a/src/cppcache/src/ServerLocation.hpp
+++ b/src/cppcache/src/ServerLocation.hpp
@@ -25,7 +25,9 @@
 #include "GemfireTypeIdsImpl.hpp"
 #include <ace/INET_Addr.h>
 #include <gfcpp/CacheableBuiltins.hpp>
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class CPPCACHE_EXPORT ServerLocation : public Serializable {
  public:
   ServerLocation(std::string serverName, int port)
@@ -170,5 +172,7 @@ class CPPCACHE_EXPORT ServerLocation : public Serializable {
   int m_port;
   std::string m_epString;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ServerLocationRequest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ServerLocationRequest.cpp b/src/cppcache/src/ServerLocationRequest.cpp
index 2fc100c..6baac60 100644
--- a/src/cppcache/src/ServerLocationRequest.cpp
+++ b/src/cppcache/src/ServerLocationRequest.cpp
@@ -17,7 +17,7 @@
 
 #include "ServerLocationRequest.hpp"
 #include "GemfireTypeIdsImpl.hpp"
-using namespace gemfire;
+using namespace apache::geode::client;
 /*int8_t ServerLocationRequest::typeId( ) const
 {
   return (int8_t)GemfireTypeIdsImpl::FixedIDByte;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ServerLocationRequest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ServerLocationRequest.hpp b/src/cppcache/src/ServerLocationRequest.hpp
index 830eebf..9c554d8 100644
--- a/src/cppcache/src/ServerLocationRequest.hpp
+++ b/src/cppcache/src/ServerLocationRequest.hpp
@@ -17,7 +17,9 @@
 #ifndef __SERVER_LOCATION_REQUEST__
 #define __SERVER_LOCATION_REQUEST__
 #include <gfcpp/Serializable.hpp>
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class ServerLocationRequest : public Serializable {
  public:
   ServerLocationRequest() : Serializable() {}
@@ -29,5 +31,7 @@ class ServerLocationRequest : public Serializable {
   virtual uint32_t objectSize() const = 0;
   virtual ~ServerLocationRequest() {}
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/ServerLocationResponse.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ServerLocationResponse.hpp b/src/cppcache/src/ServerLocationResponse.hpp
index a64ddbc..2b4662d 100644
--- a/src/cppcache/src/ServerLocationResponse.hpp
+++ b/src/cppcache/src/ServerLocationResponse.hpp
@@ -18,7 +18,9 @@
 #define __SERVER_LOCATION__RESPONSE__
 #include <gfcpp/Serializable.hpp>
 #include "GemfireTypeIdsImpl.hpp"
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class ServerLocationResponse : public Serializable {
  public:
   ServerLocationResponse() : Serializable() {}
@@ -34,5 +36,7 @@ class ServerLocationResponse : public Serializable {
       const = 0;  // Has to be implemented by concrete class
   virtual ~ServerLocationResponse() {}  // Virtual destructor
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Set.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Set.hpp b/src/cppcache/src/Set.hpp
index 928ff6f..67e10fd 100644
--- a/src/cppcache/src/Set.hpp
+++ b/src/cppcache/src/Set.hpp
@@ -23,15 +23,19 @@
 
 #include "NonCopyable.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 // A synchronized Set using std::unordered_set<T>
 
 /* adongre
  * CID 28616: Other violation (COPY_WITHOUT_ASSIGN)
- * Class "gemfire::Set<unsigned short>::Iterator" has user-written copyi
- * `constructor "gemfire::Set<unsigned
- * short>::Iterator::Iterator(gemfire::Set<unsigned short>::Iterator const &)" i
+ * Class "apache::geode::client::Set<unsigned short>::Iterator" has user-written
+ * copyi
+ * `constructor "apache::geode::client::Set<unsigned
+ * short>::Iterator::Iterator(apache::geode::client::Set<unsigned
+ * short>::Iterator const &)" i
  * but no corresponding user-written assignment operator.
  *
  * FIX : Make the class non copyable
@@ -117,6 +121,8 @@ class CPPCACHE_EXPORT Set : private NonAssignable {
   std::unordered_set<T> m_set;
   ACE_Recursive_Thread_Mutex m_mutex;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // !defined _GEMFIRE_SET_HPP_

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SharedBase.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SharedBase.cpp b/src/cppcache/src/SharedBase.cpp
index 4edc4e6..b6392c1 100644
--- a/src/cppcache/src/SharedBase.cpp
+++ b/src/cppcache/src/SharedBase.cpp
@@ -20,7 +20,9 @@
 
 #include <typeinfo>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 void SharedBase::preserveSB() const { HostAsm::atomicAdd(m_refCount, 1); }
 
@@ -32,4 +34,6 @@ void SharedBase::releaseSB() const {
 
 // dummy instance to use for NULLPTR
 const NullSharedBase* const NullSharedBase::s_instancePtr = NULL;
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SharedPtr.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SharedPtr.cpp b/src/cppcache/src/SharedPtr.cpp
index e5a3808..3c5ae2d 100644
--- a/src/cppcache/src/SharedPtr.cpp
+++ b/src/cppcache/src/SharedPtr.cpp
@@ -20,7 +20,7 @@
 
 #include <string>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 void SPEHelper::throwNullPointerException(const char* ptrtype) {
   throw NullPointerException(Utils::demangleTypeName(ptrtype)->asChar(), NULL,

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SpinLock.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SpinLock.cpp b/src/cppcache/src/SpinLock.cpp
index 12c3550..6869274 100644
--- a/src/cppcache/src/SpinLock.cpp
+++ b/src/cppcache/src/SpinLock.cpp
@@ -19,7 +19,9 @@
 
 #include "SpinLock.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 void* testSpinLockCreate() { return (void*)new SpinLock(); }
 
@@ -30,4 +32,6 @@ void testSpinLockAcquire(void* lock) {
 void testSpinLockRelease(void* lock) {
   (reinterpret_cast<SpinLock*>(lock))->release();
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SpinLock.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SpinLock.hpp b/src/cppcache/src/SpinLock.hpp
index d0309ac..4f56db2 100644
--- a/src/cppcache/src/SpinLock.hpp
+++ b/src/cppcache/src/SpinLock.hpp
@@ -25,7 +25,9 @@
 #define GF_SAFELOCK 0
 #endif
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * For an object that needs to be protected by spinlock, declare a field of type
@@ -110,6 +112,8 @@ class SpinLockGuard {
 CPPCACHE_EXPORT void* testSpinLockCreate();
 CPPCACHE_EXPORT void testSpinLockAcquire(void* lock);
 CPPCACHE_EXPORT void testSpinLockRelease(void* lock);
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SslSockStream.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SslSockStream.cpp b/src/cppcache/src/SslSockStream.cpp
index 3a02ea3..991c32f 100644
--- a/src/cppcache/src/SslSockStream.cpp
+++ b/src/cppcache/src/SslSockStream.cpp
@@ -18,9 +18,11 @@
 #include <gfcpp/ExceptionTypes.hpp>
 #include <ace/OS_NS_stdio.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 void *SslSockStream::getACESSLFuncPtr(const char *function_name) {
   void *func = m_dll.symbol(function_name);
@@ -116,5 +118,6 @@ int SslSockStream::close() {
 }
 
 SslSockStream::~SslSockStream() { close(); }
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SslSockStream.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SslSockStream.hpp b/src/cppcache/src/SslSockStream.hpp
index 85a0188..e4dd1ab 100644
--- a/src/cppcache/src/SslSockStream.hpp
+++ b/src/cppcache/src/SslSockStream.hpp
@@ -21,7 +21,9 @@
 #include <ace/DLL.h>
 #include <ace/INET_Addr.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class SslSockStream {
  private:
@@ -84,6 +86,8 @@ class SslSockStream {
   int close();
 
 };  // class SslSockStream
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __SslSockStream_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/StackFrame.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackFrame.cpp b/src/cppcache/src/StackFrame.cpp
index de7b1f3..5e33be9 100644
--- a/src/cppcache/src/StackFrame.cpp
+++ b/src/cppcache/src/StackFrame.cpp
@@ -19,7 +19,9 @@
 #include "StackFrame.hpp"
 #include <gfcpp/gf_base.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 char* StackFrame::asString() {
   if (m_string[0] == 0) {
     char* tmp_module = m_module;
@@ -36,4 +38,6 @@ char* StackFrame::asString() {
   }
   return m_string;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/StackFrame.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackFrame.hpp b/src/cppcache/src/StackFrame.hpp
index 9aee0a1..a37f7bf 100644
--- a/src/cppcache/src/StackFrame.hpp
+++ b/src/cppcache/src/StackFrame.hpp
@@ -38,7 +38,9 @@
 #endif
 #endif
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class StackFrame {
  public:
@@ -136,6 +138,8 @@ class StackFrame {
     return symbol;
   }
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /* _GEMFIRE_STACKFRAME_HPP_ */

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/StackTrace.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackTrace.cpp b/src/cppcache/src/StackTrace.cpp
index 13a644d..f3dab7d 100644
--- a/src/cppcache/src/StackTrace.cpp
+++ b/src/cppcache/src/StackTrace.cpp
@@ -30,7 +30,9 @@
 #include <ace/Recursive_Thread_Mutex.h>
 #include <ace/Guard_T.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 ACE_Recursive_Thread_Mutex lockFrame;
 StackTrace::StackTrace() {
   addFrame(m_frames);
@@ -85,7 +87,10 @@ void StackTrace::addFrame(std::list<std::string>& frames) {
   }
   free(symbol);
 }
-}
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
+
 
 #elif defined(_LINUX)
 #include <execinfo.h>
@@ -93,7 +98,9 @@ void StackTrace::addFrame(std::list<std::string>& frames) {
 #include <stdio.h>
 #include <stdlib.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 StackTrace::StackTrace() {
   void* nativetrace_array[GF_TRACE_LEN];
@@ -104,14 +111,19 @@ StackTrace::StackTrace() {
   }
   free(symbols);
 }
-}
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
+
 #elif defined(_SOLARIS)
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ucontext.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 StackTrace::StackTrace() {
   void* nativetrace_array[GF_TRACE_LEN];
   // NOT YET IMPLEMENTED
@@ -121,11 +133,15 @@ StackTrace::StackTrace() {
   }
   */
 }
-}
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #elif defined(_MACOSX)
 #include <execinfo.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 StackTrace::StackTrace() {
   void* nativetrace_array[GF_TRACE_LEN];
   m_size = backtrace(nativetrace_array, GF_TRACE_LEN);
@@ -135,13 +151,17 @@ StackTrace::StackTrace() {
   }
   free(symbols);
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #else
 #error porting error
 #endif
 
 #ifndef _WIN32
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 StackTrace::~StackTrace() {}
 void StackTrace::addFrame(const char* line, int i) { m_frames[i].init(line); }
 
@@ -180,5 +200,7 @@ void StackTrace::getString(std::string& tracestring) const {
   }
 }
 #endif
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/StackTrace.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StackTrace.hpp b/src/cppcache/src/StackTrace.hpp
index acafde3..cbc2fa2 100644
--- a/src/cppcache/src/StackTrace.hpp
+++ b/src/cppcache/src/StackTrace.hpp
@@ -25,7 +25,9 @@
 #include <string>
 #include <list>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class StackTrace;
 typedef SharedPtr<StackTrace> StackTracePtr;
@@ -58,6 +60,8 @@ class StackTrace : public SharedBase {
   void addFrame(const char* line, int i);
 };
 #endif
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/Struct.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/Struct.cpp b/src/cppcache/src/Struct.cpp
index cae7d28..1e7ae90 100644
--- a/src/cppcache/src/Struct.cpp
+++ b/src/cppcache/src/Struct.cpp
@@ -18,7 +18,9 @@
 #include <GemfireTypeIdsImpl.hpp>
 #include <gfcpp/DataInput.hpp>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 Struct::Struct() : m_parent(NULL), m_lastAccessIndex(0) {}
 
@@ -149,5 +151,6 @@ const SerializablePtr Struct::next() {
 }
 
 Serializable* Struct::createDeserializable() { return new Struct(); }
-
-}  // end namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/StructSetImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StructSetImpl.cpp b/src/cppcache/src/StructSetImpl.cpp
index b3212b2..6c09a24 100644
--- a/src/cppcache/src/StructSetImpl.cpp
+++ b/src/cppcache/src/StructSetImpl.cpp
@@ -21,7 +21,7 @@
  * @file
  */
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 StructSetImpl::StructSetImpl(
     const CacheableVectorPtr& response,

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/StructSetImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/StructSetImpl.hpp b/src/cppcache/src/StructSetImpl.hpp
index 650a5b0..5f27d1d 100644
--- a/src/cppcache/src/StructSetImpl.hpp
+++ b/src/cppcache/src/StructSetImpl.hpp
@@ -33,7 +33,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 class CPPCACHE_EXPORT StructSetImpl : public StructSet {
  public:
@@ -67,7 +69,8 @@ class CPPCACHE_EXPORT StructSetImpl : public StructSet {
 
   int32_t m_nextIndex;
 };
-
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // ifndef __GEMFIRE_STRUCTSETIMPL_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SuspendedTxExpiryHandler.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SuspendedTxExpiryHandler.cpp b/src/cppcache/src/SuspendedTxExpiryHandler.cpp
index 39e014a..3a42f6d 100644
--- a/src/cppcache/src/SuspendedTxExpiryHandler.cpp
+++ b/src/cppcache/src/SuspendedTxExpiryHandler.cpp
@@ -25,7 +25,7 @@
 #include "ExpiryTaskManager.hpp"
 #include "SuspendedTxExpiryHandler.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 SuspendedTxExpiryHandler::SuspendedTxExpiryHandler(
     CacheTransactionManagerImpl* cacheTxMgr, TransactionIdPtr tid,

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SuspendedTxExpiryHandler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SuspendedTxExpiryHandler.hpp b/src/cppcache/src/SuspendedTxExpiryHandler.hpp
index 0a45ffa..68d2cca 100644
--- a/src/cppcache/src/SuspendedTxExpiryHandler.hpp
+++ b/src/cppcache/src/SuspendedTxExpiryHandler.hpp
@@ -25,7 +25,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 class CacheTransactionManagerImpl;
 /**
  * @class SuspendedTxExpiryHandler
@@ -58,5 +60,7 @@ class CPPCACHE_EXPORT SuspendedTxExpiryHandler : public ACE_Event_Handler {
   CacheTransactionManagerImpl* m_cacheTxMgr;
   TransactionIdPtr m_txid;
 };
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // ifndef _GEMFIRE_ENTRYEXPIRYTASK_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/SystemProperties.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/SystemProperties.cpp b/src/cppcache/src/SystemProperties.cpp
index f81178e..32449e9 100644
--- a/src/cppcache/src/SystemProperties.cpp
+++ b/src/cppcache/src/SystemProperties.cpp
@@ -34,7 +34,7 @@
 #include <dlfcn.h>
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 namespace gemfire_impl {
 void* getFactoryFunc(const char* lib, const char* funcName);
 }  // namespace gemfire_impl

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/src/TSSTXStateWrapper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/TSSTXStateWrapper.cpp b/src/cppcache/src/TSSTXStateWrapper.cpp
index a72f3a9..1f2a685 100644
--- a/src/cppcache/src/TSSTXStateWrapper.cpp
+++ b/src/cppcache/src/TSSTXStateWrapper.cpp
@@ -24,7 +24,9 @@
 #include "TSSTXStateWrapper.hpp"
 #include "TXState.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 ACE_TSS<TSSTXStateWrapper> TSSTXStateWrapper::s_gemfireTSSTXState;
 
 TSSTXStateWrapper::TSSTXStateWrapper() { m_txState = NULL; }
@@ -35,4 +37,6 @@ TSSTXStateWrapper::~TSSTXStateWrapper() {
     m_txState = NULL;
   }
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache


Mime
View raw message