You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/01/23 19:16:54 UTC

[02/50] [abbrv] geode git commit: GEODE-2316: Rename namespace gemfire to apache::geode::client.

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/plugins/SimpleCacheListener.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/plugins/SimpleCacheListener.hpp b/src/quickstart/cpp/plugins/SimpleCacheListener.hpp
index 0d95706..c0fde4d 100644
--- a/src/quickstart/cpp/plugins/SimpleCacheListener.hpp
+++ b/src/quickstart/cpp/plugins/SimpleCacheListener.hpp
@@ -28,7 +28,7 @@
 #include <gfcpp/CacheListener.hpp>
 
 // Use the "gemfire" namespace.
-using namespace gemfire;
+using namespace apache::geode::client;
 
 // The SimpleCacheListener class.
 class SimpleCacheListener : public CacheListener {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp b/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp
index 611fcf1..b33ae4a 100644
--- a/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp
+++ b/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp
@@ -28,7 +28,7 @@
 #include <gfcpp/CacheLoader.hpp>
 
 // Use the "gemfire" namespace.
-using namespace gemfire;
+using namespace apache::geode::client;
 
 // The SimpleCacheLoader class.
 class SimpleCacheLoader : public CacheLoader {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp b/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp
index 456a6cd..5ddda2e 100644
--- a/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp
+++ b/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp
@@ -28,7 +28,7 @@
 #include <gfcpp/CacheWriter.hpp>
 
 // Use the "gemfire" namespace.
-using namespace gemfire;
+using namespace apache::geode::client;
 
 // The SimpleCacheWriter class.
 class SimpleCacheWriter : public CacheWriter {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/Portfolio.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/Portfolio.cpp b/src/quickstart/cpp/queryobjects/Portfolio.cpp
index d06d19a..9692a22 100644
--- a/src/quickstart/cpp/queryobjects/Portfolio.cpp
+++ b/src/quickstart/cpp/queryobjects/Portfolio.cpp
@@ -17,7 +17,7 @@
 
 #include "Portfolio.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testobject;
 
 const char* Portfolio::secIds[] = {"SUN", "IBM",  "YHOO", "GOOG", "MSFT",

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/Portfolio.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/Portfolio.hpp b/src/quickstart/cpp/queryobjects/Portfolio.hpp
index 9482f48..74fb787 100644
--- a/src/quickstart/cpp/queryobjects/Portfolio.hpp
+++ b/src/quickstart/cpp/queryobjects/Portfolio.hpp
@@ -25,7 +25,7 @@
 #include <gfcpp/GemfireCppCache.hpp>
 #include "Position.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace testobject {
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/PortfolioPdx.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PortfolioPdx.cpp b/src/quickstart/cpp/queryobjects/PortfolioPdx.cpp
index 11cb216..1f112f1 100644
--- a/src/quickstart/cpp/queryobjects/PortfolioPdx.cpp
+++ b/src/quickstart/cpp/queryobjects/PortfolioPdx.cpp
@@ -17,7 +17,7 @@
 
 #include "PortfolioPdx.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testobject;
 
 const char* PortfolioPdx::secIds[] = {"SUN", "IBM",  "YHOO", "GOOG", "MSFT",

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp b/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp
index b7ebd39..06606a3 100644
--- a/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp
+++ b/src/quickstart/cpp/queryobjects/PortfolioPdx.hpp
@@ -24,7 +24,7 @@
 
 #include "PositionPdx.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace testobject {
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.cpp b/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.cpp
index bf2068f..94a3617 100644
--- a/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.cpp
+++ b/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.cpp
@@ -17,7 +17,7 @@
 
 #include "PortfolioPdxAuto.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testobject;
 
 const char* /*PortfolioPdx::*/ secIds[] = {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp b/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp
index 7de633f..cf8dcc2 100644
--- a/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp
+++ b/src/quickstart/cpp/queryobjects/PortfolioPdxAuto.hpp
@@ -24,12 +24,12 @@
 
 #include "PositionPdxAuto.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace testobject {
 #define GFARRAYSIZE(X)
 #define GFID
-class PortfolioPdxAuto : public gemfire::PdxSerializable {
+class PortfolioPdxAuto : public apache::geode::client::PdxSerializable {
  private:
   GFID int32_t id;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/Position.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/Position.cpp b/src/quickstart/cpp/queryobjects/Position.cpp
index 8a0913c..4614d79 100644
--- a/src/quickstart/cpp/queryobjects/Position.cpp
+++ b/src/quickstart/cpp/queryobjects/Position.cpp
@@ -19,7 +19,7 @@
 #include <cwchar>
 #include <wchar.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testobject;
 
 int32_t Position::cnt = 0;
@@ -62,7 +62,7 @@ void Position::init() {
   pid = 0;
 }
 
-void Position::toData(gemfire::DataOutput& output) const {
+void Position::toData(apache::geode::client::DataOutput& output) const {
   output.writeInt(avg20DaysVol);
   output.writeObject(bondRating);
   output.writeDouble(convRatio);
@@ -81,7 +81,8 @@ void Position::toData(gemfire::DataOutput& output) const {
   output.writeInt(pid);
 }
 
-gemfire::Serializable* Position::fromData(gemfire::DataInput& input) {
+apache::geode::client::Serializable* Position::fromData(
+    apache::geode::client::DataInput& input) {
   input.readInt(&avg20DaysVol);
   input.readObject(bondRating);
   input.readDouble(&convRatio);

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/Position.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/Position.hpp b/src/quickstart/cpp/queryobjects/Position.hpp
index f6becf2..cb767e4 100644
--- a/src/quickstart/cpp/queryobjects/Position.hpp
+++ b/src/quickstart/cpp/queryobjects/Position.hpp
@@ -35,11 +35,11 @@
 #define TESTOBJECT_EXPORT
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace testobject {
 
-class TESTOBJECT_EXPORT Position : public gemfire::Serializable {
+class TESTOBJECT_EXPORT Position : public apache::geode::client::Serializable {
  private:
   int64_t avg20DaysVol;
   CacheableStringPtr bondRating;
@@ -65,8 +65,9 @@ class TESTOBJECT_EXPORT Position : public gemfire::Serializable {
   Position();
   Position(const char* id, int32_t out);
   virtual ~Position();
-  virtual void toData(gemfire::DataOutput& output) const;
-  virtual gemfire::Serializable* fromData(gemfire::DataInput& input);
+  virtual void toData(apache::geode::client::DataOutput& output) const;
+  virtual apache::geode::client::Serializable* fromData(
+      apache::geode::client::DataInput& input);
   virtual int32_t classId() const { return 0x02; }
   CacheableStringPtr toString() const;
 
@@ -85,7 +86,7 @@ class TESTOBJECT_EXPORT Position : public gemfire::Serializable {
   CacheableStringPtr getSecId() { return secId; }
   int32_t getId() { return pid; }
   int32_t getSharesOutstanding() { return sharesOutstanding; }
-  static gemfire::Serializable* createDeserializable() {
+  static apache::geode::client::Serializable* createDeserializable() {
     return new Position();
   }
 
@@ -93,6 +94,6 @@ class TESTOBJECT_EXPORT Position : public gemfire::Serializable {
   void init();
 };
 
-typedef gemfire::SharedPtr<Position> PositionPtr;
+typedef apache::geode::client::SharedPtr<Position> PositionPtr;
 }
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/PositionPdx.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PositionPdx.cpp b/src/quickstart/cpp/queryobjects/PositionPdx.cpp
index d9bdad2..63d7e5e 100644
--- a/src/quickstart/cpp/queryobjects/PositionPdx.cpp
+++ b/src/quickstart/cpp/queryobjects/PositionPdx.cpp
@@ -19,7 +19,7 @@
 #include <cwchar>
 #include <wchar.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testobject;
 
 int32_t PositionPdx::cnt = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/PositionPdx.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PositionPdx.hpp b/src/quickstart/cpp/queryobjects/PositionPdx.hpp
index 862e046..33204b5 100644
--- a/src/quickstart/cpp/queryobjects/PositionPdx.hpp
+++ b/src/quickstart/cpp/queryobjects/PositionPdx.hpp
@@ -38,11 +38,12 @@
 #define TESTOBJECT_EXPORT
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace testobject {
 
-class TESTOBJECT_EXPORT PositionPdx : public gemfire::PdxSerializable {
+class TESTOBJECT_EXPORT PositionPdx
+    : public apache::geode::client::PdxSerializable {
  private:
   int64_t avg20DaysVol;
   char* bondRating;
@@ -98,6 +99,6 @@ class TESTOBJECT_EXPORT PositionPdx : public gemfire::PdxSerializable {
   void init();
 };
 
-typedef gemfire::SharedPtr<PositionPdx> PositionPdxPtr;
+typedef apache::geode::client::SharedPtr<PositionPdx> PositionPdxPtr;
 }
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/PositionPdxAuto.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PositionPdxAuto.cpp b/src/quickstart/cpp/queryobjects/PositionPdxAuto.cpp
index f27cfb6..c638b88 100644
--- a/src/quickstart/cpp/queryobjects/PositionPdxAuto.cpp
+++ b/src/quickstart/cpp/queryobjects/PositionPdxAuto.cpp
@@ -19,7 +19,7 @@
 #include <cwchar>
 #include <wchar.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testobject;
 
 int32_t PositionPdxAuto::cnt = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp b/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp
index 75ba01d..d70cc8b 100644
--- a/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp
+++ b/src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp
@@ -38,13 +38,13 @@
 #define TESTOBJECT_EXPORT
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace testobject {
 
 #define GFID
 
-class PositionPdxAuto : public gemfire::PdxSerializable {
+class PositionPdxAuto : public apache::geode::client::PdxSerializable {
  private:
   GFID int64_t avg20DaysVol;
   GFID char* bondRating;
@@ -100,6 +100,6 @@ class PositionPdxAuto : public gemfire::PdxSerializable {
   void init();
 };
 
-typedef gemfire::SharedPtr<PositionPdxAuto> PositionPdxPtr;
+typedef apache::geode::client::SharedPtr<PositionPdxAuto> PositionPdxPtr;
 }
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/sqliteimpl/SqLiteHelper.hpp
----------------------------------------------------------------------
diff --git a/src/sqliteimpl/SqLiteHelper.hpp b/src/sqliteimpl/SqLiteHelper.hpp
index 5ee3cb5..41f8882 100644
--- a/src/sqliteimpl/SqLiteHelper.hpp
+++ b/src/sqliteimpl/SqLiteHelper.hpp
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 #ifdef _WIN32
 #define SNPRINTF _snprintf

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/sqliteimpl/SqLiteImpl.cpp
----------------------------------------------------------------------
diff --git a/src/sqliteimpl/SqLiteImpl.cpp b/src/sqliteimpl/SqLiteImpl.cpp
index e986b84..a730077 100644
--- a/src/sqliteimpl/SqLiteImpl.cpp
+++ b/src/sqliteimpl/SqLiteImpl.cpp
@@ -21,7 +21,7 @@ namespace {
 std::string g_default_persistence_directory = "GemFireRegionData";
 }  // namespace
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 void SqLiteImpl::init(const RegionPtr& region, PropertiesPtr& diskProperties) {
   // Set the default values

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/sqliteimpl/SqLiteImpl.hpp
----------------------------------------------------------------------
diff --git a/src/sqliteimpl/SqLiteImpl.hpp b/src/sqliteimpl/SqLiteImpl.hpp
index 4cc9c10..86d3d5e 100644
--- a/src/sqliteimpl/SqLiteImpl.hpp
+++ b/src/sqliteimpl/SqLiteImpl.hpp
@@ -23,7 +23,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class SqLite(3.7) Implementation SqLiteImpl.hpp
@@ -132,5 +134,7 @@ class SqLiteImpl : public PersistenceManager {
   std::string m_regionDir;
   std::string m_persistanceDir;
 };
-}
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  //_SqLiteIMPL_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/templates/security/PkcsAuthInit.cpp
----------------------------------------------------------------------
diff --git a/src/templates/security/PkcsAuthInit.cpp b/src/templates/security/PkcsAuthInit.cpp
index 2acfa4c..3e763c9 100644
--- a/src/templates/security/PkcsAuthInit.cpp
+++ b/src/templates/security/PkcsAuthInit.cpp
@@ -21,7 +21,9 @@
 #include "gfcpp/ExceptionTypes.hpp"
 #include "stdio.h"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 extern "C" {
 LIBEXP AuthInitialize* createPKCSAuthInitInstance() {
@@ -182,4 +184,6 @@ PropertiesPtr PKCSAuthInit::getCredentials(PropertiesPtr& securityprops,
   credentials->insert(CacheableString::create(SIGNATURE_DATA), signatureValPtr);
   return credentials;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/templates/security/PkcsAuthInit.hpp
----------------------------------------------------------------------
diff --git a/src/templates/security/PkcsAuthInit.hpp b/src/templates/security/PkcsAuthInit.hpp
index 17ed2a2..404f661 100644
--- a/src/templates/security/PkcsAuthInit.hpp
+++ b/src/templates/security/PkcsAuthInit.hpp
@@ -48,7 +48,9 @@ const char KEYSTORE_PASSWORD[] = "security-keystorepass";
 
 const char SIGNATURE_DATA[] = "security-signature";
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class PKCSAuthInit Implementation PKCSAuthInit.hpp
@@ -97,5 +99,7 @@ class PKCSAuthInit : public AuthInitialize {
 
  private:
 };
-};
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  //__PKCSAUTHINIT__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/templates/security/UserPasswordAuthInit.cpp
----------------------------------------------------------------------
diff --git a/src/templates/security/UserPasswordAuthInit.cpp b/src/templates/security/UserPasswordAuthInit.cpp
index 4a65912..94fd3f1 100644
--- a/src/templates/security/UserPasswordAuthInit.cpp
+++ b/src/templates/security/UserPasswordAuthInit.cpp
@@ -23,7 +23,9 @@
 #define SECURITY_USERNAME "security-username"
 #define SECURITY_PASSWORD "security-password"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 extern "C" {
 LIBEXP AuthInitialize* createUserPasswordAuthInitInstance() {
@@ -54,4 +56,6 @@ PropertiesPtr UserPasswordAuthInit::getCredentials(PropertiesPtr& securityprops,
   //    userName->toString()->asChar(), passwd->toString()->asChar());
   return credentials;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/templates/security/UserPasswordAuthInit.hpp
----------------------------------------------------------------------
diff --git a/src/templates/security/UserPasswordAuthInit.hpp b/src/templates/security/UserPasswordAuthInit.hpp
index 88bb901..a1e35b3 100644
--- a/src/templates/security/UserPasswordAuthInit.hpp
+++ b/src/templates/security/UserPasswordAuthInit.hpp
@@ -23,7 +23,9 @@
  * @file
  */
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class UserPasswordAuthInit Implementation UserPasswordAuthInit.hpp
@@ -77,5 +79,7 @@ class UserPasswordAuthInit : public AuthInitialize {
 
  private:
 };
-};
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  //__USERPASSWORDAUTHINIT__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
index ee091e5..db8ae12 100644
--- a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
+++ b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp
@@ -43,12 +43,12 @@ PkcsAuthInit::GetCredentials(
   GemStone::GemFire::Cache::Generic::Properties<String^, String^> ^props, System::String ^server)
 {
   GemStone::GemFire::Cache::Generic::ManagedString mg_server( server );
-  gemfire::PropertiesPtr propsPtr = NULLPTR;
+  apache::geode::client::PropertiesPtr propsPtr = NULLPTR;
   if (props != nullptr) {
-    propsPtr = (gemfire::Properties*)props->NativeIntPtr;
+    propsPtr = (apache::geode::client::Properties*)props->NativeIntPtr;
   }
-  gemfire::PKCSAuthInitInternal* nativeptr = new gemfire::PKCSAuthInitInternal(true); 
-  gemfire::PropertiesPtr& newPropsPtr = nativeptr->getCredentials(propsPtr, mg_server.CharPtr);     
+  apache::geode::client::PKCSAuthInitInternal* nativeptr = new apache::geode::client::PKCSAuthInitInternal(true); 
+  apache::geode::client::PropertiesPtr& newPropsPtr = nativeptr->getCredentials(propsPtr, mg_server.CharPtr);     
   return GemStone::GemFire::Cache::Generic::Properties<String^, Object^>::
     CreateFromVoidPtr<String^, Object^>(newPropsPtr.ptr());
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
index 795119b..33fa5d1 100644
--- a/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
+++ b/src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp
@@ -35,7 +35,7 @@ namespace GemStone
           namespace NewAPI
           {
           public ref class PkcsAuthInit sealed
-          : public Internal::SBWrap<gemfire::PKCSAuthInitInternal>,
+          : public Internal::SBWrap<apache::geode::client::PKCSAuthInitInternal>,
             public GemStone::GemFire::Cache::Generic::IAuthInitialize/*<String^, Object^>*/
         {
         public:
@@ -52,7 +52,7 @@ namespace GemStone
           virtual void Close();
 
         internal:            
-          PkcsAuthInit( gemfire::PKCSAuthInitInternal* nativeptr )
+          PkcsAuthInit( apache::geode::client::PKCSAuthInitInternal* nativeptr )
             : SBWrap( nativeptr ) { }
         };
         } // end namespace NewAPI

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwk/UdpIpc.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwk/UdpIpc.cpp b/src/tests/cpp/fwk/UdpIpc.cpp
index 68a6265..ecdb1b6 100644
--- a/src/tests/cpp/fwk/UdpIpc.cpp
+++ b/src/tests/cpp/fwk/UdpIpc.cpp
@@ -35,8 +35,8 @@
 
 #include "fwklib/FwkExport.hpp"
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 static UdpIpc *g_test = NULL;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwk/UdpIpc.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwk/UdpIpc.hpp b/src/tests/cpp/fwk/UdpIpc.hpp
index 7a495ab..9162d2a 100644
--- a/src/tests/cpp/fwk/UdpIpc.hpp
+++ b/src/tests/cpp/fwk/UdpIpc.hpp
@@ -33,7 +33,9 @@
 
 #include "fwklib/FrameworkTest.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 // ----------------------------------------------------------------------------
@@ -81,7 +83,9 @@ class TestProcessor : public ServiceTask {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 // ----------------------------------------------------------------------------
 
 #endif  // __UDPIPC_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/ClientTask.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/ClientTask.hpp b/src/tests/cpp/fwklib/ClientTask.hpp
index 355eafc..8797368 100644
--- a/src/tests/cpp/fwklib/ClientTask.hpp
+++ b/src/tests/cpp/fwklib/ClientTask.hpp
@@ -25,7 +25,9 @@
 
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class ClientTask {
@@ -152,6 +154,8 @@ class ThreadedTask : public ClientTask {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __ClientTask_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FrameworkTest.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FrameworkTest.cpp b/src/tests/cpp/fwklib/FrameworkTest.cpp
index c8c8298..3aed678 100644
--- a/src/tests/cpp/fwklib/FrameworkTest.cpp
+++ b/src/tests/cpp/fwklib/FrameworkTest.cpp
@@ -23,8 +23,8 @@
 #include <gfcpp/PoolFactory.hpp>
 #include "PoolAttributes.hpp"
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 // ========================================================================
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FrameworkTest.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FrameworkTest.hpp b/src/tests/cpp/fwklib/FrameworkTest.hpp
index b18e8e9..80cf246 100644
--- a/src/tests/cpp/fwklib/FrameworkTest.hpp
+++ b/src/tests/cpp/fwklib/FrameworkTest.hpp
@@ -24,7 +24,9 @@
 
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class FrameworkTest  // Base class all test classes written for xml testing
@@ -50,7 +52,7 @@ class FrameworkTest  // Base class all test classes written for xml testing
   void setNewAndDelete() {
     char* envsetting = ACE_OS::getenv("BUG481");
     if (envsetting != NULL && strlen(envsetting) > 0) {
-      gemfire::setNewAndDelete(&operator new, & operator delete);
+      apache::geode::client::setNewAndDelete(&operator new, & operator delete);
       FWKINFO("setNewAndDelete() was called");
     }
     m_doneSetNewAndDelete = true;
@@ -273,5 +275,7 @@ class FrameworkTest  // Base class all test classes written for xml testing
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // __FrameworkTest_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkBB.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkBB.hpp b/src/tests/cpp/fwklib/FwkBB.hpp
index 35d6738..a353c6d 100644
--- a/src/tests/cpp/fwklib/FwkBB.hpp
+++ b/src/tests/cpp/fwklib/FwkBB.hpp
@@ -34,7 +34,9 @@
 
 // ----------------------------------------------------------------------------
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 // ----------------------------------------------------------------------------
@@ -222,7 +224,9 @@ class FwkBBMessage {
 // ----------------------------------------------------------------------------
 
 }  // namespace  testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 // ----------------------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkBBClient.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkBBClient.cpp b/src/tests/cpp/fwklib/FwkBBClient.cpp
index b84148b..a6ed963 100644
--- a/src/tests/cpp/fwklib/FwkBBClient.cpp
+++ b/src/tests/cpp/fwklib/FwkBBClient.cpp
@@ -31,8 +31,8 @@
 #include "ace/Synch.h"
 #include "ace/OS.h"
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 // ----------------------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkBBClient.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkBBClient.hpp b/src/tests/cpp/fwklib/FwkBBClient.hpp
index 0d7e64f..527b96c 100644
--- a/src/tests/cpp/fwklib/FwkBBClient.hpp
+++ b/src/tests/cpp/fwklib/FwkBBClient.hpp
@@ -42,7 +42,9 @@ static std::string CLIENTCOUNT("ClientCount");
 
 // ----------------------------------------------------------------------------
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 /** @class FwkBBClient
   * @brief Framework BB client
@@ -181,6 +183,8 @@ class FwkBBClient {
 // ----------------------------------------------------------------------------
 
 }  // namespace  testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __FWK_BB_CLIENT_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkBBServer.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkBBServer.cpp b/src/tests/cpp/fwklib/FwkBBServer.cpp
index 280d905..a6b50d2 100644
--- a/src/tests/cpp/fwklib/FwkBBServer.cpp
+++ b/src/tests/cpp/fwklib/FwkBBServer.cpp
@@ -31,8 +31,8 @@
 
 #include <set>
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 // ----------------------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkBBServer.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkBBServer.hpp b/src/tests/cpp/fwklib/FwkBBServer.hpp
index ea55845..56f8f89 100644
--- a/src/tests/cpp/fwklib/FwkBBServer.hpp
+++ b/src/tests/cpp/fwklib/FwkBBServer.hpp
@@ -35,7 +35,9 @@
 
 // ----------------------------------------------------------------------------
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 // ----------------------------------------------------------------------------
@@ -216,6 +218,8 @@ class BBProcessor : public ServiceTask {
 };
 
 }  // namespace  testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __FWK_BB_SERVER_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkException.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkException.hpp b/src/tests/cpp/fwklib/FwkException.hpp
index fa74571..07689d4 100644
--- a/src/tests/cpp/fwklib/FwkException.hpp
+++ b/src/tests/cpp/fwklib/FwkException.hpp
@@ -32,7 +32,9 @@
 
 // ----------------------------------------------------------------------------
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 // ----------------------------------------------------------------------------
 
@@ -60,6 +62,8 @@ class FwkException {
 // ----------------------------------------------------------------------------
 
 }  // namespace  testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __FWKEXCEPTION_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkLog.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkLog.cpp b/src/tests/cpp/fwklib/FwkLog.cpp
index 95737c4..2239cc4 100644
--- a/src/tests/cpp/fwklib/FwkLog.cpp
+++ b/src/tests/cpp/fwklib/FwkLog.cpp
@@ -19,14 +19,16 @@
 #include "fwklib/PerfFwk.hpp"
 #include <gfcpp/Exception.hpp>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testframework;
 
 static ACE_utsname u;
 
-const char* gemfire::testframework::getNodeName() { return u.nodename; }
+const char* apache::geode::client::testframework::getNodeName() {
+  return u.nodename;
+}
 
-const char* gemfire::testframework::dirAndFile(const char* str) {
+const char* apache::geode::client::testframework::dirAndFile(const char* str) {
   if (str == NULL) {
     return "NULL";
   }
@@ -48,8 +50,9 @@ const char* gemfire::testframework::dirAndFile(const char* str) {
   return ptr;
 }
 
-void gemfire::testframework::plog(const char* l, const char* s,
-                                  const char* filename, int32_t lineno) {
+void apache::geode::client::testframework::plog(const char* l, const char* s,
+                                                const char* filename,
+                                                int32_t lineno) {
   // ACE_TCHAR tstamp[64];
   // ACE::timestamp( tstamp, 64, 1 );
   // tstamp is like "Tue May 17 2005 12:54:22.546780"
@@ -78,7 +81,7 @@ void gemfire::testframework::plog(const char* l, const char* s,
   fflush(stdout);
 }
 
-void gemfire::testframework::dumpStack() {
-  gemfire::Exception trace("StackTrace", "  ", true);
+void apache::geode::client::testframework::dumpStack() {
+  apache::geode::client::Exception trace("StackTrace", "  ", true);
   trace.printStackTrace();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkLog.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkLog.hpp b/src/tests/cpp/fwklib/FwkLog.hpp
index 1bd2603..c0f4de7 100644
--- a/src/tests/cpp/fwklib/FwkLog.hpp
+++ b/src/tests/cpp/fwklib/FwkLog.hpp
@@ -42,7 +42,9 @@
 
 // ----------------------------------------------------------------------------
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 const char* strnrchr(const char* str, const char tok, int32_t cnt);
@@ -117,6 +119,8 @@ const char* getNodeName();
   }
 
 }  // namespace  testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __FWK_LOG_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkObjects.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkObjects.cpp b/src/tests/cpp/fwklib/FwkObjects.cpp
index 5ec42ea..d46f438 100644
--- a/src/tests/cpp/fwklib/FwkObjects.cpp
+++ b/src/tests/cpp/fwklib/FwkObjects.cpp
@@ -39,8 +39,8 @@
 
 #include <ctype.h>
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 const std::string FwkClientSet::m_defaultGroup = "DEFAULT";
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkObjects.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkObjects.hpp b/src/tests/cpp/fwklib/FwkObjects.hpp
index eb330e3..449e741 100644
--- a/src/tests/cpp/fwklib/FwkObjects.hpp
+++ b/src/tests/cpp/fwklib/FwkObjects.hpp
@@ -48,7 +48,7 @@
 
 XERCES_CPP_NAMESPACE_USE
 
-using namespace gemfire::testframework;
+using namespace apache::geode::client::testframework;
 
 #define HOSTGROUP_TAG "hostGroup"
 #define LOCALFILE_TAG "localFile"
@@ -78,7 +78,9 @@ using namespace gemfire::testframework;
 
 #define CLIENT_STATUS_BB "clientStatusBB"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 // ----------------------------------------------------------------------------
@@ -375,7 +377,8 @@ class Attributes {
   }
 
   void setConcurrencyLevel(std::string val) {
-    m_factory.setConcurrencyLevel(static_cast<uint8_t>(FwkStrCvt::toInt32(val)));
+    m_factory.setConcurrencyLevel(
+        static_cast<uint8_t>(FwkStrCvt::toInt32(val)));
   }
 
   void setLruEntriesLimit(std::string val) {
@@ -1610,6 +1613,8 @@ class TestDriver {
 // ----------------------------------------------------------------------------
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __FWK_OBJECTS_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkStrCvt.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkStrCvt.cpp b/src/tests/cpp/fwklib/FwkStrCvt.cpp
index 9a1acbc..f9e37ae 100644
--- a/src/tests/cpp/fwklib/FwkStrCvt.cpp
+++ b/src/tests/cpp/fwklib/FwkStrCvt.cpp
@@ -18,7 +18,7 @@
 #include "fwklib/FwkStrCvt.hpp"
 #include "fwklib/FwkLog.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testframework;
 
 // ----------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/FwkStrCvt.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/FwkStrCvt.hpp b/src/tests/cpp/fwklib/FwkStrCvt.hpp
index db7e05e..1998ce2 100644
--- a/src/tests/cpp/fwklib/FwkStrCvt.hpp
+++ b/src/tests/cpp/fwklib/FwkStrCvt.hpp
@@ -39,7 +39,9 @@
 
 // ----------------------------------------------------------------------------
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 // ----------------------------------------------------------------------------
@@ -89,7 +91,7 @@ class FwkStrCvt {
       m_sText = szText;
     } else {
       m_sText.clear();
-}
+    }
   };
   /** @brief convert from float value */
   FwkStrCvt(const float fValue) {
@@ -98,7 +100,7 @@ class FwkStrCvt {
       m_sText = szText;
     } else {
       m_sText.clear();
-}
+    }
   };
   /** @brief convert from uint32_t value */
   FwkStrCvt(const uint32_t uiValue) {
@@ -107,7 +109,7 @@ class FwkStrCvt {
       m_sText = szText;
     } else {
       m_sText.clear();
-}
+    }
   };
   /** @brief convert from int32_t value */
   FwkStrCvt(const int32_t iValue) {
@@ -116,7 +118,7 @@ class FwkStrCvt {
       m_sText = szText;
     } else {
       m_sText.clear();
-}
+    }
   };
   /** @brief convert from bool value */
   FwkStrCvt(const bool bValue) { m_sText = (bValue) ? "true" : "false"; };
@@ -128,7 +130,7 @@ class FwkStrCvt {
       m_sText = szText;
     } else {
       m_sText.clear();
-}
+    }
   }
 
   /** @brief convert from int64_t value */
@@ -138,20 +140,24 @@ class FwkStrCvt {
       m_sText = szText;
     } else {
       m_sText.clear();
-}
+    }
   }
 
   /** @brief gets double value */
   double toDouble() { return ACE_OS::strtod(m_sText.c_str(), 0); };
 
   /** @brief gets float value */
-  float toFloat() { return static_cast<float>(ACE_OS::strtod(m_sText.c_str(), 0)); };
+  float toFloat() {
+    return static_cast<float>(ACE_OS::strtod(m_sText.c_str(), 0));
+  };
 
   /** @brief gets int32_t value */
   int32_t toInt() { return ACE_OS::atoi(m_sText.c_str()); };
 
   /** @brief gets uint32_t value */
-  uint32_t toUint() { return static_cast<uint32_t>(ACE_OS::atoi(m_sText.c_str())); };
+  uint32_t toUint() {
+    return static_cast<uint32_t>(ACE_OS::atoi(m_sText.c_str()));
+  };
 
   /** @brief gets int32_t value */
   // TODO: : why this returns in32_t? if so why different from toInt()
@@ -338,6 +344,8 @@ class FwkStrCvt {
 // ----------------------------------------------------------------------------
 
 }  // namespace  testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __FWK_STR_CVT_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/GsRandom.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/GsRandom.cpp b/src/tests/cpp/fwklib/GsRandom.cpp
index 09343a0..ae1c240 100644
--- a/src/tests/cpp/fwklib/GsRandom.cpp
+++ b/src/tests/cpp/fwklib/GsRandom.cpp
@@ -17,8 +17,8 @@
 
 #include "GsRandom.hpp"
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 GsRandom *GsRandom::singleton = 0;
 MTRand GsRandom::gen;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/GsRandom.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/GsRandom.hpp b/src/tests/cpp/fwklib/GsRandom.hpp
index dbcc8f8..776b0d4 100644
--- a/src/tests/cpp/fwklib/GsRandom.hpp
+++ b/src/tests/cpp/fwklib/GsRandom.hpp
@@ -25,7 +25,9 @@
 #include "SpinLock.hpp"
 #include "MersenneTwister.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class GsRandom {
@@ -86,7 +88,9 @@ class GsRandom {
     * @return the next pseudorandom, uniformly distributed <code>byte</code>
     *         value from this random number generator's sequence.
     */
-  inline uint8_t nextByte() { return static_cast<uint8_t>(singleton->gen.randInt(0xff)); }
+  inline uint8_t nextByte() {
+    return static_cast<uint8_t>(singleton->gen.randInt(0xff));
+  }
 
   /**
     * @param   min the minimum range (inclusive) for the pseudorandom.
@@ -139,7 +143,8 @@ class GsRandom {
 
   /** @brief return random number where: min <= retValue < max */
   static uint32_t random(uint32_t min, uint32_t max) {
-    return static_cast<uint32_t>(GsRandom::getInstance()->nextInt(min, max - 1));
+    return static_cast<uint32_t>(
+        GsRandom::getInstance()->nextInt(min, max - 1));
   }
 
   /** @brief return random number where: 0 <= retValue < max */
@@ -167,7 +172,7 @@ class GsRandom {
 
     for (uint32_t idx = 0; idx < size; idx++) {
       str[idx] = chooseFrom[random(chooseSize)];
-}
+    }
 
     return str;
   }
@@ -186,7 +191,7 @@ class GsRandom {
 
     for (uint32_t idx = 0; idx < size; idx++) {
       buffer[idx] = chooseFrom[random(chooseSize)];
-}
+    }
   }
 
   //  /**
@@ -226,5 +231,7 @@ class GsRandom {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // __GS_RANDOM_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/IpcHandler.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/IpcHandler.cpp b/src/tests/cpp/fwklib/IpcHandler.cpp
index 9b6f49a..f776004 100644
--- a/src/tests/cpp/fwklib/IpcHandler.cpp
+++ b/src/tests/cpp/fwklib/IpcHandler.cpp
@@ -27,8 +27,8 @@
 #include <ace/SOCK_Connector.h>
 #include <ace/OS.h>
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 // This class is not thread safe, and its use in the test framework
 // does not require it to be.

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/IpcHandler.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/IpcHandler.hpp b/src/tests/cpp/fwklib/IpcHandler.hpp
index d5a6bb8..fec25cd 100644
--- a/src/tests/cpp/fwklib/IpcHandler.hpp
+++ b/src/tests/cpp/fwklib/IpcHandler.hpp
@@ -25,7 +25,9 @@
 
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 enum IpcMsg {
@@ -79,6 +81,8 @@ class IpcHandler {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __IpcHandler_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/MersenneTwister.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/MersenneTwister.cpp b/src/tests/cpp/fwklib/MersenneTwister.cpp
index 987f72f..0b660ae 100644
--- a/src/tests/cpp/fwklib/MersenneTwister.cpp
+++ b/src/tests/cpp/fwklib/MersenneTwister.cpp
@@ -76,7 +76,7 @@
 
 #include "MersenneTwister.hpp"
 
-gemfire::SpinLock MTRand::lck;
+apache::geode::client::SpinLock MTRand::lck;
 
 MTRand::MTRand(const uint32_t &oneSeed) { seed(oneSeed); }
 
@@ -116,7 +116,7 @@ double MTRand::randNorm(const double &mean, const double &variance) {
 uint32_t MTRand::randInt() {
   // Pull a 32-bit integer from the generator state
   // Every other access function simply transforms the numbers extracted here
-  gemfire::SpinLockGuard guard(lck);
+  apache::geode::client::SpinLockGuard guard(lck);
 
   if (left <= 0) reload();
   --left;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/MersenneTwister.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/MersenneTwister.hpp b/src/tests/cpp/fwklib/MersenneTwister.hpp
index a7ae040..b4f89cf 100644
--- a/src/tests/cpp/fwklib/MersenneTwister.hpp
+++ b/src/tests/cpp/fwklib/MersenneTwister.hpp
@@ -100,7 +100,7 @@ class MTRand {
   int32_t left;       // number of values left before reload needed
 
  private:
-  static gemfire::SpinLock lck;
+  static apache::geode::client::SpinLock lck;
 
   // Methods
  public:
@@ -152,7 +152,8 @@ class MTRand {
   }
   uint32_t twist(const uint32_t& m, const uint32_t& s0,
                  const uint32_t& s1) const {
-    return m ^ (mixBits(s0, s1) >> 1) ^ (-static_cast<int32_t>(loBit(s1)) & 0x9908b0df);
+    return m ^ (mixBits(s0, s1) >> 1) ^
+           (-static_cast<int32_t>(loBit(s1)) & 0x9908b0df);
   }
   static uint32_t hash(time_t t, clock_t c);
 };

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/PaceMeter.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/PaceMeter.hpp b/src/tests/cpp/fwklib/PaceMeter.hpp
index 1cd5167..2bf7036 100644
--- a/src/tests/cpp/fwklib/PaceMeter.hpp
+++ b/src/tests/cpp/fwklib/PaceMeter.hpp
@@ -30,7 +30,9 @@
 #include <unistd.h>
 #endif
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class Waiter {
@@ -123,6 +125,8 @@ class PaceMeter {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __PaceMeter_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/PerfFwk.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/PerfFwk.cpp b/src/tests/cpp/fwklib/PerfFwk.cpp
index dc72bfe..ff02b3c 100644
--- a/src/tests/cpp/fwklib/PerfFwk.cpp
+++ b/src/tests/cpp/fwklib/PerfFwk.cpp
@@ -19,9 +19,9 @@
 #include "ace/OS.h"
 #include <signal.h>
 
-using namespace gemfire;
-using namespace gemfire::testframework;
-using namespace gemfire::testframework::perf;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
+using namespace apache::geode::client::testframework::perf;
 
 ACE_utsname* PerfSuite::utsname = NULL;
 
@@ -133,7 +133,7 @@ void PerfSuite::addRecord(uint32_t ops, uint32_t micros) {
 ///** create a file in cwd, named "<suite>_results.<host>" */
 // void PerfSuite::save( )
 //{
-//  gemfire::DataOutput output;
+//  apache::geode::client::DataOutput output;
 //  output.writeASCII( m_suiteName.c_str(), m_suiteName.length() );
 //
 //  char hname[100];

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/PerfFwk.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/PerfFwk.hpp b/src/tests/cpp/fwklib/PerfFwk.hpp
index 8b6a276..ce7a6b2 100644
--- a/src/tests/cpp/fwklib/PerfFwk.hpp
+++ b/src/tests/cpp/fwklib/PerfFwk.hpp
@@ -40,7 +40,9 @@
 #include <ace/Condition_T.h>
 #include <ace/Thread_Mutex.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace perf {
 
@@ -146,7 +148,7 @@ class Record {
       m_testName = strdup(name);
     } else {
       m_testName = NULL;
-}
+    }
   }
 
   void setAction(const char* action) {
@@ -155,7 +157,7 @@ class Record {
       m_action = strdup(action);
     } else {
       m_action = NULL;
-}
+    }
   }
 
   void setDate(const char* date) {
@@ -164,7 +166,7 @@ class Record {
       m_runDate = strdup(date);
     } else {
       m_runDate = NULL;
-}
+    }
   }
 
   void setDate() {
@@ -191,20 +193,21 @@ class Record {
   //      return *this;
   //    }
   //
-  inline void write(gemfire::DataOutput& output) {
+  inline void write(apache::geode::client::DataOutput& output) {
     output.writeASCII(m_testName);
     output.writeInt(static_cast<int32_t>(m_operations));
     output.writeInt(static_cast<int32_t>(m_micros));
   }
 
-  inline void read(gemfire::DataInput& input) {
+  inline void read(apache::geode::client::DataInput& input) {
     input.readASCII(&m_testName);
     input.readInt(reinterpret_cast<int32_t*>(&m_operations));
     input.readInt(reinterpret_cast<int32_t*>(&m_micros));
   }
 
   inline std::string perSec() {
-    double ps = ((1000000.0 * static_cast<double>(m_operations)) / static_cast<double>(m_micros));
+    double ps = ((1000000.0 * static_cast<double>(m_operations)) /
+                 static_cast<double>(m_micros));
     std::ostringstream oss;
     if (ps < 10.0) {
       oss.precision(2);
@@ -326,6 +329,8 @@ class Counter {
 
 }  // namespace perf
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __PerfFwk_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/PoolHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/PoolHelper.hpp b/src/tests/cpp/fwklib/PoolHelper.hpp
index 5bc2d82..df6df8e 100644
--- a/src/tests/cpp/fwklib/PoolHelper.hpp
+++ b/src/tests/cpp/fwklib/PoolHelper.hpp
@@ -30,7 +30,9 @@
 #include <string>
 #include <map>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 // ----------------------------------------------------------------------------
@@ -139,7 +141,9 @@ class PoolHelper {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}
+}
+}
 
 // ----------------------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/QueryHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/QueryHelper.hpp b/src/tests/cpp/fwklib/QueryHelper.hpp
index ed0d554..e442bb6 100644
--- a/src/tests/cpp/fwklib/QueryHelper.hpp
+++ b/src/tests/cpp/fwklib/QueryHelper.hpp
@@ -40,7 +40,7 @@
 #define ROOT_SCOPE LOCAL
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace PdxTests;
 using namespace AutoPdxTests;
 
@@ -723,7 +723,7 @@ class QueryHelper {
                          << " is having constant rows ");
         return true;
       }
-}
+    }
 
     return false;
   }
@@ -749,7 +749,7 @@ class QueryHelper {
                          << " is having constant rows ");
         return true;
       }
-}
+    }
 
     return false;
   }
@@ -762,7 +762,7 @@ class QueryHelper {
                constantExpectedRowsPQRS[i]);
         return true;
       }
-}
+    }
 
     return false;
   }
@@ -909,11 +909,12 @@ void QueryHelper::destroyPortfolioOrPositionData(RegionPtr& rptr, int setSize,
             strcmp(dataType, "AutoPortfolioPdx") == 0) {
           ACE_OS::sprintf(portname, "port%d-%d", set, current);
         } else if (strcmp(dataType, "Position") == 0 ||
-                 strcmp(dataType, "PositionPdx") == 0 ||
-                 strcmp(dataType, "AutoPositionPdx") == 0) {
+                   strcmp(dataType, "PositionPdx") == 0 ||
+                   strcmp(dataType, "AutoPositionPdx") == 0) {
           ACE_OS::sprintf(portname, "pos%d-%d", set, current);
         } else {
-          throw gemfire::IllegalArgumentException("Unknown object type");
+          throw apache::geode::client::IllegalArgumentException(
+              "Unknown object type");
         }
 
         keyport = CacheableKey::create(portname);
@@ -938,7 +939,7 @@ void QueryHelper::invalidatePortfolioOrPositionData(RegionPtr& rptr,
           ACE_OS::sprintf(portname, "port%d-%d", set, current);
         } else if (strcmp(dataType, "Position") == 0) {
           ACE_OS::sprintf(portname, "pos%d-%d", set, current);
-}
+        }
 
         CacheableKeyPtr keyport = CacheableKey::create(portname);
         rptr->invalidate(keyport);
@@ -1097,7 +1098,7 @@ bool QueryHelper::verifySS(SelectResultsPtr& structSet, int expectedRows,
   if (!instanceOf<StructSetPtr>(structSet)) {
     if (expectedRows == 0 && expectedFields == 0) {
       return true;  // quite possible we got a null set back.
-}
+    }
     FWKINFO("we have structSet itself NULL");
     return false;
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/RegionHelper.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/RegionHelper.hpp b/src/tests/cpp/fwklib/RegionHelper.hpp
index 4503a39..6605b43 100644
--- a/src/tests/cpp/fwklib/RegionHelper.hpp
+++ b/src/tests/cpp/fwklib/RegionHelper.hpp
@@ -29,7 +29,9 @@
 #include <string>
 #include <map>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 // ----------------------------------------------------------------------------
@@ -239,9 +241,8 @@ class RegionHelper {
       poolName = atts->getPoolName();
     } else {
       poolName = "";
-
-    
-}region = regionFac->create(regionName.c_str());
+    }
+    region = regionFac->create(regionName.c_str());
     FWKINFO("Region created with name = " << regionName + " and pool name= "
                                           << poolName);
     FWKINFO(" Region Created with following attributes :"
@@ -251,7 +252,9 @@ class RegionHelper {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 // ----------------------------------------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/Service.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/Service.cpp b/src/tests/cpp/fwklib/Service.cpp
index 819b6a7..ded804d 100644
--- a/src/tests/cpp/fwklib/Service.cpp
+++ b/src/tests/cpp/fwklib/Service.cpp
@@ -17,8 +17,8 @@
 #include "Service.hpp"
 #include "fwklib/FwkLog.hpp"
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 Service::Service(int32_t threadCnt)
     : m_ThreadCount(threadCnt), m_run(true), m_Mutex() {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/Service.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/Service.hpp b/src/tests/cpp/fwklib/Service.hpp
index 9c134c5..132d066 100644
--- a/src/tests/cpp/fwklib/Service.hpp
+++ b/src/tests/cpp/fwklib/Service.hpp
@@ -27,7 +27,9 @@
 
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class SharedTaskObject {
@@ -84,7 +86,9 @@ class Service : public ACE_Task_Base {
 
   int32_t runThreaded(ServiceTask* task, uint32_t threads);
 
-  inline uint32_t getBusyCount() { return static_cast<uint32_t>(m_busy.value()); }
+  inline uint32_t getBusyCount() {
+    return static_cast<uint32_t>(m_busy.value());
+  }
   inline uint32_t getIdleCount() {
     return m_ThreadCount - static_cast<uint32_t>(m_busy.value());
   }
@@ -156,5 +160,7 @@ class IPCMessage {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // __Service_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TaskClient.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TaskClient.cpp b/src/tests/cpp/fwklib/TaskClient.cpp
index f063fec..795bac8 100644
--- a/src/tests/cpp/fwklib/TaskClient.cpp
+++ b/src/tests/cpp/fwklib/TaskClient.cpp
@@ -31,8 +31,8 @@
 #include <unistd.h>
 #endif
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 #ifdef WIN32
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TaskClient.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TaskClient.hpp b/src/tests/cpp/fwklib/TaskClient.hpp
index e683f46..787a916 100644
--- a/src/tests/cpp/fwklib/TaskClient.hpp
+++ b/src/tests/cpp/fwklib/TaskClient.hpp
@@ -29,7 +29,9 @@
 
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 #ifdef WIN32
@@ -176,6 +178,8 @@ class TaskClient : public ACE_Task_Base {
 };  // TaskClient
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __TaskClient_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TcpIpc.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TcpIpc.cpp b/src/tests/cpp/fwklib/TcpIpc.cpp
index fbf8a69..063a694 100644
--- a/src/tests/cpp/fwklib/TcpIpc.cpp
+++ b/src/tests/cpp/fwklib/TcpIpc.cpp
@@ -28,8 +28,8 @@
 #include <ace/SOCK_Acceptor.h>
 #include <ace/OS.h>
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 void TcpIpc::clearNagle(int32_t sock) {
   int32_t val = 1;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TcpIpc.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TcpIpc.hpp b/src/tests/cpp/fwklib/TcpIpc.hpp
index dd7b0be..03422d1 100644
--- a/src/tests/cpp/fwklib/TcpIpc.hpp
+++ b/src/tests/cpp/fwklib/TcpIpc.hpp
@@ -23,7 +23,9 @@
 #include <ace/SOCK_Acceptor.h>
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class TcpIpc {
@@ -67,6 +69,8 @@ class TcpIpc {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __TcpIpc_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TestClient.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TestClient.cpp b/src/tests/cpp/fwklib/TestClient.cpp
index d7a795d..ab7bb73 100644
--- a/src/tests/cpp/fwklib/TestClient.cpp
+++ b/src/tests/cpp/fwklib/TestClient.cpp
@@ -18,9 +18,9 @@
 #include "fwklib/Timer.hpp"
 #include "fwklib/FwkLog.hpp"
 
-using namespace gemfire;
-using namespace gemfire::testframework;
-using namespace gemfire::testframework::perf;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
+using namespace apache::geode::client::testframework::perf;
 
 TestClient* TestClient::m_instance = NULL;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TestClient.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TestClient.hpp b/src/tests/cpp/fwklib/TestClient.hpp
index ed465ea..707a651 100644
--- a/src/tests/cpp/fwklib/TestClient.hpp
+++ b/src/tests/cpp/fwklib/TestClient.hpp
@@ -23,7 +23,9 @@
 
 #include "ace/Task.h"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class TestClient : public ACE_Task_Base {
@@ -112,5 +114,7 @@ class TestClient : public ACE_Task_Base {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // __TestClient_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TimeBomb.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TimeBomb.cpp b/src/tests/cpp/fwklib/TimeBomb.cpp
index a716d91..a1c4e6e 100644
--- a/src/tests/cpp/fwklib/TimeBomb.cpp
+++ b/src/tests/cpp/fwklib/TimeBomb.cpp
@@ -20,9 +20,9 @@
 #include "fwklib/FwkLog.hpp"
 #include "fwklib/PerfFwk.hpp"
 
-using namespace gemfire;
-using namespace gemfire::testframework;
-using namespace gemfire::testframework::perf;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
+using namespace apache::geode::client::testframework::perf;
 
 int32_t TimeBomb::svc() {
   while (!m_stop) {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TimeBomb.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TimeBomb.hpp b/src/tests/cpp/fwklib/TimeBomb.hpp
index 9e0da1f..6d8a284 100644
--- a/src/tests/cpp/fwklib/TimeBomb.hpp
+++ b/src/tests/cpp/fwklib/TimeBomb.hpp
@@ -25,7 +25,9 @@
 #include "ace/Task.h"
 #include <ace/OS.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class TimeBomb : public ACE_Task_Base {
@@ -76,5 +78,7 @@ class TimeBomb : public ACE_Task_Base {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // __TimeBomb_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TimeLimit.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TimeLimit.hpp b/src/tests/cpp/fwklib/TimeLimit.hpp
index 75b9ac2..33dad8c 100644
--- a/src/tests/cpp/fwklib/TimeLimit.hpp
+++ b/src/tests/cpp/fwklib/TimeLimit.hpp
@@ -21,7 +21,9 @@
 #include "fwklib/FwkLog.hpp"
 #include <ace/Time_Value.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 class TimeLimit {
@@ -43,6 +45,8 @@ class TimeLimit {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}
+}
+}
 
 #endif  // __TimeLimit_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TimeSync.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TimeSync.cpp b/src/tests/cpp/fwklib/TimeSync.cpp
index bfd4076..2f76036 100644
--- a/src/tests/cpp/fwklib/TimeSync.cpp
+++ b/src/tests/cpp/fwklib/TimeSync.cpp
@@ -36,8 +36,8 @@
 #include <arpa/inet.h>
 #endif
 
-using namespace gemfire;
-using namespace gemfire::testframework;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
 
 // Our configuration parameters
 #define TIME_SYNC_ADDR "224.0.37.37"

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/TimeSync.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/TimeSync.hpp b/src/tests/cpp/fwklib/TimeSync.hpp
index ef4e2dd..a5809af 100644
--- a/src/tests/cpp/fwklib/TimeSync.hpp
+++ b/src/tests/cpp/fwklib/TimeSync.hpp
@@ -24,7 +24,9 @@
 #include "ace/OS.h"
 #include "ace/Task.h"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 // Some useful conversion constants
@@ -85,5 +87,7 @@ class TimeSync : public ACE_Task_Base {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 #endif  // __TimeSync_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/Timer.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/Timer.hpp b/src/tests/cpp/fwklib/Timer.hpp
index e9b44cd..2447ee4 100644
--- a/src/tests/cpp/fwklib/Timer.hpp
+++ b/src/tests/cpp/fwklib/Timer.hpp
@@ -42,7 +42,9 @@
 
 #endif
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 #ifdef _WIN32
@@ -171,6 +173,8 @@ class HRTimer {
 };
 
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __Timer_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/UDPIpc.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/UDPIpc.cpp b/src/tests/cpp/fwklib/UDPIpc.cpp
index 7883c6a..a5a7928 100644
--- a/src/tests/cpp/fwklib/UDPIpc.cpp
+++ b/src/tests/cpp/fwklib/UDPIpc.cpp
@@ -23,7 +23,7 @@
 #include <sstream>
 
 using namespace std;
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testframework;
 
 bool UDPMessage::ping(ACE_SOCK_Dgram& io, ACE_INET_Addr& who) {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/fwklib/UDPIpc.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/fwklib/UDPIpc.hpp b/src/tests/cpp/fwklib/UDPIpc.hpp
index c3ab415..28060a5 100644
--- a/src/tests/cpp/fwklib/UDPIpc.hpp
+++ b/src/tests/cpp/fwklib/UDPIpc.hpp
@@ -46,7 +46,9 @@
 
 #endif  // WIN32
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 
 #define UDP_HEADER_SIZE 8
@@ -110,9 +112,10 @@ class UDPMessage : public IPCMessage {
   const char* cmdString(uint32_t cmd) {
     const char* UdpStrings[] = {"Null", "ACK", "ACK_REQUEST", "ADDR_REQUEST",
                                 "ADDR_RESPONSE"};
-    if (cmd > 4) { return "UNKNOWN";
-    
-}return UdpStrings[cmd];
+    if (cmd > 4) {
+      return "UNKNOWN";
+    }
+    return UdpStrings[cmd];
   }
 
   void clearHdr() {
@@ -288,6 +291,8 @@ class Responder : public ServiceTask {
   void finalize() { m_io->close(); }
 };
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif  // __UDPIpc_hpp__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.cpp b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.cpp
index 9957544..0f9c1c6 100644
--- a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.cpp
+++ b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.cpp
@@ -17,7 +17,7 @@
 
 #include "AutoPdxVersioned1.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace AutoPdxTests;
 
 template <typename T1, typename T2>

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp
index 23af932..5af55fd 100644
--- a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp
+++ b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp
@@ -39,7 +39,7 @@
 #define GFARRAYSIZE(X)
 #define GFARRAYELEMSIZE(X)
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace AutoPdxTests {
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.cpp b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.cpp
index 1c5e4c2..c22e170 100644
--- a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.cpp
+++ b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.cpp
@@ -17,7 +17,7 @@
 
 #include "AutoPdxVersioned2.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace AutoPdxTests;
 
 // TEST_EXPORT Serializable * createAutoPdxVersioned2(const char* key) {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp
index ad2ebed..d08e060 100644
--- a/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp
+++ b/src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp
@@ -62,7 +62,7 @@
 #define GFARRAYSIZE(X)
 #define GFARRAYELEMSIZE(X)
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace AutoPdxTests {
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.cpp b/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.cpp
index c689d3b..fe6d379 100644
--- a/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.cpp
+++ b/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.cpp
@@ -16,7 +16,7 @@
  */
 #include "PortfolioPdx.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace AutoPdxTests;
 
 char *PortfolioPdx::secIds[] = {(char *)"SUN",  (char *)"IBM",  (char *)"YHOO",

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp b/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp
index 0335598..921b352 100644
--- a/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp
+++ b/src/tests/cpp/pdxautoserializerclass/PortfolioPdx.hpp
@@ -28,7 +28,7 @@
 #define GFID
 #define GFARRAYSIZE(X)
 #define GFARRAYELEMSIZE(X)
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace AutoPdxTests {
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/pdxautoserializerclass/PositionPdx.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/PositionPdx.cpp b/src/tests/cpp/pdxautoserializerclass/PositionPdx.cpp
index e46b1ad..637c5f1 100644
--- a/src/tests/cpp/pdxautoserializerclass/PositionPdx.cpp
+++ b/src/tests/cpp/pdxautoserializerclass/PositionPdx.cpp
@@ -18,7 +18,7 @@
 #include <cwchar>
 #include <wchar.h>
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace AutoPdxTests;
 
 int32_t PositionPdx::cnt = 0;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp b/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp
index a8991b5..d8989c9 100644
--- a/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp
+++ b/src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp
@@ -43,12 +43,12 @@
 #define GFARRAYSIZE(X)
 #define GFARRAYELEMSIZE(X)
 
-using namespace gemfire;
+using namespace apache::geode::client;
 
 namespace AutoPdxTests {
 
 class GFIGNORE(TESTOBJECT_EXPORT) PositionPdx
-    : public gemfire::PdxSerializable {
+    : public apache::geode::client::PdxSerializable {
  private:
   GFID int64_t avg20DaysVol;
   GFID char* bondRating;
@@ -102,6 +102,6 @@ class GFIGNORE(TESTOBJECT_EXPORT) PositionPdx
   void init();
 };
 
-typedef gemfire::SharedPtr<PositionPdx> PositionPdxPtr;
+typedef apache::geode::client::SharedPtr<PositionPdx> PositionPdxPtr;
 }  // namespace AutoPdxTests
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/CredentialGenerator.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/CredentialGenerator.cpp b/src/tests/cpp/security/CredentialGenerator.cpp
index d2095b2..77f30c8 100644
--- a/src/tests/cpp/security/CredentialGenerator.cpp
+++ b/src/tests/cpp/security/CredentialGenerator.cpp
@@ -23,7 +23,7 @@
 #include "PkcsCredentialGenerator.hpp"
 #include "NoopCredentialGenerator.hpp"
 
-using namespace gemfire::testframework::security;
+using namespace apache::geode::client::testframework::security;
 
 CredentialGenerator::registeredClassMap* CredentialGenerator::generatormap =
     NULL;

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/CredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/CredentialGenerator.hpp b/src/tests/cpp/security/CredentialGenerator.hpp
index 0ae13b6..7480479 100644
--- a/src/tests/cpp/security/CredentialGenerator.hpp
+++ b/src/tests/cpp/security/CredentialGenerator.hpp
@@ -50,7 +50,9 @@
 
 #include <map>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -266,6 +268,8 @@ class CredentialGenerator : public SharedBase {
 
 }  // namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/DummyCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/DummyCredentialGenerator.hpp b/src/tests/cpp/security/DummyCredentialGenerator.hpp
index 7cfa728..58493ba 100644
--- a/src/tests/cpp/security/DummyCredentialGenerator.hpp
+++ b/src/tests/cpp/security/DummyCredentialGenerator.hpp
@@ -20,7 +20,9 @@
 #include "CredentialGenerator.hpp"
 #include "XmlAuthzCredentialGenerator.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -46,7 +48,7 @@ class DummyCredentialGenerator : public CredentialGenerator {
     } else {
       additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
                        std::string(workingDir) + std::string("authz-dummy.xml");
-}
+    }
 
     return additionalArgs;
   }
@@ -96,6 +98,8 @@ class DummyCredentialGenerator : public CredentialGenerator {
 
 }  // namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/DummyCredentialGenerator2.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/DummyCredentialGenerator2.hpp b/src/tests/cpp/security/DummyCredentialGenerator2.hpp
index 0e8d363..2e01c1c 100644
--- a/src/tests/cpp/security/DummyCredentialGenerator2.hpp
+++ b/src/tests/cpp/security/DummyCredentialGenerator2.hpp
@@ -20,7 +20,9 @@
 #include "CredentialGenerator.hpp"
 #include "XmlAuthzCredentialGenerator.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -45,7 +47,7 @@ class DummyCredentialGenerator2 : public CredentialGenerator {
     } else {
       additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
                        std::string(workingDir) + std::string("authz-dummy.xml");
-}
+    }
 
     return additionalArgs;
   }
@@ -95,6 +97,8 @@ class DummyCredentialGenerator2 : public CredentialGenerator {
 
 }  // namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/DummyCredentialGenerator3.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/DummyCredentialGenerator3.hpp b/src/tests/cpp/security/DummyCredentialGenerator3.hpp
index 8350d33..99d19e0 100644
--- a/src/tests/cpp/security/DummyCredentialGenerator3.hpp
+++ b/src/tests/cpp/security/DummyCredentialGenerator3.hpp
@@ -20,7 +20,9 @@
 #include "CredentialGenerator.hpp"
 #include "XmlAuthzCredentialGenerator.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -45,7 +47,7 @@ class DummyCredentialGenerator3 : public CredentialGenerator {
     } else {
       additionalArgs = std::string(" --J=-Dgemfire.security-authz-xml-uri=") +
                        std::string(workingDir) + std::string("authz-dummy.xml");
-}
+    }
 
     return additionalArgs;
   }
@@ -95,6 +97,8 @@ class DummyCredentialGenerator3 : public CredentialGenerator {
 
 }  // namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/LdapUserCredentialGenerator.hpp b/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
index 6be6dc3..376ddfd 100644
--- a/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
+++ b/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
@@ -23,7 +23,9 @@
 #include <ace/ACE.h>
 #include <ace/OS.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -108,6 +110,8 @@ class LdapUserCredentialGenerator : public CredentialGenerator {
 
 }  // namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /*_GEMFIRE_LDAPUSERCREDENTIALGENERATOR_HPP_*/

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/NoopCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/NoopCredentialGenerator.hpp b/src/tests/cpp/security/NoopCredentialGenerator.hpp
index df42041..75cac78 100644
--- a/src/tests/cpp/security/NoopCredentialGenerator.hpp
+++ b/src/tests/cpp/security/NoopCredentialGenerator.hpp
@@ -19,7 +19,9 @@
 
 #include "CredentialGenerator.hpp"
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -54,6 +56,8 @@ class NoopCredentialGenerator : public CredentialGenerator {
 
 }  // namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/PkcsAuthInit.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/PkcsAuthInit.cpp b/src/tests/cpp/security/PkcsAuthInit.cpp
index 6e31b0a..60d426d 100644
--- a/src/tests/cpp/security/PkcsAuthInit.cpp
+++ b/src/tests/cpp/security/PkcsAuthInit.cpp
@@ -22,7 +22,9 @@
 #include "stdio.h"
 #include <string>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 CacheableStringPtr convertBytesToString(const uint8_t* bytes, int32_t length,
                                         size_t maxLength) {
   if (bytes != NULL) {
@@ -212,4 +214,6 @@ PropertiesPtr PKCSAuthInitInternal::getCredentials(PropertiesPtr& securityprops,
                       signatureValPtr);
   return credentials;
 }
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/PkcsAuthInit.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/PkcsAuthInit.hpp b/src/tests/cpp/security/PkcsAuthInit.hpp
index 77a5f71..52d170c 100644
--- a/src/tests/cpp/security/PkcsAuthInit.hpp
+++ b/src/tests/cpp/security/PkcsAuthInit.hpp
@@ -47,7 +47,9 @@ const char KEYSTORE_PASSWORD1[] = "security-keystorepass";
 
 const char SIGNATURE_DATA1[] = "security-signature";
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 
 /**
  * @class PKCSAuthInit Implementation PKCSAuthInit.hpp
@@ -98,5 +100,8 @@ class PKCSAuthInitInternal : public AuthInitialize {
  private:
   bool m_stringCredentials;
 };
-}  // namespace gemfire;
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
+
 #endif  //_GEMFIRE__PKCSAUTHINIT__HPP

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/PkcsCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/PkcsCredentialGenerator.hpp b/src/tests/cpp/security/PkcsCredentialGenerator.hpp
index 5f582c2..86ac159 100644
--- a/src/tests/cpp/security/PkcsCredentialGenerator.hpp
+++ b/src/tests/cpp/security/PkcsCredentialGenerator.hpp
@@ -28,7 +28,9 @@ const char KEYSTORE_PASSWORD[] = "security-keystorepass";
 #include <ace/ACE.h>
 #include <ace/OS.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -136,6 +138,8 @@ class PKCSCredentialGenerator : public CredentialGenerator {
 
 }  // namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /*_GEMFIRE_PKCSCREDENTIALGENERATOR_HPP_*/

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/Security.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/Security.cpp b/src/tests/cpp/security/Security.cpp
index 10eb7be..0f4d850 100644
--- a/src/tests/cpp/security/Security.cpp
+++ b/src/tests/cpp/security/Security.cpp
@@ -48,9 +48,9 @@ std::string READYCLIENTS("ReadyClients");
 }  // namespace FwkSecurity
 
 using namespace FwkSecurity;
-using namespace gemfire;
-using namespace gemfire::testframework;
-using namespace gemfire::testframework::security;
+using namespace apache::geode::client;
+using namespace apache::geode::client::testframework;
+using namespace apache::geode::client::testframework::security;
 
 Security *g_test = NULL;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/Security.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/Security.hpp b/src/tests/cpp/security/Security.hpp
index 89ea903..d7318c8 100644
--- a/src/tests/cpp/security/Security.hpp
+++ b/src/tests/cpp/security/Security.hpp
@@ -51,7 +51,9 @@
 
 #define LAT_MARK 0x55667788
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -112,7 +114,9 @@ class Security : public FrameworkTest {
 
 }  //   namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 // ----------------------------------------------------------------------------
 
 #endif  // __SECURITY_HPP__

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
index 47e650a..41b6a6d 100644
--- a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
+++ b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
@@ -26,7 +26,9 @@
 #include <time.h>
 #include <stdlib.h>
 
-namespace gemfire {
+namespace apache {
+namespace geode {
+namespace client {
 namespace testframework {
 namespace security {
 
@@ -305,6 +307,8 @@ class XmlAuthzCredentialGenerator : public SharedBase {
 
 }  // namespace security
 }  // namespace testframework
-}  // namespace gemfire
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
 
 #endif /*_GEMFIRE_AUTHZCREDENTIALGENERATOR_HPP_*/

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/security/typedefs.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/security/typedefs.hpp b/src/tests/cpp/security/typedefs.hpp
index ab18b0a..286ece6 100644
--- a/src/tests/cpp/security/typedefs.hpp
+++ b/src/tests/cpp/security/typedefs.hpp
@@ -25,7 +25,9 @@ _Pragma("GCC system_header")
 #include <string>
 #include <algorithm>
 
-    namespace gemfire {
+    namespace apache {
+  namespace geode {
+  namespace client {
   namespace testframework {
   namespace security {
 
@@ -123,6 +125,8 @@ _Pragma("GCC system_header")
 
   }  // namespace security
   }  // namespace testframework
-}  // namespace gemfire
+  }  // namespace client
+  }  // namespace geode
+}  // namespace apache
 
 #endif /*__TYPEDEFS_HPP_*/

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/ArrayOfByte.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/ArrayOfByte.hpp b/src/tests/cpp/testobject/ArrayOfByte.hpp
index 0ee60cd..c28ccaf 100644
--- a/src/tests/cpp/testobject/ArrayOfByte.hpp
+++ b/src/tests/cpp/testobject/ArrayOfByte.hpp
@@ -33,7 +33,7 @@
 #define TESTOBJECT_EXPORT
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testframework;
 
 namespace testobject {
@@ -64,7 +64,8 @@ class TESTOBJECT_EXPORT ArrayOfByte {
       int32 rsiz = (bufSize <= 20) ? bufSize : 20;
       GsRandom::getAlphanumericString(rsiz, buf);
       memcpy(buf, dos.getBuffer(), dos.getBufferLength());
-      return CacheableBytes::createNoCopy(reinterpret_cast<uint8_t *>(buf), bufSize);
+      return CacheableBytes::createNoCopy(reinterpret_cast<uint8_t *>(buf),
+                                          bufSize);
     } else if (encodeTimestamp) {
       FWKEXCEPTION("Should not happen");
     } else {
@@ -74,7 +75,8 @@ class TESTOBJECT_EXPORT ArrayOfByte {
 
   static int64_t getTimestamp(CacheableBytesPtr bytes) {
     if (bytes == NULLPTR) {
-      throw gemfire::IllegalArgumentException("the bytes arg was null");
+      throw apache::geode::client::IllegalArgumentException(
+          "the bytes arg was null");
     }
     DataInput di(bytes->value(), bytes->length());
     try {

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/BatchObject.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/BatchObject.cpp b/src/tests/cpp/testobject/BatchObject.cpp
index b6a30d5..c93e907 100644
--- a/src/tests/cpp/testobject/BatchObject.cpp
+++ b/src/tests/cpp/testobject/BatchObject.cpp
@@ -16,7 +16,7 @@
  */
 #include "BatchObject.hpp"
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testframework;
 using namespace testobject;
 
@@ -32,14 +32,15 @@ BatchObject::BatchObject(int32_t anIndex, int32_t batchSize, int32_t size) {
 }
 
 BatchObject::~BatchObject() {}
-void BatchObject::toData(gemfire::DataOutput& output) const {
+void BatchObject::toData(apache::geode::client::DataOutput& output) const {
   output.writeInt(static_cast<int32_t>(index));
   output.writeInt(static_cast<int64_t>(timestamp));
   output.writeInt(static_cast<int32_t>(batch));
   output.writeObject(byteArray);
 }
 
-gemfire::Serializable* BatchObject::fromData(gemfire::DataInput& input) {
+apache::geode::client::Serializable* BatchObject::fromData(
+    apache::geode::client::DataInput& input) {
   input.readInt(&index);
   input.readInt(reinterpret_cast<int64_t*>(&timestamp));
   input.readInt(&batch);

http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/tests/cpp/testobject/BatchObject.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/BatchObject.hpp b/src/tests/cpp/testobject/BatchObject.hpp
index 914e57c..128c76d 100644
--- a/src/tests/cpp/testobject/BatchObject.hpp
+++ b/src/tests/cpp/testobject/BatchObject.hpp
@@ -41,7 +41,7 @@
 #define TESTOBJECT_EXPORT
 #endif
 
-using namespace gemfire;
+using namespace apache::geode::client;
 using namespace testframework;
 namespace testobject {
 class TESTOBJECT_EXPORT BatchObject : public TimestampedObject {
@@ -59,8 +59,9 @@ class TESTOBJECT_EXPORT BatchObject : public TimestampedObject {
   BatchObject() : index(0), timestamp(0), batch(0), byteArray(NULLPTR) {}
   BatchObject(int32_t anIndex, int32_t batchSize, int32_t size);
   virtual ~BatchObject();
-  virtual void toData(gemfire::DataOutput& output) const;
-  virtual gemfire::Serializable* fromData(gemfire::DataInput& input);
+  virtual void toData(apache::geode::client::DataOutput& output) const;
+  virtual apache::geode::client::Serializable* fromData(
+      apache::geode::client::DataInput& input);
   virtual int32_t classId() const { return 25; }
   CacheableStringPtr toString() const;
 
@@ -80,11 +81,11 @@ class TESTOBJECT_EXPORT BatchObject : public TimestampedObject {
     timestamp = tusec * 1000;
   }
 
-  static gemfire::Serializable* createDeserializable() {
+  static apache::geode::client::Serializable* createDeserializable() {
     return new BatchObject();
   }
 };
 
-typedef gemfire::SharedPtr<BatchObject> BatchObjectPtr;
+typedef apache::geode::client::SharedPtr<BatchObject> BatchObjectPtr;
 }  // namespace testobject
 #endif