geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [41/50] [abbrv] geode git commit: GEODE-2316: Renamed namespace GemStone.GemFire.Cache -> Apache.Geode.Client
Date Mon, 23 Jan 2017 19:17:33 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
index ce4597a..8437abf 100644
--- a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
+++ b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
@@ -36,27 +36,27 @@ namespace apache
 
       void ManagedCacheableDeltaBytesGeneric::toData(DataOutput& output) const
       {
-        GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::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("ManagedCacheableDeltaBytesGeneric::toData: current domain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its domain ID: " + m_domainId);
         try {
           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);
         }
       }
 
       Serializable* ManagedCacheableDeltaBytesGeneric::fromData(DataInput& input)
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytes::fromData: classid " + m_classId);
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true);
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytes::fromData: classid " + m_classId);
+          Apache::Geode::Client::Generic::DataInput mg_input(&input, true);
           const uint8_t* objStartPos = input.currentBufferPosition();
 
-          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);
 
@@ -66,14 +66,14 @@ namespace apache
 
           //m_size = mg_input.BytesRead;
           m_size = (uint32_t)(objEndPos - objStartPos);
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytes::fromData: objectSize = " + m_size + " m_hashCode = " + m_hashCode);
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytes::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;
       }
@@ -83,11 +83,11 @@ namespace apache
         try {
           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;
       }
@@ -98,11 +98,11 @@ namespace apache
         try {
           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);
       }
@@ -124,11 +124,11 @@ namespace apache
             return (int8_t)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 0;
       }
@@ -150,7 +150,7 @@ namespace apache
 
       bool ManagedCacheableDeltaBytesGeneric::hasDelta()
       {
-        //GemStone::GemFire::Cache::IGFDelta^ deltaObj = this->getManagedObject();
+        //Apache::Geode::Client::IGFDelta^ deltaObj = this->getManagedObject();
         //return deltaObj->HasDelta();
         return m_hasDelta;
       }
@@ -158,36 +158,36 @@ namespace apache
       void ManagedCacheableDeltaBytesGeneric::toDelta(DataOutput& output) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytes::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 = this->getManagedObject();
-          GemStone::GemFire::Cache::Generic::DataOutput mg_output(&output, true);
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytes::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 = 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 ManagedCacheableDeltaBytesGeneric::fromDelta(DataInput& input)
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytes::fromDelta:");
-          GemStone::GemFire::Cache::Generic::IGFDelta^ deltaObj = this->getManagedObject();
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true);
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytes::fromDelta:");
+          Apache::Geode::Client::Generic::IGFDelta^ deltaObj = this->getManagedObject();
+          Apache::Geode::Client::Generic::DataInput mg_input(&input, true);
           deltaObj->FromDelta(%mg_input);
 
-          GemStone::GemFire::Cache::Generic::IGFSerializable^ managedptr =
-            dynamic_cast <GemStone::GemFire::Cache::Generic::IGFSerializable^> (deltaObj);
+          Apache::Geode::Client::Generic::IGFSerializable^ managedptr =
+            dynamic_cast <Apache::Geode::Client::Generic::IGFSerializable^> (deltaObj);
           if (managedptr != nullptr)
           {
-            GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytes::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("ManagedCacheableDeltaBytes::fromDelta: classid " + managedptr->ClassId + " : " + managedptr->ToString());
+            Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytes::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("ManagedCacheableDeltaBytes::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);
 
             //move cursor
@@ -197,26 +197,26 @@ namespace apache
             GF_SAFE_DELETE(m_bytes);
             m_bytes = dataOut.getBufferCopy();
             m_size = dataOut.getBufferLength();
-            GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytes::fromDelta objectSize = " + m_size + " m_hashCode = " + m_hashCode);
+            Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytes::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 ManagedCacheableDeltaBytesGeneric::clone()
       {
         try {
-          GemStone::GemFire::Cache::Generic::IGFDelta^ deltaObj = this->getManagedObject();
-          ICloneable^ cloneable = dynamic_cast<ICloneable^>((GemStone::GemFire::Cache::Generic::IGFDelta^) deltaObj);
+          Apache::Geode::Client::Generic::IGFDelta^ deltaObj = this->getManagedObject();
+          ICloneable^ cloneable = dynamic_cast<ICloneable^>((Apache::Geode::Client::Generic::IGFDelta^) deltaObj);
           if (cloneable) {
-            GemStone::GemFire::Cache::Generic::IGFSerializable^ Mclone =
-              dynamic_cast<GemStone::GemFire::Cache::Generic::IGFSerializable^>(cloneable->Clone());
+            Apache::Geode::Client::Generic::IGFSerializable^ Mclone =
+              dynamic_cast<Apache::Geode::Client::Generic::IGFSerializable^>(cloneable->Clone());
             return DeltaPtr(static_cast<ManagedCacheableDeltaBytesGeneric*>(
               SafeMSerializableConvertGeneric(Mclone)));
           }
@@ -224,82 +224,82 @@ 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;
       }
 
-      GemStone::GemFire::Cache::Generic::IGFDelta^
+      Apache::Geode::Client::Generic::IGFDelta^
         ManagedCacheableDeltaBytesGeneric::getManagedObject() const
       {
 
-        GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytes::getManagedObject");
+        Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytes::getManagedObject");
 
         apache::geode::client::DataInput dinp(m_bytes, m_size);
-        GemStone::GemFire::Cache::Generic::DataInput mg_dinp(&dinp, true);
-        GemStone::GemFire::Cache::Generic::TypeFactoryMethodGeneric^ creationMethod =
-          GemStone::GemFire::Cache::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId);
-        GemStone::GemFire::Cache::Generic::IGFSerializable^ newObj = creationMethod();
+        Apache::Geode::Client::Generic::DataInput mg_dinp(&dinp, true);
+        Apache::Geode::Client::Generic::TypeFactoryMethodGeneric^ creationMethod =
+          Apache::Geode::Client::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId);
+        Apache::Geode::Client::Generic::IGFSerializable^ newObj = creationMethod();
 
-        GemStone::GemFire::Cache::Generic::IGFDelta^ managedDeltaptr =
-          dynamic_cast <GemStone::GemFire::Cache::Generic::IGFDelta^> (newObj->FromData(%mg_dinp));
+        Apache::Geode::Client::Generic::IGFDelta^ managedDeltaptr =
+          dynamic_cast <Apache::Geode::Client::Generic::IGFDelta^> (newObj->FromData(%mg_dinp));
         return managedDeltaptr;
       }
 
       bool ManagedCacheableDeltaBytesGeneric::operator ==(const apache::geode::client::CacheableKey& other) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal");
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal");
           // now checking classId(), typeId(), DSFID() etc. will be much more
           // expensive than just a dynamic_cast
           const ManagedCacheableDeltaBytesGeneric* p_other =
             dynamic_cast<const ManagedCacheableDeltaBytesGeneric*>(&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);
             bool ret = obj->Equals(p_other->ptr());
-            GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal return VAL = " + ret);
+            Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::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("ManagedCacheableDeltaBytesGeneric::equal returns false");
+        Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal returns false");
         return false;
       }
 
       bool ManagedCacheableDeltaBytesGeneric::operator ==(const ManagedCacheableDeltaBytesGeneric& other) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal. ");
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::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);
           bool ret = obj->Equals(other.ptr());
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal return VAL = " + ret);
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::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("ManagedCacheableDeltaBytesGeneric::equal return false");
+        Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal return false");
         return false;
       }
 
