geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [40/50] [abbrv] geode git commit: GEODE-2316: Renamed namespace GemStone.GemFire.Cache -> Apache.Geode.Client
Date Mon, 23 Jan 2017 19:17:32 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedPersistenceManager.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedPersistenceManager.cpp b/src/clicache/src/impl/ManagedPersistenceManager.cpp
index 22e6caf..932d521 100644
--- a/src/clicache/src/impl/ManagedPersistenceManager.cpp
+++ b/src/clicache/src/impl/ManagedPersistenceManager.cpp
@@ -37,8 +37,8 @@ namespace apache
       {
         try
         {
-          String^ mg_assemblyPath = GemStone::GemFire::Cache::Generic::ManagedString::Get(assemblyPath);
-          String^ mg_factoryFunctionName = GemStone::GemFire::Cache::Generic::ManagedString::Get(factoryFunctionName);
+          String^ mg_assemblyPath = Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath);
+          String^ mg_factoryFunctionName = Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName);
           String^ mg_typeName = nullptr;
 
           String^ mg_genericKey = nullptr;
@@ -92,7 +92,7 @@ namespace apache
           mg_genericVal = mg_genericVal->Trim();
           mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1);
 
-          GemStone::GemFire::Cache::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.",
+          Apache::Geode::Client::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.",
             mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName);
 
           typeBuilder->Append("`2");
@@ -114,7 +114,7 @@ namespace apache
             throw IllegalArgumentException(ex_str.c_str());
           }
 
-          GemStone::GemFire::Cache::Generic::Log::Debug("Loading type: [{0}]", mg_typeName);
+          Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName);
 
           Type^ typeInst = assmb->GetType(mg_typeName, false, true);
 
@@ -131,7 +131,7 @@ namespace apache
             }
 
             typeInst = typeInst->MakeGenericType(types);
-            GemStone::GemFire::Cache::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName);
+            Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName);
 
             MethodInfo^ mInfo = typeInst->GetMethod(mg_factoryFunctionName,
               BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase);
@@ -145,7 +145,7 @@ namespace apache
               }
               catch (System::Exception^ ex)
               {
-                GemStone::GemFire::Cache::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message);
+                Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message);
                 managedptr = nullptr;
               }
               if (managedptr == nullptr)
@@ -160,7 +160,7 @@ namespace apache
 
               ManagedPersistenceManagerGeneric* mgcl = new ManagedPersistenceManagerGeneric(managedptr);
 
-              Type^ clgType = Type::GetType("GemStone.GemFire.Cache.Generic.PersistenceManagerGeneric`2");
+              Type^ clgType = Type::GetType("Apache.Geode.Client.Generic.PersistenceManagerGeneric`2");
               clgType = clgType->MakeGenericType(types);
               Object^ clg = Activator::CreateInstance(clgType);
 
@@ -169,7 +169,7 @@ namespace apache
               params[0] = managedptr;
               mInfo->Invoke(clg, params);
 
-              mgcl->setptr((GemStone::GemFire::Cache::Generic::IPersistenceManagerProxy^)clg);
+              mgcl->setptr((Apache::Geode::Client::Generic::IPersistenceManagerProxy^)clg);
 
               return mgcl;
             }
@@ -185,7 +185,7 @@ namespace apache
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName);
+            Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName);
             std::string ex_str = "ManagedPersistenceManagerGeneric: Could not load type [";
             ex_str += typeName.CharPtr;
             ex_str += "] in assembly: ";
@@ -199,7 +199,7 @@ namespace apache
         }
         catch (System::Exception^ ex)
         {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedPersistenceManagerGeneric: Got an exception while "
             "loading managed library: ";
           ex_str += mg_exStr.CharPtr;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedPersistenceManager.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedPersistenceManager.hpp b/src/clicache/src/impl/ManagedPersistenceManager.hpp
index 2afd404..0797e0f 100644
--- a/src/clicache/src/impl/ManagedPersistenceManager.hpp
+++ b/src/clicache/src/impl/ManagedPersistenceManager.hpp
@@ -27,7 +27,7 @@ namespace apache {
     namespace client {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.IPersistenceManager" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.IPersistenceManager" />
       /// object and implements the native <c>apache::geode::client::PersistenceManager</c> interface.
       /// </summary>
       class ManagedPersistenceManagerGeneric : public apache::geode::client::PersistenceManager
@@ -50,7 +50,7 @@ namespace apache {
         virtual void destroy(const CacheableKeyPtr& key, void *& PersistenceInfo);
         virtual void close();
 
-        inline void setptr(GemStone::GemFire::Cache::Generic::IPersistenceManagerProxy^ managedptr)
+        inline void setptr(Apache::Geode::Client::Generic::IPersistenceManagerProxy^ managedptr)
         {
           m_managedptr = managedptr;
         }
@@ -69,7 +69,7 @@ namespace apache {
         /// to be called which is not what is desired when this object is destroyed. Normally this
         /// managed object may be created by the user and will be handled automatically by the GC.
         /// </summary>
-        gcroot<GemStone::GemFire::Cache::Generic::IPersistenceManagerProxy^> m_managedptr;
+        gcroot<Apache::Geode::Client::Generic::IPersistenceManagerProxy^> m_managedptr;
 
         gcroot<Object^> m_userptr;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedResultCollector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedResultCollector.cpp b/src/clicache/src/impl/ManagedResultCollector.cpp
index 66beb2f..a1fda0a 100644
--- a/src/clicache/src/impl/ManagedResultCollector.cpp
+++ b/src/clicache/src/impl/ManagedResultCollector.cpp
@@ -45,9 +45,9 @@ namespace apache
         try
         {
           String^ mg_assemblyPath =
-            GemStone::GemFire::Cache::Generic::ManagedString::Get(assemblyPath);
+            Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath);
           String^ mg_factoryFunctionName =
-            GemStone::GemFire::Cache::Generic::ManagedString::Get(factoryFunctionName);
+            Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName);
           String^ mg_typeName = nullptr;
           Int32 dotIndx = -1;
 
@@ -85,18 +85,18 @@ namespace apache
               BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase);
             if (mInfo != nullptr)
             {
-              //GemStone::GemFire::Cache::Generic::ResultCollector<Object^>^ managedptr = nullptr;
+              //Apache::Geode::Client::Generic::ResultCollector<Object^>^ managedptr = nullptr;
               Object^ userptr = nullptr;
               try
               {
                 throw apache::geode::client::UnsupportedOperationException("Not supported");
-                /*managedptr = dynamic_cast<GemStone::GemFire::Cache::Generic::ResultCollector<Object^>^>(
+                /*managedptr = dynamic_cast<Apache::Geode::Client::Generic::ResultCollector<Object^>^>(
                   mInfo->Invoke( typeInst, nullptr ) );*/
                 userptr = mInfo->Invoke(typeInst, nullptr);
               }
               catch (System::Exception^ ex)
               {
-                GemStone::GemFire::Cache::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message);
+                Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message);
                 userptr = nullptr;
               }
               if (userptr == nullptr)
@@ -109,7 +109,7 @@ namespace apache
                 throw apache::geode::client::IllegalArgumentException(ex_str.c_str());
               }
               //TODO::need to pass proper pointer here
-              return new ManagedResultCollectorGeneric(/*(GemStone::GemFire::Cache::Generic::ResultCollector<Object^>^) managedptr*/nullptr);
+              return new ManagedResultCollectorGeneric(/*(Apache::Geode::Client::Generic::ResultCollector<Object^>^) managedptr*/nullptr);
             }
             else
             {
@@ -123,7 +123,7 @@ namespace apache
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName);
+            Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName);
             std::string ex_str = "ManagedResultCollector: Could not load type [";
             ex_str += typeName.CharPtr;
             ex_str += "] in assembly: ";