@@ -311,22 +311,22 @@ namespace apache
       size_t ManagedCacheableDeltaBytesGeneric::logString(char* buffer, size_t maxLength) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::IGFDelta^ manageObject = getManagedObject();
+          Apache::Geode::Client::Generic::IGFDelta^ 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;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp b/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp
index 0ce6bde..2636abb 100644
--- a/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp
+++ b/src/clicache/src/impl/ManagedCacheableDeltaBytes.hpp
@@ -25,11 +25,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       interface class IGFSerializable;
       interface class IGFDelta;
@@ -47,7 +49,7 @@ namespace apache
 
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.IGFDelta" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.IGFDelta" />
       /// object and implements the native <c>apache::geode::client::CacheableKey</c> interface.
       /// </summary>
       class ManagedCacheableDeltaBytesGeneric
@@ -62,7 +64,7 @@ namespace apache
         /// The managed object.
         /// </param>
         inline ManagedCacheableDeltaBytesGeneric(
-          GemStone::GemFire::Cache::Generic::IGFDelta^ managedDeltaptr, bool storeBytes)
+          Apache::Geode::Client::Generic::IGFDelta^ managedDeltaptr, bool storeBytes)
           : m_domainId(System::Threading::Thread::GetDomainID()),
           m_classId(0),
           m_bytes(NULL),
@@ -72,17 +74,17 @@ namespace apache
         {
           if (storeBytes)
             m_hasDelta = managedDeltaptr->HasDelta();
-          GemStone::GemFire::Cache::Generic::IGFSerializable^ managedptr =
-            dynamic_cast <GemStone::GemFire::Cache::Generic::IGFSerializable^> (managedDeltaptr);
+          Apache::Geode::Client::Generic::IGFSerializable^ managedptr =
+            dynamic_cast <Apache::Geode::Client::Generic::IGFSerializable^> (managedDeltaptr);
           if (managedptr != nullptr)
           {
             m_classId = managedptr->ClassId;
-            GemStone::GemFire::Cache::Generic::Log::Finer("ManagedCacheableDeltaBytes::Constructor: current AppDomain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its AppDomain ID: " + m_domainId);
-            GemStone::GemFire::Cache::Generic::Log::Finer("ManagedCacheableDeltaBytes::Constructor: class ID " + managedptr->ClassId + " : " + managedptr->ToString() + " storeBytes:" + storeBytes);
+            Apache::Geode::Client::Generic::Log::Finer("ManagedCacheableDeltaBytes::Constructor: current AppDomain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its AppDomain ID: " + m_domainId);
+            Apache::Geode::Client::Generic::Log::Finer("ManagedCacheableDeltaBytes::Constructor: class ID " + managedptr->ClassId + " : " + managedptr->ToString() + " storeBytes:" + storeBytes);
             if (storeBytes)
             {
               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);
 
               //move cursor
@@ -92,32 +94,32 @@ namespace apache
               m_bytes = dataOut.getBufferCopy();
               m_size = dataOut.getBufferLength();
               m_hashCode = managedptr->GetHashCode();
-              GemStone::GemFire::Cache::Generic::Log::Finer("ManagedCacheableDeltaBytes::Constructor objectSize = " + m_size + " m_hashCode = " + m_hashCode);
+              Apache::Geode::Client::Generic::Log::Finer("ManagedCacheableDeltaBytes::Constructor objectSize = " + m_size + " m_hashCode = " + m_hashCode);
             }
           }
         }
         /*
             inline ManagedCacheableDeltaBytes(
-            GemStone::GemFire::Cache::IGFDelta^ managedDeltaptr,  bool storeBytes)
+            Apache::Geode::Client::IGFDelta^ managedDeltaptr,  bool storeBytes)
             : m_domainId(System::Threading::Thread::GetDomainID()),
             m_classId(0),
             m_bytes(NULL),
             m_size(0),
             m_hashCode(0)
             {
-            GemStone::GemFire::Cache::Log::Fine("ManagedCacheableDeltaBytes::Constructor: not storing bytes ");
-            GemStone::GemFire::Cache::IGFSerializable^ managedptr = dynamic_cast <GemStone::GemFire::Cache::IGFSerializable^> ( managedDeltaptr );
+            Apache::Geode::Client::Log::Fine("ManagedCacheableDeltaBytes::Constructor: not storing bytes ");
+            Apache::Geode::Client::IGFSerializable^ managedptr = dynamic_cast <Apache::Geode::Client::IGFSerializable^> ( managedDeltaptr );
             if(managedptr != nullptr)
             {
             m_classId = managedptr->ClassId;
-            GemStone::GemFire::Cache::Log::Fine("ManagedCacheableDeltaBytes::Constructor: current AppDomain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its AppDomain ID: " + m_domainId);
-            GemStone::GemFire::Cache::Log::Fine("ManagedCacheableDeltaBytes::Constructor: class ID " + managedptr->ClassId + " : " + managedptr->ToString());
+            Apache::Geode::Client::Log::Fine("ManagedCacheableDeltaBytes::Constructor: current AppDomain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its AppDomain ID: " + m_domainId);
+            Apache::Geode::Client::Log::Fine("ManagedCacheableDeltaBytes::Constructor: class ID " + managedptr->ClassId + " : " + managedptr->ToString());
             apache::geode::client::DataOutput dataOut;
-            GemStone::GemFire::Cache::DataOutput mg_output( &dataOut);
+            Apache::Geode::Client::DataOutput mg_output( &dataOut);
             managedptr->ToData( %mg_output );
             m_bytes = dataOut.getBufferCopy();
             m_size = dataOut.getBufferLength();
-            GemStone::GemFire::Cache::Log::Fine("ManagedCacheableDeltaBytes::Constructor objectSize = " + m_size + " m_hashCode = " + m_hashCode);
+            Apache::Geode::Client::Log::Fine("ManagedCacheableDeltaBytes::Constructor objectSize = " + m_size + " m_hashCode = " + m_hashCode);
             m_hashCode = managedptr->GetHashCode();
             }
             }*/
@@ -198,27 +200,27 @@ namespace apache
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::IGFDelta^ ptr() const
+        inline Apache::Geode::Client::Generic::IGFDelta^ ptr() const
         {
           return getManagedObject();
         }
 
         inline ~ManagedCacheableDeltaBytesGeneric()
         {
-          GemStone::GemFire::Cache::Generic::Log::Finer("ManagedCacheableDeltaBytes::Destructor current AppDomain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its AppDomain ID: " + m_domainId);
+          Apache::Geode::Client::Generic::Log::Finer("ManagedCacheableDeltaBytes::Destructor current AppDomain ID: " + System::Threading::Thread::GetDomainID() + " for object: " + System::Convert::ToString((int)this) + " with its AppDomain ID: " + m_domainId);
           GF_SAFE_DELETE(m_bytes);
         }
 
       private:
-        GemStone::GemFire::Cache::Generic::IGFDelta^ getManagedObject() const;
+        Apache::Geode::Client::Generic::IGFDelta^ getManagedObject() const;
         /// <summary>
         /// Using gcroot to hold the managed delegate pointer (since it cannot be stored directly).
         /// Note: not using auto_gcroot since it will result in 'Dispose' of the IGFDelta
         /// 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::IGFDelta^> m_managedptr;
-        //gcroot<GemStone::GemFire::Cache::IGFSerializable^> m_managedSerializableptr;
+        //gcroot<Apache::Geode::Client::IGFDelta^> m_managedptr;
+        //gcroot<Apache::Geode::Client::IGFSerializable^> m_managedSerializableptr;
 
         int m_domainId;
         UInt32 m_classId;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKey.cpp b/src/clicache/src/impl/ManagedCacheableKey.cpp
index 5e69b35..51168c2 100644
--- a/src/clicache/src/impl/ManagedCacheableKey.cpp
+++ b/src/clicache/src/impl/ManagedCacheableKey.cpp
@@ -38,8 +38,8 @@ namespace apache
       {
         try {
           uint32 pos = (int)output.getBufferLength();
-          //GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyGeneric::toData");      
-          GemStone::GemFire::Cache::Generic::DataOutput mg_output(&output, true);
+          //Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyGeneric::toData");      
+          Apache::Geode::Client::Generic::DataOutput mg_output(&output, true);
           m_managedptr->ToData(%mg_output);
           //this will move the cursor in c++ layer
           mg_output.WriteBytesToUMDataOutput();
@@ -47,11 +47,11 @@ namespace apache
           ManagedCacheableKeyGeneric* tmp = const_cast<ManagedCacheableKeyGeneric*>(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);
         }
       }
 
@@ -59,8 +59,8 @@ namespace apache
       {
         try {
           int pos = input.getBytesRead();
-          //GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyGeneric::fromData");      
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true);
+          //Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyGeneric::fromData");      
+          Apache::Geode::Client::Generic::DataInput mg_input(&input, true);
           m_managedptr = m_managedptr->FromData(%mg_input);
 
           //this will move the cursor in c++ layer
@@ -71,11 +71,11 @@ namespace apache
 
 
         }