@@ -137,7 +137,7 @@ namespace apache
         }
         catch (System::Exception^ ex)
         {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedResultCollector: Got an exception while "
             "loading managed library: ";
           ex_str += mg_exStr.CharPtr;
@@ -149,16 +149,16 @@ namespace apache
       void ManagedResultCollectorGeneric::addResult(CacheablePtr& result)
       {
         try {
-          //GemStone::GemFire::Cache::IGFSerializable^ res = SafeUMSerializableConvertGeneric(result.ptr());
-          Object^ rs = GemStone::GemFire::Cache::Generic::Serializable::GetManagedValueGeneric<Object^>(result);
+          //Apache::Geode::Client::IGFSerializable^ res = SafeUMSerializableConvertGeneric(result.ptr());
+          Object^ rs = Apache::Geode::Client::Generic::Serializable::GetManagedValueGeneric<Object^>(result);
           m_managedptr->AddResult(rs);
           //m_managedptr->AddResult( SafeUMSerializableConvert( result.ptr( ) ) );
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedResultCollector: Got an exception in"
             "addResult: ";
           ex_str += mg_exStr.CharPtr;
@@ -173,18 +173,18 @@ namespace apache
           //apache::geode::client::CacheableVectorPtr rsptr = apache::geode::client::CacheableVector::create();
           //for( int index = 0; index < rs->Length; index++ )
           //{
-          //  //apache::geode::client::CacheablePtr valueptr(GemStone::GemFire::Cache::Generic::Serializable::GetUnmanagedValueGeneric<IGFSerializable^>(rs[ index]));
+          //  //apache::geode::client::CacheablePtr valueptr(Apache::Geode::Client::Generic::Serializable::GetUnmanagedValueGeneric<IGFSerializable^>(rs[ index]));
           //  apache::geode::client::CacheablePtr valueptr (SafeMSerializableConvert(rs[ index]));
           //  rsptr->push_back(valueptr);
           //}
           //return rsptr;
           throw apache::geode::client::IllegalStateException("This should not be get callled.");
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedResultCollector: Got an exception in"
             "getResult: ";
           ex_str += mg_exStr.CharPtr;
@@ -197,11 +197,11 @@ namespace apache
         try {
           m_managedptr->EndResults();
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedResultCollector: Got an exception in"
             "endResults: ";
           ex_str += mg_exStr.CharPtr;
@@ -213,11 +213,11 @@ namespace apache
         try {
           m_managedptr->ClearResults(/*false*/);
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedResultCollector: Got an exception in"
             "clearResults: ";
           ex_str += mg_exStr.CharPtr;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedResultCollector.hpp b/src/clicache/src/impl/ManagedResultCollector.hpp
index 09749e2..50633cc 100644
--- a/src/clicache/src/impl/ManagedResultCollector.hpp
+++ b/src/clicache/src/impl/ManagedResultCollector.hpp
@@ -33,7 +33,7 @@ namespace apache {
     namespace client {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.IResultCollector" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.IResultCollector" />
       /// object and implements the native <c>apache::geode::client::ResultCollector</c> interface.
       /// </summary>
       class ManagedResultCollectorGeneric
@@ -47,7 +47,7 @@ namespace apache {
         /// <param name="userptr">
         /// The managed object.
         /// </param>
-        inline ManagedResultCollectorGeneric(GemStone::GemFire::Cache::Generic::ResultCollectorG^ userptr)
+        inline ManagedResultCollectorGeneric(Apache::Geode::Client::Generic::ResultCollectorG^ userptr)
           : m_managedptr(userptr) { }
 
         /// <summary>
@@ -82,7 +82,7 @@ namespace apache {
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::ResultCollectorG^ ptr() const
+        inline Apache::Geode::Client::Generic::ResultCollectorG^ ptr() const
         {
           return m_managedptr;
         }
@@ -97,8 +97,8 @@ namespace apache {
         /// to be called which is not what is desired when this object is destroyed. Normally this
         /// managed object may be created by the user and will be handled automatically by the GC.
         /// </summary>
-        gcroot<GemStone::GemFire::Cache::Generic::ResultCollectorG^> m_managedptr;
-        //GemStone::GemFire::Cache::IResultCollector^ m_managedptr;
+        gcroot<Apache::Geode::Client::Generic::ResultCollectorG^> m_managedptr;
+        //Apache::Geode::Client::IResultCollector^ m_managedptr;
         //gcroot<Object^> m_userptr;
       };
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedString.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedString.hpp b/src/clicache/src/impl/ManagedString.hpp
index 5d2cd89..8bab75d 100644
--- a/src/clicache/src/impl/ManagedString.hpp
+++ b/src/clicache/src/impl/ManagedString.hpp
@@ -28,10 +28,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
-	{namespace Cache { namespace Generic{
+  namespace Geode
+  {
+    namespace Client
+    {
+namespace Generic{
 
     ref class ManagedString sealed
     {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedTransactionListener.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedTransactionListener.cpp b/src/clicache/src/impl/ManagedTransactionListener.cpp
index cf7b117..ca156c5 100644
--- a/src/clicache/src/impl/ManagedTransactionListener.cpp
+++ b/src/clicache/src/impl/ManagedTransactionListener.cpp
@@ -43,9 +43,9 @@ namespace apache
         try
         {
           String^ mg_assemblyPath =
-            GemStone::GemFire::Cache::Generic::ManagedString::Get( assemblyPath );
+            Apache::Geode::Client::Generic::ManagedString::Get( assemblyPath );
           String^ mg_factoryFunctionName =
-            GemStone::GemFire::Cache::Generic::ManagedString::Get( factoryFunctionName );
+            Apache::Geode::Client::Generic::ManagedString::Get( factoryFunctionName );
           String^ mg_typeName = nullptr;
 
           String^ mg_genericKey = nullptr;
@@ -99,7 +99,7 @@ namespace apache
           mg_genericVal = mg_genericVal->Trim();
           mg_factoryFunctionName = mg_factoryFunctionName->Substring( dotIndx + 1 );
 
-          GemStone::GemFire::Cache::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.",
+          Apache::Geode::Client::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.",
             mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName);
 
           typeBuilder->Append("`2");
@@ -121,7 +121,7 @@ namespace apache
             throw apache::geode::client::IllegalArgumentException( ex_str.c_str( ) );
           }
 
-          GemStone::GemFire::Cache::Generic::Log::Debug("Loading type: [{0}]", mg_typeName);
+          Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName);
 
           Type^ typeInst = assmb->GetType(mg_typeName, false, true);
 
@@ -138,7 +138,7 @@ namespace apache
             }
 
             typeInst = typeInst->MakeGenericType(types);
-            GemStone::GemFire::Cache::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName);
+            Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName);
 
             MethodInfo^ mInfo = typeInst->GetMethod( mg_factoryFunctionName,
               BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase );
@@ -152,7 +152,7 @@ namespace apache
               }
               catch (System::Exception^ ex)
               {
-                GemStone::GemFire::Cache::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message);
+                Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message);
                 userptr = nullptr;
               }
               if (userptr == nullptr)
@@ -178,7 +178,7 @@ namespace apache
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::ManagedString typeName( mg_typeName );
+            Apache::Geode::Client::Generic::ManagedString typeName( mg_typeName );
             std::string ex_str = "ManagedTransactionListenerGeneric: Could not load type [";
             ex_str += typeName.CharPtr;
             ex_str += "] in assembly: ";
@@ -192,7 +192,7 @@ namespace apache
         }
         catch (System::Exception^ ex)
         {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_exStr( ex->ToString( ) );
+          Apache::Geode::Client::Generic::ManagedString mg_exStr( ex->ToString( ) );
           std::string ex_str = "ManagedTransactionListenerGeneric: Got an exception while "
             "loading managed library: ";
           ex_str += mg_exStr.CharPtr;
@@ -203,43 +203,43 @@ namespace apache
       void ManagedTransactionListenerGeneric::afterCommit(apache::geode::client::TransactionEventPtr& te )
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Error("ManagedTransactionListenerGeneric::afterCommit in" );
-          GemStone::GemFire::Cache::TransactionEvent  mevent( te.ptr() );
+          Apache::Geode::Client::Generic::Log::Error("ManagedTransactionListenerGeneric::afterCommit in" );
+          Apache::Geode::Client::TransactionEvent  mevent( te.ptr() );
           m_managedptr->AfterCommit( %mevent );
-          GemStone::GemFire::Cache::Generic::Log::Error("ManagedTransactionListenerGeneric::afterCommit in" );
+          Apache::Geode::Client::Generic::Log::Error("ManagedTransactionListenerGeneric::afterCommit in" );
 
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
       void ManagedTransactionListenerGeneric::afterFailedCommit(apache::geode::client::TransactionEventPtr& te )
       {
         try {
-          GemStone::GemFire::Cache::TransactionEvent mevent( te.ptr()  );
+          Apache::Geode::Client::TransactionEvent mevent( te.ptr()  );
           m_managedptr->AfterFailedCommit( %mevent );
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
       void ManagedTransactionListenerGeneric::afterRollback(apache::geode::client::TransactionEventPtr& te )
       {
         try {
-          GemStone::GemFire::Cache::TransactionEvent mevent( te.ptr()  );
+          Apache::Geode::Client::TransactionEvent mevent( te.ptr()  );
           m_managedptr->AfterRollback( %mevent );
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
       void ManagedTransactionListenerGeneric::close()
@@ -247,11 +247,11 @@ namespace apache
         try {
           m_managedptr->Close();
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedTransactionListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedTransactionListener.hpp b/src/clicache/src/impl/ManagedTransactionListener.hpp
index 1ae8f6d..3c59975 100644
--- a/src/clicache/src/impl/ManagedTransactionListener.hpp
+++ b/src/clicache/src/impl/ManagedTransactionListener.hpp
@@ -29,7 +29,7 @@ namespace apache {
     namespace client {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.ITransactionListener" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.ITransactionListener" />
       /// object and implements the native <c>apache::geode::client::TransactionListener</c> interface.
       /// </summary>
       class ManagedTransactionListenerGeneric
@@ -59,12 +59,12 @@ namespace apache {
 
         virtual void close();
 
-        inline GemStone::GemFire::Cache::ITransactionListener^ ptr( ) const
+        inline Apache::Geode::Client::ITransactionListener^ ptr( ) const
         {
           return m_managedptr;
         }
 
-        inline void setptr( GemStone::GemFire::Cache::ITransactionListener^ managedptr )
+        inline void setptr( Apache::Geode::Client::ITransactionListener^ managedptr )
         {
           m_managedptr = managedptr;
         }
@@ -82,7 +82,7 @@ namespace apache {
         /// to be called which is not what is desired when this object is destroyed. Normally this
         /// managed object may be created by the user and will be handled automatically by the GC.
         /// </summary>
-        gcroot<GemStone::GemFire::Cache::ITransactionListener^> m_managedptr;
+        gcroot<Apache::Geode::Client::ITransactionListener^> m_managedptr;
 
         gcroot<Object^> m_userptr;
       };

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedTransactionWriter.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedTransactionWriter.cpp b/src/clicache/src/impl/ManagedTransactionWriter.cpp
index 62b46e4..47ab619 100644
--- a/src/clicache/src/impl/ManagedTransactionWriter.cpp
+++ b/src/clicache/src/impl/ManagedTransactionWriter.cpp
@@ -29,7 +29,7 @@ using namespace System;
 using namespace System::Text;
 using namespace System::Reflection;
 
-//using namespace GemStone::GemFire::Cache::Generic;
+//using namespace Apache::Geode::Client::Generic;
 
 namespace apache
 {
@@ -44,9 +44,9 @@ namespace apache
         try
         {
           String^ mg_assemblyPath =
-            GemStone::GemFire::Cache::Generic::ManagedString::Get( assemblyPath );
+            Apache::Geode::Client::Generic::ManagedString::Get( assemblyPath );
           String^ mg_factoryFunctionName =
-            GemStone::GemFire::Cache::Generic::ManagedString::Get( factoryFunctionName );
+            Apache::Geode::Client::Generic::ManagedString::Get( factoryFunctionName );
           String^ mg_typeName = nullptr;
 
           String^ mg_genericKey = nullptr;
@@ -100,7 +100,7 @@ namespace apache
           mg_genericVal = mg_genericVal->Trim();
           mg_factoryFunctionName = mg_factoryFunctionName->Substring( dotIndx + 1 );
 
-          GemStone::GemFire::Cache::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.",
+          Apache::Geode::Client::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.",
             mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName);
 
           typeBuilder->Append("`2");
@@ -122,7 +122,7 @@ namespace apache
             throw apache::geode::client::IllegalArgumentException( ex_str.c_str( ) );
           }
 
-          GemStone::GemFire::Cache::Generic::Log::Debug("Loading type: [{0}]", mg_typeName);
+          Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName);
 
           Type^ typeInst = assmb->GetType(mg_typeName, false, true);
 
@@ -139,7 +139,7 @@ namespace apache
             }
 
             typeInst = typeInst->MakeGenericType(types);
-            GemStone::GemFire::Cache::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName);
+            Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName);
 
             MethodInfo^ mInfo = typeInst->GetMethod( mg_factoryFunctionName,
               BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase );
@@ -153,7 +153,7 @@ namespace apache
               }
               catch (System::Exception^ ex)
               {
-                GemStone::GemFire::Cache::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message);
+                Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message);
                 userptr = nullptr;
               }
               if (userptr == nullptr)
@@ -179,7 +179,7 @@ namespace apache
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::ManagedString typeName( mg_typeName );
+            Apache::Geode::Client::Generic::ManagedString typeName( mg_typeName );
             std::string ex_str = "ManagedTransactionWriterGeneric: Could not load type [";
             ex_str += typeName.CharPtr;
             ex_str += "] in assembly: ";
@@ -193,7 +193,7 @@ namespace apache
         }
         catch (System::Exception^ ex)
         {
-          GemStone::GemFire::Cache::Generic::ManagedString mg_exStr( ex->ToString( ) );
+          Apache::Geode::Client::Generic::ManagedString mg_exStr( ex->ToString( ) );
           std::string ex_str = "ManagedTransactionWriterGeneric: Got an exception while "
             "loading managed library: ";
           ex_str += mg_exStr.CharPtr;
@@ -204,14 +204,14 @@ namespace apache
       void ManagedTransactionWriterGeneric::beforeCommit(apache::geode::client::TransactionEventPtr& te )
       {
         try {
-          GemStone::GemFire::Cache::TransactionEvent  mevent( te.ptr() );
+          Apache::Geode::Client::TransactionEvent  mevent( te.ptr() );
           m_managedptr->BeforeCommit( %mevent );
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedTransactionWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedTransactionWriter.hpp b/src/clicache/src/impl/ManagedTransactionWriter.hpp
index 687b715..c4a1b78 100644
--- a/src/clicache/src/impl/ManagedTransactionWriter.hpp
+++ b/src/clicache/src/impl/ManagedTransactionWriter.hpp
@@ -22,13 +22,13 @@
 #include <cppcache/TransactionWriter.hpp>
 #include "../ITransactionWriter.hpp"
 
-namespace GemStone {
-
-  namespace GemFire {
-
-    namespace Cache {
-
-      interface class ITransactionWriter;
+namespace Apache
+{
+  namespace Geode
+  {
+    namespace Client
+    {
+interface class ITransactionWriter;
     }
   }
 }
@@ -38,7 +38,7 @@ namespace apache {
     namespace client {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.ITransactionWriter" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.ITransactionWriter" />
       /// object and implements the native <c>apache::geode::client::TransactionWriter</c> interface.
       /// </summary>
       class ManagedTransactionWriterGeneric
@@ -62,12 +62,12 @@ namespace apache {
 
         virtual void beforeCommit(apache::geode::client::TransactionEventPtr& te);
 
-        inline GemStone::GemFire::Cache::ITransactionWriter^ ptr( ) const
+        inline Apache::Geode::Client::ITransactionWriter^ ptr( ) const
         {
           return m_managedptr;
         }
 
-        inline void setptr( GemStone::GemFire::Cache::ITransactionWriter^ managedptr )
+        inline void setptr( Apache::Geode::Client::ITransactionWriter^ managedptr )
         {
           m_managedptr = managedptr;
         }
@@ -85,7 +85,7 @@ namespace apache {
         /// to be called which is not what is desired when this object is destroyed. Normally this
         /// managed object may be created by the user and will be handled automatically by the GC.
         /// </summary>
-        gcroot<GemStone::GemFire::Cache::ITransactionWriter^> m_managedptr;
+        gcroot<Apache::Geode::Client::ITransactionWriter^> m_managedptr;
 
         gcroot<Object^> m_userptr;
       };

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedVisitor.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedVisitor.cpp b/src/clicache/src/impl/ManagedVisitor.cpp
index 27ac920..79f8c1f 100644
--- a/src/clicache/src/impl/ManagedVisitor.cpp
+++ b/src/clicache/src/impl/ManagedVisitor.cpp
@@ -32,12 +32,12 @@ namespace apache
 
       void ManagedVisitorGeneric::visit(CacheableKeyPtr& key, CacheablePtr& value)
       {
-        using namespace GemStone::GemFire::Cache::Generic;
+        using namespace Apache::Geode::Client::Generic;
         try {
           ICacheableKey^ mg_key(SafeGenericUMKeyConvert<ICacheableKey^>(key.ptr()));
           IGFSerializable^ mg_value(SafeUMSerializableConvertGeneric(value.ptr()));
 
-          m_visitor->Invoke(mg_key, (GemStone::GemFire::Cache::Generic::IGFSerializable^)mg_value);
+          m_visitor->Invoke(mg_key, (Apache::Geode::Client::Generic::IGFSerializable^)mg_value);
         }
         catch (GemFireException^ ex) {
           ex->ThrowNative();

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedVisitor.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedVisitor.hpp b/src/clicache/src/impl/ManagedVisitor.hpp
index 63ba803..af42e48 100644
--- a/src/clicache/src/impl/ManagedVisitor.hpp
+++ b/src/clicache/src/impl/ManagedVisitor.hpp
@@ -31,7 +31,7 @@ namespace apache
     {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.PropertyVisitor" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.PropertyVisitor" />
       /// delegate and implements the native <c>apache::geode::client::Properties::Visitor</c> interface.
       /// </summary>
       class ManagedVisitorGeneric
@@ -56,7 +56,7 @@ namespace apache
         /// </summary>
         virtual ~ManagedVisitorGeneric() { }
 
-        void setptr(GemStone::GemFire::Cache::PropertyVisitor^ visitor)
+        void setptr(Apache::Geode::Client::PropertyVisitor^ visitor)
         {
           m_visitor = visitor;
         }
@@ -69,7 +69,7 @@ namespace apache
         // managed object may be created by the user and will be handled automatically by the GC.
         gcroot<Object^> m_managedptr;
 
-        gcroot<GemStone::GemFire::Cache::PropertyVisitor^> m_visitor;
+        gcroot<Apache::Geode::Client::PropertyVisitor^> m_visitor;
 
         // Disable the copy and assignment constructors
         ManagedVisitorGeneric();

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/MemoryPressureHandler.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/MemoryPressureHandler.cpp b/src/clicache/src/impl/MemoryPressureHandler.cpp
index bb90fc8..ae4bc2a 100644
--- a/src/clicache/src/impl/MemoryPressureHandler.cpp
+++ b/src/clicache/src/impl/MemoryPressureHandler.cpp
@@ -21,11 +21,13 @@
 #include "psapi.h"
 #include "../Log.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       int64_t g_prevUnmanagedSize = 0;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/MemoryPressureHandler.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/MemoryPressureHandler.hpp b/src/clicache/src/impl/MemoryPressureHandler.hpp
index 12933f2..3276133 100644
--- a/src/clicache/src/impl/MemoryPressureHandler.hpp
+++ b/src/clicache/src/impl/MemoryPressureHandler.hpp
@@ -20,11 +20,13 @@
 #include <gfcpp/gfcpp_globals.hpp>
 #include <ExpiryTaskManager.hpp>
 
-namespace GemStone {
-
-  namespace GemFire {
-
-    namespace Cache { namespace Generic {
+namespace Apache
+{
+  namespace Geode
+  {
+    namespace Client
+    {
+namespace Generic {
 
       class MemoryPressureHandler
         : public ACE_Event_Handler

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/NativeWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/NativeWrapper.hpp b/src/clicache/src/impl/NativeWrapper.hpp
index e3a727c..b9cc757 100644
--- a/src/clicache/src/impl/NativeWrapper.hpp
+++ b/src/clicache/src/impl/NativeWrapper.hpp
@@ -23,13 +23,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache 
-		{ 
-		namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PartitionResolver.hpp b/src/clicache/src/impl/PartitionResolver.hpp
index ac8c2b8..f18ac05 100644
--- a/src/clicache/src/impl/PartitionResolver.hpp
+++ b/src/clicache/src/impl/PartitionResolver.hpp
@@ -27,11 +27,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
 
       public interface class IPartitionResolverProxy

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxFieldType.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxFieldType.cpp b/src/clicache/src/impl/PdxFieldType.cpp
index ff31733..57b3380 100644
--- a/src/clicache/src/impl/PdxFieldType.cpp
+++ b/src/clicache/src/impl/PdxFieldType.cpp
@@ -21,13 +21,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxFieldType.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxFieldType.hpp b/src/clicache/src/impl/PdxFieldType.hpp
index 71a65ad..5f2f22d 100644
--- a/src/clicache/src/impl/PdxFieldType.hpp
+++ b/src/clicache/src/impl/PdxFieldType.hpp
@@ -22,13 +22,13 @@ using namespace System;
 #include "../DataInput.hpp"
 #include "../GemFireClassIds.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxHelper.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxHelper.cpp b/src/clicache/src/impl/PdxHelper.cpp
index bbbb397..0f23393 100644
--- a/src/clicache/src/impl/PdxHelper.cpp
+++ b/src/clicache/src/impl/PdxHelper.cpp
@@ -32,13 +32,13 @@
 #include <gfcpp/Cache.hpp>
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxHelper.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxHelper.hpp b/src/clicache/src/impl/PdxHelper.hpp
index 88ba8bd..819b780 100644
--- a/src/clicache/src/impl/PdxHelper.hpp
+++ b/src/clicache/src/impl/PdxHelper.hpp
@@ -21,13 +21,13 @@
 #include "../IPdxSerializable.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 				ref class DataOutput;
       ref class DataInput;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp b/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
index 72b9766..922ddc5 100644
--- a/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
+++ b/src/clicache/src/impl/PdxInstanceFactoryImpl.cpp
@@ -21,13 +21,13 @@
 #include "DotNetTypes.hpp"
 using namespace System::Text;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{ 
         namespace Internal
         {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxInstanceFactoryImpl.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceFactoryImpl.hpp b/src/clicache/src/impl/PdxInstanceFactoryImpl.hpp
index 1aae582..242fcf2 100644
--- a/src/clicache/src/impl/PdxInstanceFactoryImpl.hpp
+++ b/src/clicache/src/impl/PdxInstanceFactoryImpl.hpp
@@ -22,13 +22,13 @@
 #include "../DataInput.hpp"
 #include "PdxLocalWriter.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{     
         namespace Internal
         {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxInstanceImpl.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceImpl.cpp b/src/clicache/src/impl/PdxInstanceImpl.cpp
index d77ace8..4b3dc0a 100755
--- a/src/clicache/src/impl/PdxInstanceImpl.cpp
+++ b/src/clicache/src/impl/PdxInstanceImpl.cpp
@@ -30,13 +30,13 @@
 #include "PdxType.hpp"
 using namespace System::Text;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{ 
         namespace Internal
         {
@@ -57,8 +57,8 @@ namespace GemStone
             
             try
             {
-              GemStone::GemFire::Cache::Generic::DataOutput mg_output( &(*output), true );
-              GemStone::GemFire::Cache::Generic::Internal::PdxHelper::SerializePdx(%mg_output, this);
+              Apache::Geode::Client::Generic::DataOutput mg_output( &(*output), true );
+              Apache::Geode::Client::Generic::Internal::PdxHelper::SerializePdx(%mg_output, this);
             }
             finally
             {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxInstanceImpl.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxInstanceImpl.hpp b/src/clicache/src/impl/PdxInstanceImpl.hpp
index a7b38a6..51ccfef 100755
--- a/src/clicache/src/impl/PdxInstanceImpl.hpp
+++ b/src/clicache/src/impl/PdxInstanceImpl.hpp
@@ -22,13 +22,13 @@
 #include "../DataInput.hpp"
 #include "PdxLocalWriter.hpp"
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-			namespace Generic
+namespace Generic
 			{     
         namespace Internal
         {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxLocalReader.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalReader.cpp b/src/clicache/src/impl/PdxLocalReader.cpp
index d15b76d..86670ba 100644
--- a/src/clicache/src/impl/PdxLocalReader.cpp
+++ b/src/clicache/src/impl/PdxLocalReader.cpp
@@ -22,13 +22,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxLocalReader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalReader.hpp b/src/clicache/src/impl/PdxLocalReader.hpp
index bee1212..4adf330 100644
--- a/src/clicache/src/impl/PdxLocalReader.hpp
+++ b/src/clicache/src/impl/PdxLocalReader.hpp
@@ -26,13 +26,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       ref class DataInput;
       namespace Internal

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxLocalWriter.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalWriter.cpp b/src/clicache/src/impl/PdxLocalWriter.cpp
index a65b14f..dff9c56 100644
--- a/src/clicache/src/impl/PdxLocalWriter.cpp
+++ b/src/clicache/src/impl/PdxLocalWriter.cpp
@@ -22,13 +22,13 @@
 #include "DotNetTypes.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxLocalWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxLocalWriter.hpp b/src/clicache/src/impl/PdxLocalWriter.hpp
index a9472d5..6fd3f24 100644
--- a/src/clicache/src/impl/PdxLocalWriter.hpp
+++ b/src/clicache/src/impl/PdxLocalWriter.hpp
@@ -24,13 +24,13 @@
 #include "PdxRemotePreservedData.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       ref class DataOutput;
       namespace Internal

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxManagedCacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.cpp b/src/clicache/src/impl/PdxManagedCacheableKey.cpp
index b8b6110..48db481 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKey.cpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKey.cpp
@@ -38,19 +38,19 @@ namespace apache
       {
         try {
           uint32 pos = (int)output.getBufferLength();
-          GemStone::GemFire::Cache::Generic::DataOutput mg_output(&output, true);
-          GemStone::GemFire::Cache::Generic::Internal::PdxHelper::SerializePdx(%mg_output, m_managedptr);
+          Apache::Geode::Client::Generic::DataOutput mg_output(&output, true);
+          Apache::Geode::Client::Generic::Internal::PdxHelper::SerializePdx(%mg_output, m_managedptr);
           //m_managedptr->ToData( %mg_output );
           //this will move the cursor in c++ layer
           mg_output.WriteBytesToUMDataOutput();
           PdxManagedCacheableKey* tmp = const_cast<PdxManagedCacheableKey*>(this);
           tmp->m_objectSize = (int)(output.getBufferLength() - pos);
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
 
@@ -58,22 +58,22 @@ namespace apache
       {
         try {
           int pos = input.getBytesRead();
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true);
+          Apache::Geode::Client::Generic::DataInput mg_input(&input, true);
           //m_managedptr = m_managedptr->FromData( %mg_input );
-          GemStone::GemFire::Cache::Generic::IPdxSerializable^ tmp = GemStone::GemFire::Cache::Generic::Internal::PdxHelper::DeserializePdx(%mg_input, false);
+          Apache::Geode::Client::Generic::IPdxSerializable^ tmp = Apache::Geode::Client::Generic::Internal::PdxHelper::DeserializePdx(%mg_input, false);
           m_managedptr = tmp;
-          m_managedDeltaptr = dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^>(tmp);
+          m_managedDeltaptr = dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^>(tmp);
 
           //this will move the cursor in c++ layer
           input.advanceCursor(mg_input.BytesReadInternally);
           m_objectSize = input.getBytesRead() - pos;
           // m_hashcode = m_managedptr->GetHashCode();
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return this;
       }
@@ -83,11 +83,11 @@ namespace apache
         try {
           return m_objectSize;
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return 0;
       }
@@ -102,7 +102,7 @@ namespace apache
         ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-        GemStone::GemFire::Cache::GemFireException::ThrowNative(ex);
+        Apache::Geode::Client::GemFireException::ThrowNative(ex);
         }*/
         //return (m_classId >= 0x80000000 ? 0 : m_classId);
         return 0;
@@ -143,15 +143,15 @@ namespace apache
       {
         try {
           apache::geode::client::CacheableStringPtr cStr;
-          GemStone::GemFire::Cache::Generic::CacheableString::GetCacheableString(
+          Apache::Geode::Client::Generic::CacheableString::GetCacheableString(
             m_managedptr->ToString(), cStr);
           return cStr;
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return NULLPTR;
       }
@@ -164,15 +164,15 @@ namespace apache
           const PdxManagedCacheableKey* p_other =
             dynamic_cast<const PdxManagedCacheableKey*>(&other);
           if (p_other != NULL) {
-            return ((GemStone::GemFire::Cache::Generic::IPdxSerializable^)m_managedptr)->Equals((p_other->ptr()));
+            return ((Apache::Geode::Client::Generic::IPdxSerializable^)m_managedptr)->Equals((p_other->ptr()));
           }
           return false;
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return false;
       }
@@ -180,13 +180,13 @@ namespace apache
       bool PdxManagedCacheableKey::operator ==(const PdxManagedCacheableKey& other) const
       {
         try {
-          return ((GemStone::GemFire::Cache::Generic::IPdxSerializable^)m_managedptr)->Equals((other.ptr()));
+          return ((Apache::Geode::Client::Generic::IPdxSerializable^)m_managedptr)->Equals((other.ptr()));
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return false;
       }
@@ -198,15 +198,15 @@ namespace apache
         try {
           PdxManagedCacheableKey* tmp = const_cast<PdxManagedCacheableKey*>(this);
           tmp->m_hashcode = (
-            (GemStone::GemFire::Cache::Generic::IPdxSerializable^)tmp->m_managedptr)
+            (Apache::Geode::Client::Generic::IPdxSerializable^)tmp->m_managedptr)
             ->GetHashCode();
           return m_hashcode;
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return 0;
       }
@@ -217,15 +217,15 @@ namespace apache
           if (maxLength > 0) {
             String^ logstr = m_managedptr->GetType()->Name + '(' +
               m_managedptr->ToString() + ')';
-            GemStone::GemFire::Cache::Generic::ManagedString mg_str(logstr);
+            Apache::Geode::Client::Generic::ManagedString mg_str(logstr);
             return snprintf(buffer, maxLength, "%s", mg_str.CharPtr);
           }
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return 0;
       }
@@ -242,23 +242,23 @@ namespace apache
       void PdxManagedCacheableKey::toDelta(DataOutput& output) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::DataOutput mg_output(&output, true);
+          Apache::Geode::Client::Generic::DataOutput mg_output(&output, true);
           m_managedDeltaptr->ToDelta(%mg_output);
           //this will move the cursor in c++ layer
           mg_output.WriteBytesToUMDataOutput();
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
 
       void PdxManagedCacheableKey::fromDelta(DataInput& input)
       {
         try {
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true);
+          Apache::Geode::Client::Generic::DataInput mg_input(&input, true);
           m_managedDeltaptr->FromDelta(%mg_input);
 
           //this will move the cursor in c++ layer
@@ -266,11 +266,11 @@ namespace apache
 
           m_hashcode = m_managedptr->GetHashCode();
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
 
@@ -278,10 +278,10 @@ namespace apache
       {
         try {
           ICloneable^ cloneable = dynamic_cast<ICloneable^>((
-            GemStone::GemFire::Cache::Generic::IGFDelta^) m_managedDeltaptr);
+            Apache::Geode::Client::Generic::IGFDelta^) m_managedDeltaptr);
           if (cloneable) {
-            GemStone::GemFire::Cache::Generic::IPdxSerializable^ Mclone =
-              dynamic_cast<GemStone::GemFire::Cache::Generic::IPdxSerializable^>(cloneable->Clone());
+            Apache::Geode::Client::Generic::IPdxSerializable^ Mclone =
+              dynamic_cast<Apache::Geode::Client::Generic::IPdxSerializable^>(cloneable->Clone());
             return DeltaPtr(static_cast<PdxManagedCacheableKey*>(
               SafeGenericM2UMConvert(Mclone)));
           }
@@ -289,11 +289,11 @@ namespace apache
             return Delta::clone();
           }
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return NULLPTR;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxManagedCacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.hpp b/src/clicache/src/impl/PdxManagedCacheableKey.hpp
index 13d7575..0632436 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKey.hpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKey.hpp
@@ -26,13 +26,13 @@
 #include "../IGFDelta.hpp"
 using namespace System;
 using namespace apache::geode::client;
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
 				interface class IPdxSerializable;
 			}
@@ -65,10 +65,10 @@ namespace apache
         }
 
         inline PdxManagedCacheableKey(
-          GemStone::GemFire::Cache::Generic::IPdxSerializable^ managedptr, int hashcode)
+          Apache::Geode::Client::Generic::IPdxSerializable^ managedptr, int hashcode)
           : m_managedptr(managedptr), m_objectSize(0) {
           m_hashcode = hashcode;
-          m_managedDeltaptr = dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^>(managedptr);
+          m_managedDeltaptr = dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^>(managedptr);
         }
         /// <summary>
         /// Constructor to initialize with the provided managed object.
@@ -77,10 +77,10 @@ namespace apache
         /// The managed object.
         /// </param>
         inline PdxManagedCacheableKey(
-          GemStone::GemFire::Cache::Generic::IPdxSerializable^ managedptr)
+          Apache::Geode::Client::Generic::IPdxSerializable^ managedptr)
           : m_managedptr(managedptr), m_objectSize(0) {
           m_hashcode = 0;//it can be zero while initializing the object
-          m_managedDeltaptr = dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^>(managedptr);
+          m_managedDeltaptr = dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^>(managedptr);
         }
 
         /// <summary>
@@ -163,7 +163,7 @@ namespace apache
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::IPdxSerializable^ ptr() const
+        inline Apache::Geode::Client::Generic::IPdxSerializable^ ptr() const
         {
           return m_managedptr;
         }
@@ -181,8 +181,8 @@ namespace apache
         /// to be called which is not what is desired when this object is destroyed. Normally this
         /// managed object may be created by the user and will be handled automatically by the GC.
         /// </summary>
-        gcroot<GemStone::GemFire::Cache::Generic::IPdxSerializable^> m_managedptr;
-        gcroot<GemStone::GemFire::Cache::Generic::IGFDelta^> m_managedDeltaptr;
+        gcroot<Apache::Geode::Client::Generic::IPdxSerializable^> m_managedptr;
+        gcroot<Apache::Geode::Client::Generic::IGFDelta^> m_managedDeltaptr;
 
         // Disable the copy and assignment constructors
         PdxManagedCacheableKey(const PdxManagedCacheableKey&);

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
index e45a3a2..68fb3d1 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
@@ -36,16 +36,16 @@ namespace apache
     {
       void PdxManagedCacheableKeyBytes::toData(apache::geode::client::DataOutput& output) const
       {
-        // GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::toData: current domain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its domain ID: " + m_domainId );
+        // Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::toData: current domain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its domain ID: " + m_domainId );
         try {
           //TODO: I think this should work as it is
           output.writeBytesOnly(m_bytes, m_size);
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
 
@@ -53,13 +53,13 @@ namespace apache
       {
         try {
 
-          //GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromData: classid " + m_classId);
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true);
+          //Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromData: classid " + m_classId);
+          Apache::Geode::Client::Generic::DataInput mg_input(&input, true);
           const uint8_t* objStartPos = input.currentBufferPosition();
 
-          GemStone::GemFire::Cache::Generic::IPdxSerializable^ obj = GemStone::GemFire::Cache::Generic::Internal::PdxHelper::DeserializePdx(%mg_input, false);
+          Apache::Geode::Client::Generic::IPdxSerializable^ obj = Apache::Geode::Client::Generic::Internal::PdxHelper::DeserializePdx(%mg_input, false);
 
-          //GemStone::GemFire::Cache::Generic::IGFSerializable^ obj = GemStone::GemFire::Cache::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId)();
+          //Apache::Geode::Client::Generic::IGFSerializable^ obj = Apache::Geode::Client::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId)();
           //obj->FromData(%mg_input);
 
           input.advanceCursor(mg_input.BytesReadInternally);
@@ -70,15 +70,15 @@ namespace apache
 
           //m_size = mg_input.BytesRead;
           m_size = (uint32_t)(objEndPos - objStartPos);
-          // GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromData: objectSize = " + m_size + " m_hashCode = " + m_hashCode);
+          // Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromData: objectSize = " + m_size + " m_hashCode = " + m_hashCode);
           m_bytes = input.getBufferCopyFrom(objStartPos, m_size);
 
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return this;
       }
@@ -89,11 +89,11 @@ namespace apache
           //return m_managedptr->ObjectSize;
           return m_size;
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return 0;
       }
@@ -105,11 +105,11 @@ namespace apache
         //  //classId = m_managedptr->ClassId;
         //  classId = m_classId;
         //}
-        //catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        //catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
         //  ex->ThrowNative();
         //}
         //catch (System::Exception^ ex) {
-        //  GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+        //  Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         //}
         //return (classId >= 0x80000000 ? 0 : classId);
         return 0;
@@ -133,11 +133,11 @@ namespace apache
         //    return (int8_t)apache::geode::client::GemfireTypeIdsImpl::CacheableUserData4;
         //  }
         //}
-        //catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        //catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
         //  ex->ThrowNative();
         //}
         //catch (System::Exception^ ex) {
-        //  GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+        //  Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         //}
         return (int8_t)GemfireTypeIdsImpl::PDX;
       }
@@ -161,20 +161,20 @@ namespace apache
       apache::geode::client::CacheableStringPtr PdxManagedCacheableKeyBytes::toString() const
       {
         try {
-          GemStone::GemFire::Cache::Generic::IPdxSerializable^ manageObject = getManagedObject();
+          Apache::Geode::Client::Generic::IPdxSerializable^ manageObject = getManagedObject();
           if (manageObject != nullptr)
           {
             apache::geode::client::CacheableStringPtr cStr;
-            GemStone::GemFire::Cache::Generic::CacheableString::GetCacheableString(
+            Apache::Geode::Client::Generic::CacheableString::GetCacheableString(
               manageObject->ToString(), cStr);
             return cStr;
           }
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return NULLPTR;
       }
@@ -182,55 +182,55 @@ namespace apache
       bool PdxManagedCacheableKeyBytes::operator ==(const apache::geode::client::CacheableKey& other) const
       {
         try {
-          //  GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal");
+          //  Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal");
           // now checking classId(), typeId(), DSFID() etc. will be much more
           // expensive than just a dynamic_cast
           const PdxManagedCacheableKeyBytes* p_other =
             dynamic_cast<const PdxManagedCacheableKeyBytes*>(&other);
           if (p_other != NULL) {
             apache::geode::client::DataInput di(m_bytes, m_size);
-            GemStone::GemFire::Cache::Generic::DataInput mg_input(&di, true);
-            /* GemStone::GemFire::Cache::Generic::IGFSerializable^ obj =
-               GemStone::GemFire::Cache::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId)();
+            Apache::Geode::Client::Generic::DataInput mg_input(&di, true);
+            /* Apache::Geode::Client::Generic::IGFSerializable^ obj =
+               Apache::Geode::Client::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId)();
                obj->FromData(%mg_input);*/
-            GemStone::GemFire::Cache::Generic::IPdxSerializable^ obj = getManagedObject();
+            Apache::Geode::Client::Generic::IPdxSerializable^ obj = getManagedObject();
             bool ret = obj->Equals(p_other->ptr());
-            // GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal return VAL = " + ret);
+            // Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal return VAL = " + ret);
             return ret;
           }
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
-        // GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal returns false");
+        // Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal returns false");
         return false;
       }
 
       bool PdxManagedCacheableKeyBytes::operator ==(const PdxManagedCacheableKeyBytes& other) const
       {
         try {
-          //GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal. ");
+          //Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal. ");
           apache::geode::client::DataInput di(m_bytes, m_size);
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&di, true);
-          /*GemStone::GemFire::Cache::Generic::IGFSerializable^ obj =
-            GemStone::GemFire::Cache::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId)();
+          Apache::Geode::Client::Generic::DataInput mg_input(&di, true);
+          /*Apache::Geode::Client::Generic::IGFSerializable^ obj =
+            Apache::Geode::Client::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId)();
             obj->FromData(%mg_input);*/
-          GemStone::GemFire::Cache::Generic::IPdxSerializable^ obj = getManagedObject();
+          Apache::Geode::Client::Generic::IPdxSerializable^ obj = getManagedObject();
           bool ret = obj->Equals(other.ptr());
-          // GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal return VAL = " + ret);
+          // Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal return VAL = " + ret);
           return ret;
           //return obj->Equals(other.ptr());
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
-        //  GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal return false");
+        //  Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::equal return false");
         return false;
       }
 
@@ -242,44 +242,44 @@ namespace apache
       size_t PdxManagedCacheableKeyBytes::logString(char* buffer, size_t maxLength) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::IPdxSerializable^ manageObject = getManagedObject();
+          Apache::Geode::Client::Generic::IPdxSerializable^ manageObject = getManagedObject();
           if (manageObject != nullptr)
           {
             if (maxLength > 0) {
               String^ logstr = manageObject->GetType()->Name + '(' +
                 manageObject->ToString() + ')';
-              GemStone::GemFire::Cache::Generic::ManagedString mg_str(logstr);
+              Apache::Geode::Client::Generic::ManagedString mg_str(logstr);
               return snprintf(buffer, maxLength, "%s", mg_str.CharPtr);
             }
           }
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return 0;
       }
 
-      GemStone::GemFire::Cache::Generic::IPdxSerializable^
+      Apache::Geode::Client::Generic::IPdxSerializable^
         PdxManagedCacheableKeyBytes::getManagedObject() const
       {
 
-        // GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::getManagedObject " + m_size);
+        // Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::getManagedObject " + m_size);
 
         apache::geode::client::DataInput dinp(m_bytes, m_size);
-        GemStone::GemFire::Cache::Generic::DataInput mg_dinp(&dinp, true);
+        Apache::Geode::Client::Generic::DataInput mg_dinp(&dinp, true);
         /*TypeFactoryMethodGeneric^ creationMethod =
-          GemStone::GemFire::Cache::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId);
-          GemStone::GemFire::Cache::Generic::IGFSerializable^ newObj = creationMethod();
+          Apache::Geode::Client::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId);
+          Apache::Geode::Client::Generic::IGFSerializable^ newObj = creationMethod();
           return newObj->FromData(%mg_dinp);*/
-        return  GemStone::GemFire::Cache::Generic::Internal::PdxHelper::DeserializePdx(%mg_dinp, false);
+        return  Apache::Geode::Client::Generic::Internal::PdxHelper::DeserializePdx(%mg_dinp, false);
       }
 
       bool PdxManagedCacheableKeyBytes::hasDelta()
       {
-        /* GemStone::GemFire::Cache::Generic::IGFDelta^ deltaObj = dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^>(this->getManagedObject());
+        /* Apache::Geode::Client::Generic::IGFDelta^ deltaObj = dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^>(this->getManagedObject());
 
          if(deltaObj)
          return deltaObj->HasDelta();*/
@@ -289,38 +289,38 @@ namespace apache
       void PdxManagedCacheableKeyBytes::toDelta(DataOutput& output) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::toDelta: current domain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its domain ID: " + m_domainId);
-          GemStone::GemFire::Cache::Generic::IGFDelta^ deltaObj = dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^>(this->getManagedObject());
-          GemStone::GemFire::Cache::Generic::DataOutput mg_output(&output, true);
+          Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::toDelta: current domain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its domain ID: " + m_domainId);
+          Apache::Geode::Client::Generic::IGFDelta^ deltaObj = dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^>(this->getManagedObject());
+          Apache::Geode::Client::Generic::DataOutput mg_output(&output, true);
           deltaObj->ToDelta(%mg_output);
           mg_output.WriteBytesToUMDataOutput();
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
 
       void PdxManagedCacheableKeyBytes::fromDelta(DataInput& input)
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromDelta:");
-          GemStone::GemFire::Cache::Generic::IGFDelta^ deltaObj = dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^>(this->getManagedObject());
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true);
+          Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromDelta:");
+          Apache::Geode::Client::Generic::IGFDelta^ deltaObj = dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^>(this->getManagedObject());
+          Apache::Geode::Client::Generic::DataInput mg_input(&input, true);
           deltaObj->FromDelta(%mg_input);
 
-          GemStone::GemFire::Cache::Generic::IPdxSerializable^ managedptr =
-            dynamic_cast <GemStone::GemFire::Cache::Generic::IPdxSerializable^> (deltaObj);
+          Apache::Geode::Client::Generic::IPdxSerializable^ managedptr =
+            dynamic_cast <Apache::Geode::Client::Generic::IPdxSerializable^> (deltaObj);
           // if(managedptr != nullptr)
           {
-            GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromDelta: current domain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its domain ID: " + m_domainId);
-            //GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromDelta: classid " + managedptr->ClassId + " : " + managedptr->ToString());
+            Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromDelta: current domain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its domain ID: " + m_domainId);
+            //Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromDelta: classid " + managedptr->ClassId + " : " + managedptr->ToString());
             apache::geode::client::DataOutput dataOut;
-            GemStone::GemFire::Cache::Generic::DataOutput mg_output(&dataOut, true);
+            Apache::Geode::Client::Generic::DataOutput mg_output(&dataOut, true);
             //managedptr->ToData( %mg_output );
-            GemStone::GemFire::Cache::Generic::Internal::PdxHelper::SerializePdx(%mg_output, managedptr);
+            Apache::Geode::Client::Generic::Internal::PdxHelper::SerializePdx(%mg_output, managedptr);
             //m_managedptr->ToData( %mg_output );
             //this will move the cursor in c++ layer
             mg_output.WriteBytesToUMDataOutput();
@@ -331,26 +331,26 @@ namespace apache
             GF_SAFE_DELETE(m_bytes);
             m_bytes = dataOut.getBufferCopy();
             m_size = dataOut.getBufferLength();
-            GemStone::GemFire::Cache::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromDelta objectSize = " + m_size + " m_hashCode = " + m_hashCode);
+            Apache::Geode::Client::Generic::Log::Debug("PdxManagedCacheableKeyBytes::fromDelta objectSize = " + m_size + " m_hashCode = " + m_hashCode);
             m_hashCode = managedptr->GetHashCode();
           }
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
       }
 
       DeltaPtr PdxManagedCacheableKeyBytes::clone()
       {
         try {
-          GemStone::GemFire::Cache::Generic::IGFDelta^ deltaObj = dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^>(this->getManagedObject());
-          ICloneable^ cloneable = dynamic_cast<ICloneable^>((GemStone::GemFire::Cache::Generic::IGFDelta^) deltaObj);
+          Apache::Geode::Client::Generic::IGFDelta^ deltaObj = dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^>(this->getManagedObject());
+          ICloneable^ cloneable = dynamic_cast<ICloneable^>((Apache::Geode::Client::Generic::IGFDelta^) deltaObj);
           if (cloneable) {
-            GemStone::GemFire::Cache::Generic::IPdxSerializable^ Mclone =
-              dynamic_cast<GemStone::GemFire::Cache::Generic::IPdxSerializable^>(cloneable->Clone());
+            Apache::Geode::Client::Generic::IPdxSerializable^ Mclone =
+              dynamic_cast<Apache::Geode::Client::Generic::IPdxSerializable^>(cloneable->Clone());
             return DeltaPtr(static_cast<PdxManagedCacheableKeyBytes*>(
               SafeGenericM2UMConvert(Mclone)));
           }
@@ -358,11 +358,11 @@ namespace apache
             return Delta::clone();
           }
         }
-        catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) {
+        catch (Apache::Geode::Client::Generic::GemFireException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex);
         }
         return NULLPTR;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
index d14537e..73a9c82 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
@@ -27,11 +27,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       interface class IPdxSerializable;
     }
@@ -47,7 +49,7 @@ namespace apache
     {
 
   /// <summary>
-  /// Wraps the managed <see cref="GemStone.GemFire.Cache.IGFSerializable" />
+  /// Wraps the managed <see cref="Apache.Geode.Client.IGFSerializable" />
   /// object and implements the native <c>apache::geode::client::CacheableKey</c> interface.
   /// </summary>
   class PdxManagedCacheableKeyBytes
@@ -62,7 +64,7 @@ namespace apache
     /// The managed object.
     /// </param>
     inline PdxManagedCacheableKeyBytes(
-      GemStone::GemFire::Cache::Generic::IPdxSerializable^ managedptr, bool storeBytes )
+      Apache::Geode::Client::Generic::IPdxSerializable^ managedptr, bool storeBytes )
       : m_domainId(System::Threading::Thread::GetDomainID()),
         m_bytes(NULL),
         m_size(0),
@@ -71,7 +73,7 @@ namespace apache
       m_hasDelta = false;
       if(storeBytes)
       {
-        GemStone::GemFire::Cache::Generic::IGFDelta^ deltaObj = dynamic_cast<GemStone::GemFire::Cache::Generic::IGFDelta^>(managedptr);
+        Apache::Geode::Client::Generic::IGFDelta^ deltaObj = dynamic_cast<Apache::Geode::Client::Generic::IGFDelta^>(managedptr);
 
         if(deltaObj != nullptr)
           m_hasDelta = deltaObj->HasDelta();
@@ -81,8 +83,8 @@ namespace apache
         if(storeBytes)//if value is from app 
         {
           apache::geode::client::DataOutput dataOut;
-          GemStone::GemFire::Cache::Generic::DataOutput mg_output( &dataOut, true);
-					 GemStone::GemFire::Cache::Generic::Internal::PdxHelper::SerializePdx(%mg_output, managedptr);
+          Apache::Geode::Client::Generic::DataOutput mg_output( &dataOut, true);
+					 Apache::Geode::Client::Generic::Internal::PdxHelper::SerializePdx(%mg_output, managedptr);
         //  managedptr->ToData( %mg_output );
           
           //move cursor
@@ -93,7 +95,7 @@ namespace apache
           m_size = dataOut.getBufferLength();
           
           m_hashCode = managedptr->GetHashCode(); 
-          GemStone::GemFire::Cache::Generic::Log::Fine(
+          Apache::Geode::Client::Generic::Log::Fine(
            "PdxManagedCacheableKeyBytes::Constructor objectSize = " + m_size + " m_hashCode = " + m_hashCode);
         }
       }
@@ -188,7 +190,7 @@ namespace apache
     /// <summary>
     /// Returns the wrapped managed object reference.
     /// </summary>
-    inline GemStone::GemFire::Cache::Generic::IPdxSerializable^ ptr( ) const
+    inline Apache::Geode::Client::Generic::IPdxSerializable^ ptr( ) const
     {
       return getManagedObject();
     }
@@ -200,7 +202,7 @@ namespace apache
 
     inline ~PdxManagedCacheableKeyBytes()
     {
-      GemStone::GemFire::Cache::Generic::Log::Fine(
+      Apache::Geode::Client::Generic::Log::Fine(
         "ManagedCacheableKeyBytes::Destructor current AppDomain ID: " +
         System::Threading::Thread::GetDomainID() + " for object: " +
         System::Convert::ToString((int)this) + " with its AppDomain ID: " + m_domainId);
@@ -209,7 +211,7 @@ namespace apache
 
   private:
 
-    GemStone::GemFire::Cache::Generic::IPdxSerializable^ getManagedObject() const;
+    Apache::Geode::Client::Generic::IPdxSerializable^ getManagedObject() const;
     
     /// <summary>
     /// Using gcroot to hold the managed delegate pointer (since it cannot be stored directly).

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp b/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp
index 04d2a17..fb70dc7 100644
--- a/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp
+++ b/src/clicache/src/impl/PdxReaderWithTypeCollector.cpp
@@ -20,13 +20,13 @@
 #include "../GemFireClassIds.hpp"
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp b/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp
index fe0e575..a3ff9a0 100644
--- a/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp
+++ b/src/clicache/src/impl/PdxReaderWithTypeCollector.hpp
@@ -22,13 +22,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       ref class DataInput;
       namespace Internal

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/PdxRemotePreservedData.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxRemotePreservedData.hpp b/src/clicache/src/impl/PdxRemotePreservedData.hpp
index 9b0e077..d965ceb 100644
--- a/src/clicache/src/impl/PdxRemotePreservedData.hpp
+++ b/src/clicache/src/impl/PdxRemotePreservedData.hpp
@@ -20,13 +20,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache
+    namespace Client
     {
-      namespace Generic
+namespace Generic
       {
       namespace Internal
       {


Mime
View raw message