-        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,18 +89,18 @@ namespace apache
           else
             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;
       }
 
       int32_t ManagedCacheableKeyGeneric::classId() const
       {
-        //GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyGeneric::classid " + m_classId);
+        //Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyGeneric::classid " + m_classId);
         /*uint32_t classId;
         try {
         classId = m_managedptr->ClassId;
@@ -116,12 +116,12 @@ namespace apache
 
       int8_t ManagedCacheableKeyGeneric::typeId() const
       {
-        //GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyGeneric::typeId " + m_classId);
+        //Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyGeneric::typeId " + m_classId);
         if (m_classId >= 0x80000000) {
           return (int8_t)((m_classId - 0x80000000) % 0x20000000);
         }
         else if (m_classId <= 0x7F) {
-          //GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyGeneric::typeId inin"); 
+          //Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyGeneric::typeId inin"); 
           return (int8_t)GemfireTypeIdsImpl::CacheableUserData;
         }
         else if (m_classId <= 0x7FFF) {
@@ -150,15 +150,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;
       }
@@ -171,17 +171,17 @@ namespace apache
           const ManagedCacheableKeyGeneric* p_other =
             dynamic_cast<const ManagedCacheableKeyGeneric*>(&other);
           if (p_other != NULL) {
-            return static_cast<GemStone::GemFire::Cache::Generic::ICacheableKey^>(
-              (static_cast<GemStone::GemFire::Cache::Generic::IGFSerializable^>((GemStone::GemFire::Cache::Generic::IGFSerializable^)m_managedptr)))->Equals(
-              static_cast<GemStone::GemFire::Cache::Generic::ICacheableKey^>(p_other->ptr()));
+            return static_cast<Apache::Geode::Client::Generic::ICacheableKey^>(
+              (static_cast<Apache::Geode::Client::Generic::IGFSerializable^>((Apache::Geode::Client::Generic::IGFSerializable^)m_managedptr)))->Equals(
+              static_cast<Apache::Geode::Client::Generic::ICacheableKey^>(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;
       }
@@ -189,15 +189,15 @@ namespace apache
       bool ManagedCacheableKeyGeneric::operator ==(const ManagedCacheableKeyGeneric& other) const
       {
         try {
-          return static_cast<GemStone::GemFire::Cache::Generic::ICacheableKey^>(
-            (GemStone::GemFire::Cache::Generic::IGFSerializable^)(GemStone::GemFire::Cache::Generic::IGFSerializable^)m_managedptr)->Equals(
-            static_cast<GemStone::GemFire::Cache::Generic::ICacheableKey^>(other.ptr()));
+          return static_cast<Apache::Geode::Client::Generic::ICacheableKey^>(
+            (Apache::Geode::Client::Generic::IGFSerializable^)(Apache::Geode::Client::Generic::IGFSerializable^)m_managedptr)->Equals(
+            static_cast<Apache::Geode::Client::Generic::ICacheableKey^>(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;
       }
@@ -209,16 +209,16 @@ namespace apache
         try {
 
           ManagedCacheableKeyGeneric* tmp = const_cast<ManagedCacheableKeyGeneric*>(this);
-          tmp->m_hashcode = ((GemStone::GemFire::Cache::Generic::ICacheableKey^)
-            (GemStone::GemFire::Cache::Generic::IGFSerializable^)m_managedptr)
+          tmp->m_hashcode = ((Apache::Geode::Client::Generic::ICacheableKey^)
+            (Apache::Geode::Client::Generic::IGFSerializable^)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;
       }
@@ -229,15 +229,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;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKey.hpp b/src/clicache/src/impl/ManagedCacheableKey.hpp
index 33ea461..b80740b 100644
--- a/src/clicache/src/impl/ManagedCacheableKey.hpp
+++ b/src/clicache/src/impl/ManagedCacheableKey.hpp
@@ -25,18 +25,6 @@
 
 using namespace System;
 
-//namespace GemStone
-//{
-//  namespace GemFire
-//  {
-//    namespace Cache  { namespace Generic
-//    {
-//      interface class IGFSerializable;
-//    }
-//  }
-//}
-//}
-
 namespace apache
 {
   namespace geode
@@ -45,7 +33,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 ManagedCacheableKeyGeneric
@@ -58,7 +46,7 @@ namespace apache
       public:
 
         inline ManagedCacheableKeyGeneric(
-          GemStone::GemFire::Cache::Generic::IGFSerializable^ managedptr, int hashcode, int classId)
+          Apache::Geode::Client::Generic::IGFSerializable^ managedptr, int hashcode, int classId)
           : m_managedptr(managedptr) {
           m_hashcode = hashcode;
           m_classId = classId;
@@ -70,7 +58,7 @@ namespace apache
         /// <param name="managedptr">
         /// The managed object.
         /// </param>
-        inline ManagedCacheableKeyGeneric(GemStone::GemFire::Cache::Generic::IGFSerializable^ managedptr)
+        inline ManagedCacheableKeyGeneric(Apache::Geode::Client::Generic::IGFSerializable^ managedptr)
           : m_managedptr(managedptr) {
           // m_hashcode = managedptr->GetHashCode();
           m_hashcode = 0;
@@ -151,7 +139,7 @@ namespace apache
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::IGFSerializable^ ptr() const
+        inline Apache::Geode::Client::Generic::IGFSerializable^ ptr() const
         {
           return m_managedptr;
         }
@@ -165,7 +153,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::IGFSerializable^> m_managedptr;
+        gcroot<Apache::Geode::Client::Generic::IGFSerializable^> m_managedptr;
 
         // Disable the copy and assignment constructors
         ManagedCacheableKeyGeneric(const ManagedCacheableKeyGeneric&);

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
index 3343b7b..a791bbe 100644
--- a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
+++ b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
@@ -36,16 +36,16 @@ namespace apache
     {
       void ManagedCacheableKeyBytesGeneric::toData(apache::geode::client::DataOutput& output) const
       {
-        GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::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("ManagedCacheableKeyBytesGeneric::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,11 +53,11 @@ namespace apache
       {
         try {
 
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::fromData: classid " + m_classId + "aid = " + +System::Threading::Thread::GetDomainID());
-          GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true);
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::fromData: classid " + m_classId + "aid = " + +System::Threading::Thread::GetDomainID());
+          Apache::Geode::Client::Generic::DataInput mg_input(&input, true);
           const uint8_t* objStartPos = input.currentBufferPosition();
 
-          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);
@@ -68,15 +68,15 @@ namespace apache
 
           //m_size = mg_input.BytesRead;
           m_size = (uint32_t)(objEndPos - objStartPos);
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::fromData: objectSize = " + m_size + " m_hashCode = " + m_hashCode);
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::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;
       }
@@ -87,11 +87,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;
       }
@@ -103,11 +103,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);
       }
@@ -130,11 +130,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 0;
       }
@@ -158,20 +158,20 @@ namespace apache
       apache::geode::client::CacheableStringPtr ManagedCacheableKeyBytesGeneric::toString() const
       {
         try {
-          GemStone::GemFire::Cache::Generic::IGFSerializable^ manageObject = getManagedObject();
+          Apache::Geode::Client::Generic::IGFSerializable^ 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;
       }
@@ -179,53 +179,53 @@ namespace apache
       bool ManagedCacheableKeyBytesGeneric::operator ==(const apache::geode::client::CacheableKey& other) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::equal");
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::equal");
           // now checking classId(), typeId(), DSFID() etc. will be much more
           // expensive than just a dynamic_cast
           const ManagedCacheableKeyBytesGeneric* p_other =
             dynamic_cast<const ManagedCacheableKeyBytesGeneric*>(&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);
             bool ret = obj->Equals(p_other->ptr());
-            GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::equal return VAL = " + ret);
+            Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::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("ManagedCacheableKeyBytesGeneric::equal returns false");
+        Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::equal returns false");
         return false;
       }
 
       bool ManagedCacheableKeyBytesGeneric::operator ==(const ManagedCacheableKeyBytesGeneric& other) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::equal. ");
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::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);
           bool ret = obj->Equals(other.ptr());
-          GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::equal return VAL = " + ret);
+          Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::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("ManagedCacheableKeyBytesGeneric::equal return false");
+        Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::equal return false");
         return false;
       }
 
@@ -237,31 +237,31 @@ namespace apache
       size_t ManagedCacheableKeyBytesGeneric::logString(char* buffer, size_t maxLength) const
       {
         try {
-          GemStone::GemFire::Cache::Generic::IGFSerializable^ manageObject = getManagedObject();
+          Apache::Geode::Client::Generic::IGFSerializable^ 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::IGFSerializable^
+      Apache::Geode::Client::Generic::IGFSerializable^
         ManagedCacheableKeyBytesGeneric::getManagedObject() const
       {
 
-        GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::getManagedObject " + m_size);
+        Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::getManagedObject " + m_size);
 
         //System::Text::StringBuilder^ sb = gcnew System::Text::StringBuilder(2000);
         //for(uint32_t i = 0; i<m_size; i++)
@@ -271,12 +271,12 @@ namespace apache
         //	//sb->Append(' ');
         //}
 
-        //  GemStone::GemFire::Cache::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::getManagedObject " + sb);
+        //  Apache::Geode::Client::Generic::Log::Debug("ManagedCacheableKeyBytesGeneric::getManagedObject " + sb);
         apache::geode::client::DataInput dinp(m_bytes, m_size);
-        GemStone::GemFire::Cache::Generic::DataInput mg_dinp(&dinp, true);
-        GemStone::GemFire::Cache::Generic::TypeFactoryMethodGeneric^ creationMethod =
-          GemStone::GemFire::Cache::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId);
-        GemStone::GemFire::Cache::Generic::IGFSerializable^ newObj = creationMethod();
+        Apache::Geode::Client::Generic::DataInput mg_dinp(&dinp, true);
+        Apache::Geode::Client::Generic::TypeFactoryMethodGeneric^ creationMethod =
+          Apache::Geode::Client::Generic::Serializable::GetTypeFactoryMethodGeneric(m_classId);
+        Apache::Geode::Client::Generic::IGFSerializable^ newObj = creationMethod();
         return newObj->FromData(%mg_dinp);
       }
     }  // namespace client

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp b/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp
index 9ef60cb..112c589 100644
--- a/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp
+++ b/src/clicache/src/impl/ManagedCacheableKeyBytes.hpp
@@ -26,11 +26,13 @@
 
 using namespace System;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-    namespace Cache { namespace Generic
+    namespace Client
+    {
+namespace Generic
     {
       interface class IGFSerializable;
     }
@@ -46,7 +48,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 ManagedCacheableKeyBytesGeneric
@@ -61,7 +63,7 @@ namespace apache
         /// The managed object.
         /// </param>
         inline ManagedCacheableKeyBytesGeneric(
-          GemStone::GemFire::Cache::Generic::IGFSerializable^ managedptr, bool storeBytes)
+          Apache::Geode::Client::Generic::IGFSerializable^ managedptr, bool storeBytes)
           : m_domainId(System::Threading::Thread::GetDomainID()),
           m_classId(managedptr->ClassId),
           m_bytes(NULL),
@@ -73,7 +75,7 @@ namespace apache
             if (storeBytes)//if value is from app 
             {
               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);
 
               //move cursor
@@ -84,7 +86,7 @@ namespace apache
               m_size = dataOut.getBufferLength();
 
               m_hashCode = managedptr->GetHashCode();
-              GemStone::GemFire::Cache::Generic::Log::Fine(
+              Apache::Geode::Client::Generic::Log::Fine(
                 "ManagedCacheableKeyBytes::Constructor objectSize = " + m_size + " m_hashCode = " + m_hashCode);
             }
           }
@@ -163,14 +165,14 @@ namespace apache
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::IGFSerializable^ ptr() const
+        inline Apache::Geode::Client::Generic::IGFSerializable^ ptr() const
         {
           return getManagedObject();
         }
 
         inline ~ManagedCacheableKeyBytesGeneric()
         {
-          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);
@@ -179,7 +181,7 @@ namespace apache
 
       private:
 
-        GemStone::GemFire::Cache::Generic::IGFSerializable^ getManagedObject() const;
+        Apache::Geode::Client::Generic::IGFSerializable^ 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/ManagedCqListener.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCqListener.cpp b/src/clicache/src/impl/ManagedCqListener.cpp
index 4131e10..166aa70 100644
--- a/src/clicache/src/impl/ManagedCqListener.cpp
+++ b/src/clicache/src/impl/ManagedCqListener.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_t dotIndx = -1;
 
@@ -85,10 +85,10 @@ namespace apache
               BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase);
             if (mInfo != nullptr)
             {
-              GemStone::GemFire::Cache::Generic::ICqListener<Object^, Object^>^ managedptr = nullptr;
+              Apache::Geode::Client::Generic::ICqListener<Object^, Object^>^ managedptr = nullptr;
               try
               {
-                managedptr = dynamic_cast<GemStone::GemFire::Cache::Generic::ICqListener<Object^, Object^>^>(
+                managedptr = dynamic_cast<Apache::Geode::Client::Generic::ICqListener<Object^, Object^>^>(
                   mInfo->Invoke(typeInst, nullptr));
               }
               catch (System::Exception^)
@@ -104,7 +104,7 @@ namespace apache
                 ex_str += assemblyPath;
                 throw IllegalArgumentException(ex_str.c_str());
               }
-              return new ManagedCqListenerGeneric((GemStone::GemFire::Cache::Generic::ICqListener<Object^, Object^>^)managedptr);
+              return new ManagedCqListenerGeneric((Apache::Geode::Client::Generic::ICqListener<Object^, Object^>^)managedptr);
             }
             else
             {
@@ -118,7 +118,7 @@ namespace apache
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName);
+            Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName);
             std::string ex_str = "ManagedCqListener: Could not load type [";
             ex_str += typeName.CharPtr;
             ex_str += "] in assembly: ";
@@ -132,7 +132,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 = "ManagedCqListener: Got an exception while "
             "loading managed library: ";
           ex_str += mg_exStr.CharPtr;
@@ -145,14 +145,14 @@ namespace apache
       {
         try {
 
-          GemStone::GemFire::Cache::Generic::CqEvent<Object^, Object^> mevent(&ev);
+          Apache::Geode::Client::Generic::CqEvent<Object^, Object^> mevent(&ev);
           m_managedptr->OnEvent(%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::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedCqListener: Got an exception in"
             "onEvent: ";
           ex_str += mg_exStr.CharPtr;
@@ -162,7 +162,7 @@ namespace apache
 
       void ManagedCqListenerGeneric::onError(const CqEvent& ev)
       {
-        GemStone::GemFire::Cache::Generic::CqEvent<Object^, Object^> mevent(&ev);
+        Apache::Geode::Client::Generic::CqEvent<Object^, Object^> mevent(&ev);
         m_managedptr->OnError(%mevent);
       }
 
@@ -171,11 +171,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::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedCqListener: Got an exception in"
             "close: ";
           ex_str += mg_exStr.CharPtr;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCqListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCqListener.hpp b/src/clicache/src/impl/ManagedCqListener.hpp
index f44085b..d4f0bad 100644
--- a/src/clicache/src/impl/ManagedCqListener.hpp
+++ b/src/clicache/src/impl/ManagedCqListener.hpp
@@ -29,7 +29,7 @@ namespace apache {
     namespace client {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.ICacheListener" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.ICacheListener" />
       /// object and implements the native <c>apache::geode::client::CacheListener</c> interface.
       /// </summary>
       class ManagedCqListenerGeneric
@@ -84,9 +84,9 @@ namespace apache {
         /// <param name="ev">
         /// Denotes the event object associated with the entry creation.
         /// </param>
-        /// <seealso cref="GemStone.GemFire.Cache.Region.Create" />
-        /// <seealso cref="GemStone.GemFire.Cache.Region.Put" />
-        /// <seealso cref="GemStone.GemFire.Cache.Region.Get" />
+        /// <seealso cref="Apache.Geode.Client.Region.Create" />
+        /// <seealso cref="Apache.Geode.Client.Region.Put" />
+        /// <seealso cref="Apache.Geode.Client.Region.Get" />
         virtual void onEvent(const apache::geode::client::CqEvent& ev);
 
         /// <summary>
@@ -99,7 +99,7 @@ namespace apache {
         /// <param name="ev">
         /// EntryEvent denotes the event object associated with updating the entry.
         /// </param>
-        /// <seealso cref="GemStone.GemFire.Cache.Region.Put" />
+        /// <seealso cref="Apache.Geode.Client.Region.Put" />
         virtual void onError(const apache::geode::client::CqEvent& ev);
 
         /// <summary>
@@ -111,12 +111,12 @@ namespace apache {
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::ICqListener<Object^, Object^>^ ptr() const
+        inline Apache::Geode::Client::Generic::ICqListener<Object^, Object^>^ ptr() const
         {
           return m_managedptr;
         }
 
-        inline void setptr(GemStone::GemFire::Cache::Generic::ICqListener<Object^, Object^>^ managedptr)
+        inline void setptr(Apache::Geode::Client::Generic::ICqListener<Object^, Object^>^ managedptr)
         {
           m_managedptr = managedptr;
         }
@@ -134,7 +134,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::ICqListener<Object^, Object^>^> m_managedptr;
+        gcroot<Apache::Geode::Client::Generic::ICqListener<Object^, Object^>^> m_managedptr;
 
         gcroot<Object^> m_userptr;
       };

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCqStatusListener.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCqStatusListener.cpp b/src/clicache/src/impl/ManagedCqStatusListener.cpp
index e6a2924..99bb7c6 100644
--- a/src/clicache/src/impl/ManagedCqStatusListener.cpp
+++ b/src/clicache/src/impl/ManagedCqStatusListener.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;
           int32_t dotIndx = -1;
 
@@ -83,10 +83,10 @@ namespace apache
               BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase);
             if (mInfo != nullptr)
             {
-              GemStone::GemFire::Cache::Generic::ICqStatusListener<Object^, Object^>^ managedptr = nullptr;
+              Apache::Geode::Client::Generic::ICqStatusListener<Object^, Object^>^ managedptr = nullptr;
               try
               {
-                managedptr = dynamic_cast<GemStone::GemFire::Cache::Generic::ICqStatusListener<Object^, Object^>^>(
+                managedptr = dynamic_cast<Apache::Geode::Client::Generic::ICqStatusListener<Object^, Object^>^>(
                   mInfo->Invoke(typeInst, nullptr));
               }
               catch (System::Exception^)
@@ -102,7 +102,7 @@ namespace apache
                 ex_str += assemblyPath;
                 throw IllegalArgumentException(ex_str.c_str());
               }
-              return new ManagedCqStatusListenerGeneric((GemStone::GemFire::Cache::Generic::ICqListener<Object^, Object^>^)managedptr);
+              return new ManagedCqStatusListenerGeneric((Apache::Geode::Client::Generic::ICqListener<Object^, Object^>^)managedptr);
             }
             else
             {
@@ -116,7 +116,7 @@ namespace apache
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName);
+            Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName);
             std::string ex_str = "ManagedCqStatusListenerGeneric: Could not load type [";
             ex_str += typeName.CharPtr;
             ex_str += "] in assembly: ";
@@ -130,7 +130,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 = "ManagedCqStatusListenerGeneric: Got an exception while "
             "loading managed library: ";
           ex_str += mg_exStr.CharPtr;
@@ -143,14 +143,14 @@ namespace apache
       {
         try {
 
-          GemStone::GemFire::Cache::Generic::CqEvent<Object^, Object^> mevent(&ev);
+          Apache::Geode::Client::Generic::CqEvent<Object^, Object^> mevent(&ev);
           m_managedptr->OnEvent(%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::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedCqStatusListenerGeneric: Got an exception in"
             "onEvent: ";
           ex_str += mg_exStr.CharPtr;
@@ -160,7 +160,7 @@ namespace apache
 
       void ManagedCqStatusListenerGeneric::onError(const CqEvent& ev)
       {
-        GemStone::GemFire::Cache::Generic::CqEvent<Object^, Object^> mevent(&ev);
+        Apache::Geode::Client::Generic::CqEvent<Object^, Object^> mevent(&ev);
         m_managedptr->OnError(%mevent);
       }
 
@@ -169,11 +169,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::ManagedString mg_exStr(ex->ToString());
+          Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString());
           std::string ex_str = "ManagedCqStatusListenerGeneric: Got an exception in"
             "close: ";
           ex_str += mg_exStr.CharPtr;
@@ -186,11 +186,11 @@ namespace apache
         try {
           m_managedptr->OnCqDisconnected();
         }
-        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 = "ManagedCqStatusListenerGeneric: Got an exception in"
             "onCqDisconnected: ";
           ex_str += mg_exStr.CharPtr;
@@ -203,11 +203,11 @@ namespace apache
         try {
           m_managedptr->OnCqConnected();
         }
-        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 = "ManagedCqStatusListenerGeneric: Got an exception in"
             "OnCqConnected: ";
           ex_str += mg_exStr.CharPtr;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCqStatusListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCqStatusListener.hpp b/src/clicache/src/impl/ManagedCqStatusListener.hpp
index 3850353..552333b 100644
--- a/src/clicache/src/impl/ManagedCqStatusListener.hpp
+++ b/src/clicache/src/impl/ManagedCqStatusListener.hpp
@@ -28,7 +28,7 @@ namespace apache {
     namespace client {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.ICqStatusListener" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.ICqStatusListener" />
       /// object and implements the native <c>apache::geode::client::CqStatusListener</c> interface.
       /// </summary>
       class ManagedCqStatusListenerGeneric
@@ -106,12 +106,12 @@ namespace apache {
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::ICqStatusListener<Object^, Object^>^ ptr() const
+        inline Apache::Geode::Client::Generic::ICqStatusListener<Object^, Object^>^ ptr() const
         {
           return m_managedptr;
         }
 
-        inline void setptr(GemStone::GemFire::Cache::Generic::ICqStatusListener<Object^, Object^>^ managedptr)
+        inline void setptr(Apache::Geode::Client::Generic::ICqStatusListener<Object^, Object^>^ managedptr)
         {
           m_managedptr = managedptr;
         }
@@ -129,7 +129,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::ICqStatusListener<Object^, Object^>^> m_managedptr;
+        gcroot<Apache::Geode::Client::Generic::ICqStatusListener<Object^, Object^>^> m_managedptr;
 
         gcroot<Object^> m_userptr;
       };

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp b/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
index 166d3d9..11e6f0e 100644
--- a/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
+++ b/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
@@ -41,9 +41,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;
@@ -97,7 +97,7 @@ namespace apache
           mg_genericVal = mg_genericVal->Trim();
           mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1);
 
-          GemStone::GemFire::Cache::Generic::Log::Fine(
+          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);
 
@@ -120,7 +120,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);
 
@@ -137,7 +137,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);
@@ -151,7 +151,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)
@@ -166,7 +166,7 @@ namespace apache
 
               ManagedFixedPartitionResolverGeneric * mgpr = new ManagedFixedPartitionResolverGeneric(managedptr);
 
-              Type^ prgType = Type::GetType("GemStone.GemFire.Cache.Generic.FixedPartitionResolverGeneric`2");
+              Type^ prgType = Type::GetType("Apache.Geode.Client.Generic.FixedPartitionResolverGeneric`2");
               prgType = prgType->MakeGenericType(types);
               Object^ prg = Activator::CreateInstance(prgType);
 
@@ -175,7 +175,7 @@ namespace apache
               params[0] = managedptr;
               mInfo->Invoke(prg, params);
 
-              mgpr->setptr((GemStone::GemFire::Cache::Generic::IFixedPartitionResolverProxy^)prg);
+              mgpr->setptr((Apache::Geode::Client::Generic::IFixedPartitionResolverProxy^)prg);
 
               return mgpr;
             }
@@ -191,7 +191,7 @@ namespace apache
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName);
+            Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName);
             std::string ex_str = "ManagedFixedPartitionResolverGeneric: Could not load type [";
             ex_str += typeName.CharPtr;
             ex_str += "] in assembly: ";
@@ -205,7 +205,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 = "ManagedFixedPartitionResolverGeneric: Got an exception while "
             "loading managed library: ";
           ex_str += mg_exStr.CharPtr;
@@ -219,11 +219,11 @@ namespace apache
         try {
           return m_managedptr->getRoutingObject(key);
         }
-        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;
       }
@@ -233,11 +233,11 @@ namespace apache
         try {
           return m_managedptr->getName();
         }
-        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 NULL;
       }
@@ -247,11 +247,11 @@ namespace apache
         try {
           return m_managedptr->getPartitionName(opDetails);
         }
-        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 NULL;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedFixedPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedFixedPartitionResolver.hpp b/src/clicache/src/impl/ManagedFixedPartitionResolver.hpp
index ba88230..c48d258 100644
--- a/src/clicache/src/impl/ManagedFixedPartitionResolver.hpp
+++ b/src/clicache/src/impl/ManagedFixedPartitionResolver.hpp
@@ -28,7 +28,7 @@ namespace apache {
     namespace client {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.IFixedPartitionResolver" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.IFixedPartitionResolver" />
       /// object and implements the native <c>apache::geode::client::FixedPartitionResolver</c> interface.
       /// </summary>
       class ManagedFixedPartitionResolverGeneric
@@ -111,12 +111,12 @@ namespace apache {
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::IFixedPartitionResolverProxy^ ptr() const
+        inline Apache::Geode::Client::Generic::IFixedPartitionResolverProxy^ ptr() const
         {
           return m_managedptr;
         }
 
-        inline void setptr(GemStone::GemFire::Cache::Generic::IFixedPartitionResolverProxy^ managedptr)
+        inline void setptr(Apache::Geode::Client::Generic::IFixedPartitionResolverProxy^ managedptr)
         {
           m_managedptr = managedptr;
         }
@@ -134,7 +134,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::IFixedPartitionResolverProxy^> m_managedptr;
+        gcroot<Apache::Geode::Client::Generic::IFixedPartitionResolverProxy^> m_managedptr;
 
         gcroot<Object^> m_userptr;
       };

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedPartitionResolver.cpp b/src/clicache/src/impl/ManagedPartitionResolver.cpp
index ff0da5c..42754e6 100644
--- a/src/clicache/src/impl/ManagedPartitionResolver.cpp
+++ b/src/clicache/src/impl/ManagedPartitionResolver.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;
 
           String^ mg_genericKey = nullptr;
@@ -101,7 +101,7 @@ namespace apache
           mg_genericVal = mg_genericVal->Trim();
           mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1);
 
-          GemStone::GemFire::Cache::Generic::Log::Fine(
+          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);
 
@@ -124,7 +124,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);
 
@@ -141,7 +141,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);
@@ -155,7 +155,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)
@@ -170,7 +170,7 @@ namespace apache
 
               ManagedPartitionResolverGeneric * mgpr = new ManagedPartitionResolverGeneric(managedptr);
 
-              Type^ prgType = Type::GetType("GemStone.GemFire.Cache.Generic.PartitionResolverGeneric`2");
+              Type^ prgType = Type::GetType("Apache.Geode.Client.Generic.PartitionResolverGeneric`2");
               prgType = prgType->MakeGenericType(types);
               Object^ prg = Activator::CreateInstance(prgType);
 
@@ -179,7 +179,7 @@ namespace apache
               params[0] = managedptr;
               mInfo->Invoke(prg, params);
 
-              mgpr->setptr((GemStone::GemFire::Cache::Generic::IPartitionResolverProxy^)prg);
+              mgpr->setptr((Apache::Geode::Client::Generic::IPartitionResolverProxy^)prg);
 
               return mgpr;
             }
@@ -195,7 +195,7 @@ namespace apache
           }
           else
           {
-            GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName);
+            Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName);
             std::string ex_str = "ManagedPartitionResolverGeneric: Could not load type [";
             ex_str += typeName.CharPtr;
             ex_str += "] in assembly: ";
@@ -209,7 +209,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 = "ManagedPartitionResolverGeneric: Got an exception while "
             "loading managed library: ";
           ex_str += mg_exStr.CharPtr;
@@ -223,11 +223,11 @@ namespace apache
         try {
           return m_managedptr->getRoutingObject(key);
         }
-        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;
       }
@@ -237,11 +237,11 @@ namespace apache
         try {
           return m_managedptr->getName();
         }
-        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 NULL;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedPartitionResolver.hpp b/src/clicache/src/impl/ManagedPartitionResolver.hpp
index 3aefccb..dee05b7 100644
--- a/src/clicache/src/impl/ManagedPartitionResolver.hpp
+++ b/src/clicache/src/impl/ManagedPartitionResolver.hpp
@@ -30,7 +30,7 @@ namespace apache {
     namespace client {
 
       /// <summary>
-      /// Wraps the managed <see cref="GemStone.GemFire.Cache.IPartitionResolver" />
+      /// Wraps the managed <see cref="Apache.Geode.Client.IPartitionResolver" />
       /// object and implements the native <c>apache::geode::client::PartitionResolver</c> interface.
       /// </summary>
       class ManagedPartitionResolverGeneric
@@ -101,12 +101,12 @@ namespace apache {
         /// <summary>
         /// Returns the wrapped managed object reference.
         /// </summary>
-        inline GemStone::GemFire::Cache::Generic::IPartitionResolverProxy^ ptr() const
+        inline Apache::Geode::Client::Generic::IPartitionResolverProxy^ ptr() const
         {
           return m_managedptr;
         }
 
-        inline void setptr(GemStone::GemFire::Cache::Generic::IPartitionResolverProxy^ managedptr)
+        inline void setptr(Apache::Geode::Client::Generic::IPartitionResolverProxy^ managedptr)
         {
           m_managedptr = managedptr;
         }
@@ -124,7 +124,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::IPartitionResolverProxy^> m_managedptr;
+        gcroot<Apache::Geode::Client::Generic::IPartitionResolverProxy^> m_managedptr;
 
         gcroot<Object^> m_userptr;
       };


Mime
View raw message