geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [7/8] geode-native git commit: GEODE-2478: Replace gf with geode.
Date Wed, 22 Feb 2017 18:55:58 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableKey.cpp b/src/clicache/src/CacheableKey.cpp
index f1d6787..aa4e1c8 100644
--- a/src/clicache/src/CacheableKey.cpp
+++ b/src/clicache/src/CacheableKey.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CacheableKey.hpp"
 #include "CacheableString.hpp"
 #include "CacheableBuiltins.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableKey.hpp b/src/clicache/src/CacheableKey.hpp
index e84b3be..0c6d250 100644
--- a/src/clicache/src/CacheableKey.hpp
+++ b/src/clicache/src/CacheableKey.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CacheableKey.hpp>
 //#include "impl/NativeWrapper.hpp"
 #include "Serializable.hpp"
@@ -35,7 +35,7 @@ namespace Apache
 
       /// <summary>
       /// This class wraps the native C++ <c>apache::geode::client::Serializable</c> objects
-      /// as managed <see cref="../../IGFSerializable" /> objects.
+      /// as managed <see cref="../../IGeodeSerializable" /> objects.
       /// </summary>
       public ref class CacheableKey
         : public Serializable, public ICacheableKey

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableLinkedList.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableLinkedList.hpp b/src/clicache/src/CacheableLinkedList.hpp
index d6f5cd0..bd7da8b 100644
--- a/src/clicache/src/CacheableLinkedList.hpp
+++ b/src/clicache/src/CacheableLinkedList.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "CacheableVector.hpp"
 
 
@@ -32,12 +32,12 @@ namespace Apache
     {
 
       /// <summary>
-      /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as
+      /// A mutable <c>IGeodeSerializable</c> vector wrapper that can serve as
       /// a distributable object for caching. This class extends .NET generic
       /// <c>List</c> class.
       /// </summary>
       ref class CacheableLinkedList
-        : public IGFSerializable
+        : public IGeodeSerializable
       {
         System::Collections::Generic::LinkedList<Object^>^ m_linkedList;
       public:
@@ -67,7 +67,7 @@ namespace Apache
         }
 
 
-        // Region: IGFSerializable Members
+        // Region: IGeodeSerializable Members
 
         /// <summary>
         /// Returns the classId of the instance being serialized.
@@ -83,7 +83,7 @@ namespace Apache
           }
         }
 
-        // Region: IGFSerializable Members
+        // Region: IGeodeSerializable Members
 
         virtual void ToData(DataOutput^ output)
         {
@@ -99,7 +99,7 @@ namespace Apache
             output->WriteByte(0xFF);
         }
 
-        virtual IGFSerializable^ FromData(DataInput^ input)
+        virtual IGeodeSerializable^ FromData(DataInput^ input)
         {
           int len = input->ReadArrayLen();
           for (int i = 0; i < len; i++)
@@ -113,7 +113,7 @@ namespace Apache
         {
         //TODO::
         uint32_t size = static_cast<uint32_t> (sizeof(CacheableVector^));
-        for each (IGFSerializable^ val in this) {
+        for each (IGeodeSerializable^ val in this) {
         if (val != nullptr) {
         size += val->ObjectSize;
         }
@@ -136,12 +136,12 @@ namespace Apache
             return m_linkedList;
           }
         }
-        // End Region: IGFSerializable Members
+        // End Region: IGeodeSerializable Members
 
         /// <summary>
         /// Factory function to register this class.
         /// </summary>
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableLinkedList(gcnew System::Collections::Generic::LinkedList<Object^>());
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableObject.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObject.cpp b/src/clicache/src/CacheableObject.cpp
index e02c2fa..9b61914 100644
--- a/src/clicache/src/CacheableObject.cpp
+++ b/src/clicache/src/CacheableObject.cpp
@@ -16,13 +16,13 @@
  */
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CacheableObject.hpp"
 #include "DataInput.hpp"
 #include "DataOutput.hpp"
-#include "impl/GFNullStream.hpp"
-#include "impl/GFDataInputStream.hpp"
-#include "impl/GFDataOutputStream.hpp"
+#include "impl/GeodeNullStream.hpp"
+#include "impl/GeodeDataInputStream.hpp"
+#include "impl/GeodeDataOutputStream.hpp"
 
 using namespace System;
 using namespace System::IO;
@@ -41,7 +41,7 @@ namespace Apache
         {
           output->AdvanceCursor(4); // placeholder for object size bytes needed while reading back.
 
-          GFDataOutputStream dos(output);
+          GeodeDataOutputStream dos(output);
           BinaryFormatter bf;
           int64_t checkpoint = dos.Length;
           bf.Serialize(%dos, m_obj);
@@ -53,10 +53,10 @@ namespace Apache
         }
       }
 
-      IGFSerializable^ CacheableObject::FromData(DataInput^ input)
+      IGeodeSerializable^ CacheableObject::FromData(DataInput^ input)
       {
         int maxSize = input->ReadInt32();
-        GFDataInputStream dis(input, maxSize);
+        GeodeDataInputStream dis(input, maxSize);
         uint32_t checkpoint = dis.BytesRead;
         BinaryFormatter bf;
         m_obj = bf.Deserialize(%dis);
@@ -67,7 +67,7 @@ namespace Apache
       uint32_t CacheableObject::ObjectSize::get()
       { 
         if (m_objectSize == 0) {
-          GFNullStream ns;
+          GeodeNullStream ns;
           BinaryFormatter bf;
           bf.Serialize(%ns, m_obj);
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableObject.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObject.hpp b/src/clicache/src/CacheableObject.hpp
index 3f07c3e..48424d5 100644
--- a/src/clicache/src/CacheableObject.hpp
+++ b/src/clicache/src/CacheableObject.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
-#include "IGFSerializable.hpp"
+#include "geode_defs.hpp"
+#include "IGeodeSerializable.hpp"
 #include "GeodeClassIds.hpp"
 
 using namespace System;
@@ -40,7 +40,7 @@ namespace Apache
       /// [Serializable] attribute set or implements
       /// <see cref="System.Runtime.Serialization.ISerializable" /> interface.
       /// However, for better efficiency the latter should be avoided and the
-      /// user should implement <see cref="../../IGFSerializable" /> instead.
+      /// user should implement <see cref="../../IGeodeSerializable" /> instead.
       /// </para><para>
       /// The user must keep in mind that the rules that apply to runtime
       /// serialization would be the rules that apply to this class. For
@@ -51,7 +51,7 @@ namespace Apache
       /// </para>
       /// </remarks>
       public ref class CacheableObject
-        : public IGFSerializable
+        : public IGeodeSerializable
       {
       public:
         /// <summary>
@@ -83,7 +83,7 @@ namespace Apache
         /// the DataInput stream to use for reading the object data
         /// </param>
         /// <returns>the deserialized object</returns>
-        virtual IGFSerializable^ FromData(DataInput^ input);
+        virtual IGeodeSerializable^ FromData(DataInput^ input);
 
         /// <summary>
         /// return the size of this object in bytes
@@ -132,7 +132,7 @@ namespace Apache
         /// <summary>
         /// Factory function to register this class.
         /// </summary>
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableObject(nullptr);
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableObjectArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.cpp b/src/clicache/src/CacheableObjectArray.cpp
index 3df7c54..d21a38d 100644
--- a/src/clicache/src/CacheableObjectArray.cpp
+++ b/src/clicache/src/CacheableObjectArray.cpp
@@ -17,7 +17,7 @@
 
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include <GeodeTypeIdsImpl.hpp>
 #include "CacheableObjectArray.hpp"
 #include "DataOutput.hpp"
@@ -37,7 +37,7 @@ namespace Apache
     namespace Client
     {
 
-      // Region: IGFSerializable Members
+      // Region: IGeodeSerializable Members
 
       void CacheableObjectArray::ToData(DataOutput^ output)
       {
@@ -58,7 +58,7 @@ namespace Apache
           nativeOutput.write((int8_t)apache::geode::client::GeodeTypeIdsImpl::Class);
           nativeOutput.write((int8_t)apache::geode::client::GeodeTypeIds::CacheableASCIIString);
           nativeOutput.writeASCII("java.lang.Object");
-          for each (IGFSerializable^ obj in this) {
+          for each (IGeodeSerializable^ obj in this) {
             apache::geode::client::SerializablePtr objPtr(SafeMSerializableConvert(obj));
             nativeOutput.writeObject(objPtr);
           }
@@ -66,7 +66,7 @@ namespace Apache
         _GF_MG_EXCEPTION_CATCH_ALL*/
       }
 
-      IGFSerializable^ CacheableObjectArray::FromData(DataInput^ input)
+      IGeodeSerializable^ CacheableObjectArray::FromData(DataInput^ input)
       {
         int len = input->ReadArrayLen();
         if (len >= 0) {
@@ -109,7 +109,7 @@ namespace Apache
       uint32_t CacheableObjectArray::ObjectSize::get()
       { 
        /* uint32_t size = static_cast<uint32_t> (sizeof(CacheableObjectArray^));
-        for each (IGFSerializable^ val in this) {
+        for each (IGeodeSerializable^ val in this) {
           if (val != nullptr) {
             size += val->ObjectSize;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableObjectArray.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectArray.hpp b/src/clicache/src/CacheableObjectArray.hpp
index f754b6d..7c484e4 100644
--- a/src/clicache/src/CacheableObjectArray.hpp
+++ b/src/clicache/src/CacheableObjectArray.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
-#include "IGFSerializable.hpp"
+#include "geode_defs.hpp"
+#include "IGeodeSerializable.hpp"
 #include "GeodeClassIds.hpp"
 
 
@@ -33,13 +33,13 @@ namespace Apache
     {
 
       /// <summary>
-      /// A mutable <c>IGFSerializable</c> object array wrapper that can serve
+      /// A mutable <c>IGeodeSerializable</c> object array wrapper that can serve
       /// as a distributable object for caching. Though this class provides
       /// compatibility with java Object[] serialization, it provides the
       /// semantics of .NET generic <c>List</c> class.
       /// </summary>
       public ref class CacheableObjectArray
-        : public List<Object^>, public IGFSerializable
+        : public List<Object^>, public IGeodeSerializable
       {
       public:
         /// <summary>
@@ -95,7 +95,7 @@ namespace Apache
           return gcnew CacheableObjectArray(capacity);
         }
 
-        // Region: IGFSerializable Members
+        // Region: IGeodeSerializable Members
 
         /// <summary>
         /// Serializes this object.
@@ -113,7 +113,7 @@ namespace Apache
         /// the DataInput stream to use for reading the object data
         /// </param>
         /// <returns>the deserialized object</returns>
-        virtual IGFSerializable^ FromData(DataInput^ input);
+        virtual IGeodeSerializable^ FromData(DataInput^ input);
 
         /// <summary>
         /// return the size of this object in bytes
@@ -137,12 +137,12 @@ namespace Apache
           }
         }
 
-        // End Region: IGFSerializable Members
+        // End Region: IGeodeSerializable Members
 
         /// <summary>
         /// Factory function to register this class.
         /// </summary>
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableObjectArray();
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableObjectXml.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectXml.cpp b/src/clicache/src/CacheableObjectXml.cpp
index 0f58ff7..289f024 100644
--- a/src/clicache/src/CacheableObjectXml.cpp
+++ b/src/clicache/src/CacheableObjectXml.cpp
@@ -17,14 +17,14 @@
 
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CacheableObjectXml.hpp"
 #include "DataInput.hpp"
 #include "DataOutput.hpp"
 #include "Log.hpp"
-#include "impl/GFNullStream.hpp"
-#include "impl/GFDataInputStream.hpp"
-#include "impl/GFDataOutputStream.hpp"
+#include "impl/GeodeNullStream.hpp"
+#include "impl/GeodeDataInputStream.hpp"
+#include "impl/GeodeDataOutputStream.hpp"
 
 using namespace System;
 using namespace System::IO;
@@ -52,7 +52,7 @@ namespace Apache
           output->AdvanceCursor(4); // placeholder for object size bytes needed while reading back.
 
           XmlSerializer xs(objType);
-          GFDataOutputStream dos(output);
+          GeodeDataOutputStream dos(output);
           int64_t checkpoint = dos.Length;
           xs.Serialize(%dos, m_obj);
           m_objectSize = (uint32_t) (dos.Length - checkpoint);
@@ -63,7 +63,7 @@ namespace Apache
         }
       }
 
-      IGFSerializable^ CacheableObjectXml::FromData(DataInput^ input)
+      IGeodeSerializable^ CacheableObjectXml::FromData(DataInput^ input)
       {
         Byte isNull = input->ReadByte();
         if (isNull) {
@@ -80,7 +80,7 @@ namespace Apache
           }
           else {
             int maxSize = input->ReadInt32();
-            GFDataInputStream dis(input, maxSize);
+            GeodeDataInputStream dis(input, maxSize);
             XmlSerializer xs(objType);
             uint32_t checkpoint = dis.BytesRead;
             m_obj = xs.Deserialize(%dis);
@@ -96,7 +96,7 @@ namespace Apache
           if (m_obj != nullptr) {
             Type^ objType = m_obj->GetType();
             XmlSerializer xs(objType);
-            GFNullStream ns;
+            GeodeNullStream ns;
             xs.Serialize(%ns, m_obj);
 
             m_objectSize = (uint32_t)sizeof(CacheableObjectXml^) + (uint32_t)ns.Length;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableObjectXml.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableObjectXml.hpp b/src/clicache/src/CacheableObjectXml.hpp
index 3e79d01..86820bc 100644
--- a/src/clicache/src/CacheableObjectXml.hpp
+++ b/src/clicache/src/CacheableObjectXml.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
-#include "IGFSerializable.hpp"
+#include "geode_defs.hpp"
+#include "IGeodeSerializable.hpp"
 #include "GeodeClassIds.hpp"
 
 using namespace System;
@@ -43,7 +43,7 @@ namespace Apache
       /// of the object (or implement the <see cref="System.Xml.Serialization.IXmlSerializable" />)
       /// to change the serialization/deserialization. However, the latter should
       /// be avoided for efficiency reasons and the user should implement
-      /// <see cref="../../IGFSerializable" /> instead.
+      /// <see cref="../../IGeodeSerializable" /> instead.
       /// </para><para>
       /// The user must keep in mind that the rules that apply to <c>XmlSerializer</c>
       /// would be the rules that apply to this class. For instance the user
@@ -54,7 +54,7 @@ namespace Apache
       /// </para>
       /// </remarks>
       public ref class CacheableObjectXml
-        : public IGFSerializable
+        : public IGeodeSerializable
       {
       public:
         /// <summary>
@@ -86,7 +86,7 @@ namespace Apache
         /// the DataInput stream to use for reading the object data
         /// </param>
         /// <returns>the deserialized object</returns>
-        virtual IGFSerializable^ FromData(DataInput^ input);
+        virtual IGeodeSerializable^ FromData(DataInput^ input);
 
         /// <summary>
         /// return the size of this object in bytes
@@ -135,7 +135,7 @@ namespace Apache
         /// <summary>
         /// Factory function to register this class.
         /// </summary>
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableObjectXml(nullptr);
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableStack.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStack.cpp b/src/clicache/src/CacheableStack.cpp
index 6cb50b5..9285d2c 100644
--- a/src/clicache/src/CacheableStack.cpp
+++ b/src/clicache/src/CacheableStack.cpp
@@ -17,7 +17,7 @@
 
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CacheableStack.hpp"
 #include "DataOutput.hpp"
 #include "DataInput.hpp"
@@ -35,7 +35,7 @@ namespace Apache
     namespace Client
     {
 
-      // Region: IGFSerializable Members
+      // Region: IGeodeSerializable Members
 
       void CacheableStack::ToData(DataOutput^ output)
       {
@@ -52,7 +52,7 @@ namespace Apache
         }
       }
 
-      IGFSerializable^ CacheableStack::FromData(DataInput^ input)
+      IGeodeSerializable^ CacheableStack::FromData(DataInput^ input)
       {
         int len = input->ReadArrayLen();
         if (len > 0)
@@ -76,7 +76,7 @@ namespace Apache
       {
         //TODO:
         /*uint32_t size = static_cast<uint32_t> (sizeof(CacheableStack^));
-        for each (IGFSerializable^ val in this) {
+        for each (IGeodeSerializable^ val in this) {
         if (val != nullptr) {
         size += val->ObjectSize;
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableStack.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStack.hpp b/src/clicache/src/CacheableStack.hpp
index ada11fb..f81c4d6 100644
--- a/src/clicache/src/CacheableStack.hpp
+++ b/src/clicache/src/CacheableStack.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
-#include "IGFSerializable.hpp"
+#include "geode_defs.hpp"
+#include "IGeodeSerializable.hpp"
 
 
 using namespace System;
@@ -32,11 +32,11 @@ namespace Apache
     {
 
       /// <summary>
-      /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as
+      /// A mutable <c>IGeodeSerializable</c> vector wrapper that can serve as
       /// a distributable object for caching.
       /// </summary>
       ref class CacheableStack
-        : public IGFSerializable
+        : public IGeodeSerializable
       {
       public:
         /// <summary>
@@ -65,7 +65,7 @@ namespace Apache
 
         
         
-        // Region: IGFSerializable Members
+        // Region: IGeodeSerializable Members
 
         /// <summary>
         /// Serializes this object.
@@ -83,7 +83,7 @@ namespace Apache
         /// the DataInput stream to use for reading the object data
         /// </param>
         /// <returns>the deserialized object</returns>
-        virtual IGFSerializable^ FromData(DataInput^ input);
+        virtual IGeodeSerializable^ FromData(DataInput^ input);
 
         /// <summary>
         /// return the size of this object in bytes
@@ -111,12 +111,12 @@ namespace Apache
             return m_stack;
           }
         }
-        // End Region: IGFSerializable Members
+        // End Region: IGeodeSerializable Members
 
         /// <summary>
         /// Factory function to register this class.
         /// </summary>
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableStack(gcnew System::Collections::Generic::Stack<Object^>());
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableString.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableString.cpp b/src/clicache/src/CacheableString.cpp
index fe998e9..9db8cff 100644
--- a/src/clicache/src/CacheableString.cpp
+++ b/src/clicache/src/CacheableString.cpp
@@ -20,7 +20,7 @@
 #include "DataOutput.hpp"
 #include "DataInput.hpp"
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CacheableString.hpp"
 #include "ExceptionTypes.hpp"
 
@@ -50,7 +50,7 @@ namespace Apache
         }
       }
 
-      IGFSerializable^ CacheableString::FromData(DataInput^ input)
+      IGeodeSerializable^ CacheableString::FromData(DataInput^ input)
       {
         if (m_type == GeodeClassIds::CacheableASCIIString ||
             m_type == GeodeClassIds::CacheableString)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableString.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableString.hpp b/src/clicache/src/CacheableString.hpp
index cb2efc3..7f383ef 100644
--- a/src/clicache/src/CacheableString.hpp
+++ b/src/clicache/src/CacheableString.hpp
@@ -19,7 +19,7 @@
 
 
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CacheableString.hpp>
 #include "impl/ManagedString.hpp"
 #include "CacheableKey.hpp"
@@ -87,13 +87,13 @@ namespace Apache
 
         /// <summary>
         /// Deserializes the managed object -- returns an instance of the
-        /// <c>IGFSerializable</c> class.
+        /// <c>IGeodeSerializable</c> class.
         /// </summary>
         /// <param name="input">
         /// the DataInput stream to use for reading the object data
         /// </param>
         /// <returns>the deserialized object</returns>
-        virtual IGFSerializable^ FromData(DataInput^ input) override;
+        virtual IGeodeSerializable^ FromData(DataInput^ input) override;
 
         // <summary>
         /// Returns the classId of the instance being serialized.
@@ -217,29 +217,29 @@ namespace Apache
         }
 
       internal:
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableString(GeodeClassIds::CacheableASCIIString);
         }
 
-        static IGFSerializable^ createDeserializableHuge()
+        static IGeodeSerializable^ createDeserializableHuge()
         {
           return gcnew CacheableString(GeodeClassIds::CacheableASCIIStringHuge);
         }
 
-        static IGFSerializable^ createUTFDeserializable()
+        static IGeodeSerializable^ createUTFDeserializable()
         {
           return gcnew CacheableString(GeodeClassIds::CacheableString);
         }
 
-        static IGFSerializable^ createUTFDeserializableHuge()
+        static IGeodeSerializable^ createUTFDeserializableHuge()
         {
           return gcnew CacheableString(GeodeClassIds::CacheableStringHuge);
         }
         /// <summary>
         /// Factory function to register wrapper
         /// </summary>
-        static IGFSerializable^ Create(apache::geode::client::Serializable* obj)
+        static IGeodeSerializable^ Create(apache::geode::client::Serializable* obj)
         {
           return (obj != nullptr ?
                   gcnew CacheableString(obj) : nullptr);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableStringArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStringArray.cpp b/src/clicache/src/CacheableStringArray.cpp
index 0a860e4..ca5dd72 100644
--- a/src/clicache/src/CacheableStringArray.cpp
+++ b/src/clicache/src/CacheableStringArray.cpp
@@ -69,7 +69,7 @@ namespace Apache
       }
         
     
-      IGFSerializable^ CacheableStringArray::FromData(DataInput^ input)
+      IGeodeSerializable^ CacheableStringArray::FromData(DataInput^ input)
       {
         int len = input->ReadArrayLen();
         if ( len == -1)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableStringArray.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStringArray.hpp b/src/clicache/src/CacheableStringArray.hpp
index adc3050..900853b 100644
--- a/src/clicache/src/CacheableStringArray.hpp
+++ b/src/clicache/src/CacheableStringArray.hpp
@@ -19,7 +19,7 @@
 
 
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CacheableBuiltins.hpp>
 #include "Serializable.hpp"
 #include "GeodeClassIds.hpp"
@@ -71,13 +71,13 @@ namespace Apache
 
         /// <summary>
         /// Deserializes the managed object -- returns an instance of the
-        /// <c>IGFSerializable</c> class.
+        /// <c>IGeodeSerializable</c> class.
         /// </summary>
         /// <param name="input">
         /// the DataInput stream to use for reading the object data
         /// </param>
         /// <returns>the deserialized object</returns>
-        virtual IGFSerializable^ FromData(DataInput^ input) override;
+        virtual IGeodeSerializable^ FromData(DataInput^ input) override;
 
 
         /// <summary>
@@ -143,7 +143,7 @@ namespace Apache
         /// <summary>
         /// Factory function to register this class.
         /// </summary>
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableStringArray();
         }
@@ -152,7 +152,7 @@ namespace Apache
         /// <summary>
         /// Factory function to register wrapper
         /// </summary>
-        static IGFSerializable^ Create(apache::geode::client::Serializable* obj)
+        static IGeodeSerializable^ Create(apache::geode::client::Serializable* obj)
         {
           return (obj != nullptr ?
                   gcnew CacheableStringArray(obj) : nullptr);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableUndefined.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableUndefined.cpp b/src/clicache/src/CacheableUndefined.cpp
index 4da32ce..01888da 100644
--- a/src/clicache/src/CacheableUndefined.cpp
+++ b/src/clicache/src/CacheableUndefined.cpp
@@ -17,7 +17,7 @@
 
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CacheableUndefined.hpp"
 #include "DataOutput.hpp"
 #include "DataInput.hpp"
@@ -32,13 +32,13 @@ namespace Apache
     namespace Client
     {
 
-      // Region: IGFSerializable Members
+      // Region: IGeodeSerializable Members
 
       void CacheableUndefined::ToData(DataOutput^ output)
       {
       }
 
-      IGFSerializable^ CacheableUndefined::FromData(DataInput^ input)
+      IGeodeSerializable^ CacheableUndefined::FromData(DataInput^ input)
       {
         return this;
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableUndefined.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableUndefined.hpp b/src/clicache/src/CacheableUndefined.hpp
index 876ee2c..d2576bc 100644
--- a/src/clicache/src/CacheableUndefined.hpp
+++ b/src/clicache/src/CacheableUndefined.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
-#include "IGFSerializable.hpp"
+#include "geode_defs.hpp"
+#include "IGeodeSerializable.hpp"
 #include "GeodeClassIds.hpp"
 #include "Log.hpp"
 
@@ -35,7 +35,7 @@ namespace Apache
       /// Encapsulate an undefined result.
       /// </summary>
       public ref class CacheableUndefined
-        : public IGFSerializable
+        : public IGeodeSerializable
       {
       public:
         /// <summary>
@@ -51,7 +51,7 @@ namespace Apache
           return gcnew CacheableUndefined();
         }
 
-        // Region: IGFSerializable Members
+        // Region: IGeodeSerializable Members
 
         /// <summary>
         /// Serializes this object.
@@ -69,7 +69,7 @@ namespace Apache
         /// the DataInput stream to use for reading the object data
         /// </param>
         /// <returns>the deserialized object</returns>
-        virtual IGFSerializable^ FromData(DataInput^ input);
+        virtual IGeodeSerializable^ FromData(DataInput^ input);
 
         /// <summary>
         /// return the size of this object in bytes
@@ -93,12 +93,12 @@ namespace Apache
           }
         }
 
-        // End Region: IGFSerializable Members
+        // End Region: IGeodeSerializable Members
 
         /// <summary>
         /// Factory function to register this class.
         /// </summary>
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableUndefined();
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableVector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableVector.cpp b/src/clicache/src/CacheableVector.cpp
index b47f958..1604ef3 100644
--- a/src/clicache/src/CacheableVector.cpp
+++ b/src/clicache/src/CacheableVector.cpp
@@ -17,7 +17,7 @@
 
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CacheableVector.hpp"
 #include "DataOutput.hpp"
 #include "DataInput.hpp"
@@ -34,7 +34,7 @@ namespace Apache
     namespace Client
     {
 
-      // Region: IGFSerializable Members
+      // Region: IGeodeSerializable Members
 
       void CacheableVector::ToData(DataOutput^ output)
       {
@@ -50,7 +50,7 @@ namespace Apache
           output->WriteByte(0xFF);
       }
 
-      IGFSerializable^ CacheableVector::FromData(DataInput^ input)
+      IGeodeSerializable^ CacheableVector::FromData(DataInput^ input)
       {
         int len = input->ReadArrayLen();
         for( int i = 0; i < len; i++)
@@ -64,7 +64,7 @@ namespace Apache
       { 
         //TODO::
         /*uint32_t size = static_cast<uint32_t> (sizeof(CacheableVector^));
-        for each (IGFSerializable^ val in this) {
+        for each (IGeodeSerializable^ val in this) {
           if (val != nullptr) {
             size += val->ObjectSize;
           }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableVector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableVector.hpp b/src/clicache/src/CacheableVector.hpp
index 5df0c3e..97645e7 100644
--- a/src/clicache/src/CacheableVector.hpp
+++ b/src/clicache/src/CacheableVector.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
-#include "IGFSerializable.hpp"
+#include "geode_defs.hpp"
+#include "IGeodeSerializable.hpp"
 #include "GeodeClassIds.hpp"
 
 
@@ -33,12 +33,12 @@ namespace Apache
     {
 
       /// <summary>
-      /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as
+      /// A mutable <c>IGeodeSerializable</c> vector wrapper that can serve as
       /// a distributable object for caching. This class extends .NET generic
       /// <c>List</c> class.
       /// </summary>
       ref class CacheableVector
-        : public IGFSerializable
+        : public IGeodeSerializable
       {
       public:
         /// <summary>
@@ -67,7 +67,7 @@ namespace Apache
         }
 
 
-        // Region: IGFSerializable Members
+        // Region: IGeodeSerializable Members
 
         /// <summary>
         /// Serializes this object.
@@ -85,7 +85,7 @@ namespace Apache
         /// the DataInput stream to use for reading the object data
         /// </param>
         /// <returns>the deserialized object</returns>
-        virtual IGFSerializable^ FromData(DataInput^ input);
+        virtual IGeodeSerializable^ FromData(DataInput^ input);
 
         /// <summary>
         /// return the size of this object in bytes
@@ -117,12 +117,12 @@ namespace Apache
           }
         }
 
-        // End Region: IGFSerializable Members
+        // End Region: IGeodeSerializable Members
 
         /// <summary>
         /// Factory function to register this class.
         /// </summary>
-        static IGFSerializable^ CreateDeserializable()
+        static IGeodeSerializable^ CreateDeserializable()
         {
           return gcnew CacheableVector(gcnew System::Collections::ArrayList());
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributes.cpp b/src/clicache/src/CqAttributes.cpp
index c6dbe10..cf6e07c 100644
--- a/src/clicache/src/CqAttributes.cpp
+++ b/src/clicache/src/CqAttributes.cpp
@@ -16,7 +16,7 @@
  */
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CqAttributes.hpp"
 #include "impl/ManagedCqListener.hpp"
 #include "ICqListener.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributes.hpp b/src/clicache/src/CqAttributes.hpp
index bb5ce70..756bc85 100644
--- a/src/clicache/src/CqAttributes.hpp
+++ b/src/clicache/src/CqAttributes.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CqAttributes.hpp>
 #include "impl/NativeWrapper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqAttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesFactory.cpp b/src/clicache/src/CqAttributesFactory.cpp
index adf24d3..e30a707 100644
--- a/src/clicache/src/CqAttributesFactory.cpp
+++ b/src/clicache/src/CqAttributesFactory.cpp
@@ -16,7 +16,7 @@
  */
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CqAttributesFactory.hpp"
 #include "impl/ManagedCqListener.hpp"
 #include "ICqListener.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqAttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesFactory.hpp b/src/clicache/src/CqAttributesFactory.hpp
index f173f10..d421caa 100644
--- a/src/clicache/src/CqAttributesFactory.hpp
+++ b/src/clicache/src/CqAttributesFactory.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CqAttributesFactory.hpp>
 //#include "impl/NativeWrapper.hpp"
 #include "impl/SafeConvert.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqAttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesMutator.cpp b/src/clicache/src/CqAttributesMutator.cpp
index 0e2b303..68adf79 100644
--- a/src/clicache/src/CqAttributesMutator.cpp
+++ b/src/clicache/src/CqAttributesMutator.cpp
@@ -16,7 +16,7 @@
  */
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CqAttributesMutator.hpp"
 #include "impl/ManagedCqListener.hpp"
 #include "impl/ManagedCqStatusListener.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqAttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesMutator.hpp b/src/clicache/src/CqAttributesMutator.hpp
index b48fc52..2aafb5c 100644
--- a/src/clicache/src/CqAttributesMutator.hpp
+++ b/src/clicache/src/CqAttributesMutator.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CqAttributesMutator.hpp>
 #include "impl/NativeWrapper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqEvent.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqEvent.cpp b/src/clicache/src/CqEvent.cpp
index 26fb19f..a8d4109 100644
--- a/src/clicache/src/CqEvent.cpp
+++ b/src/clicache/src/CqEvent.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CqEvent.hpp"
 #include "Log.hpp"
 #include "impl/SafeConvert.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqEvent.hpp b/src/clicache/src/CqEvent.hpp
index 003c4ee..5e12595 100644
--- a/src/clicache/src/CqEvent.hpp
+++ b/src/clicache/src/CqEvent.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CqEvent.hpp>
 #include "CqQuery.hpp"
 #include "CqOperation.hpp"
@@ -35,7 +35,7 @@ namespace Apache
     namespace Client
     {
 
-			interface class IGFSerializable;
+			interface class IGeodeSerializable;
       //interface class ICqEvent;
       //interface class ICacheableKey;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqListener.hpp b/src/clicache/src/CqListener.hpp
index ddeda40..977447f 100644
--- a/src/clicache/src/CqListener.hpp
+++ b/src/clicache/src/CqListener.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "ICqListener.hpp"
 //#include "impl/NativeWrapper.hpp"
 
@@ -38,7 +38,7 @@ namespace Apache
 
       /// <summary>
       /// This class wraps the native C++ <c>apache::geode::client::Serializable</c> objects
-      /// as managed <see cref="../../IGFSerializable" /> objects.
+      /// as managed <see cref="../../IGeodeSerializable" /> objects.
       /// </summary>
       generic<class TKey, class TResult>    
       public ref class CqListener

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqOperation.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqOperation.hpp b/src/clicache/src/CqOperation.hpp
index 47447ca..c092008 100644
--- a/src/clicache/src/CqOperation.hpp
+++ b/src/clicache/src/CqOperation.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CqOperation.hpp>
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqQuery.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.cpp b/src/clicache/src/CqQuery.cpp
index 48d7016..21358bb 100644
--- a/src/clicache/src/CqQuery.cpp
+++ b/src/clicache/src/CqQuery.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CqQuery.hpp"
 #include "Query.hpp"
 #include "CqAttributes.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqQuery.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.hpp b/src/clicache/src/CqQuery.hpp
index 9a1c66b..3abbe2f 100644
--- a/src/clicache/src/CqQuery.hpp
+++ b/src/clicache/src/CqQuery.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "CqState.hpp"
 #include <geode/CqQuery.hpp>
 //#include "impl/NativeWrapper.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqServiceStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqServiceStatistics.cpp b/src/clicache/src/CqServiceStatistics.cpp
index 4f7d130..6cfbaaa 100644
--- a/src/clicache/src/CqServiceStatistics.cpp
+++ b/src/clicache/src/CqServiceStatistics.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CqServiceStatistics.hpp"
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqServiceStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqServiceStatistics.hpp b/src/clicache/src/CqServiceStatistics.hpp
index 2d6be14..424cdb1 100644
--- a/src/clicache/src/CqServiceStatistics.hpp
+++ b/src/clicache/src/CqServiceStatistics.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CqServiceStatistics.hpp>
 #include "impl/NativeWrapper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqState.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqState.cpp b/src/clicache/src/CqState.cpp
index d6af0c1..5f99fed 100644
--- a/src/clicache/src/CqState.cpp
+++ b/src/clicache/src/CqState.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CqState.hpp"
 #include <vcclr.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqState.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqState.hpp b/src/clicache/src/CqState.hpp
index ed17263..52ab2bb 100644
--- a/src/clicache/src/CqState.hpp
+++ b/src/clicache/src/CqState.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CqState.hpp>
 #include "impl/NativeWrapper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqStatistics.cpp b/src/clicache/src/CqStatistics.cpp
index b3e0aad..82adb9d 100644
--- a/src/clicache/src/CqStatistics.cpp
+++ b/src/clicache/src/CqStatistics.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "CqStatistics.hpp"
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CqStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqStatistics.hpp b/src/clicache/src/CqStatistics.hpp
index 7fa6713..311d69b 100644
--- a/src/clicache/src/CqStatistics.hpp
+++ b/src/clicache/src/CqStatistics.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CqStatistics.hpp>
 #include "impl/NativeWrapper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/DataInput.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataInput.cpp b/src/clicache/src/DataInput.cpp
index 5ffc2d6..b07b23b 100644
--- a/src/clicache/src/DataInput.cpp
+++ b/src/clicache/src/DataInput.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "DataInput.hpp"
 #include <geode/Cache.hpp>
 //#include "CacheFactory.hpp"
@@ -731,7 +731,7 @@ namespace Apache
 
         bool isPdxDeserialization = m_ispdxDesrialization;
         m_ispdxDesrialization = false;//for nested objects
-        IGFSerializable^ newObj = createType();
+        IGeodeSerializable^ newObj = createType();
         newObj->FromData(this);
         m_ispdxDesrialization = isPdxDeserialization;
         return newObj;
@@ -837,7 +837,7 @@ namespace Apache
 
         if (createType != nullptr)
         {
-          IGFSerializable^ newObj = createType();
+          IGeodeSerializable^ newObj = createType();
           newObj->FromData(this);
           return newObj;
         }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/DataInput.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataInput.hpp b/src/clicache/src/DataInput.hpp
index 899120b..1ea78f2 100644
--- a/src/clicache/src/DataInput.hpp
+++ b/src/clicache/src/DataInput.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/DataInput.hpp>
 #include "impl/NativeWrapper.hpp"
 #include "Log.hpp"
@@ -35,11 +35,11 @@ namespace Apache
     namespace Client
     {
 
-      interface class IGFSerializable;
+      interface class IGeodeSerializable;
 
       /// <summary>
       /// Provides operations for reading primitive data values, byte arrays,
-      /// strings, <c>IGFSerializable</c> objects from a byte stream.
+      /// strings, <c>IGeodeSerializable</c> objects from a byte stream.
       /// </summary>
       public ref class DataInput sealed
 				: public Client::Internal::UMWrap<apache::geode::client::DataInput>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/DataOutput.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataOutput.cpp b/src/clicache/src/DataOutput.cpp
index b74449f..35a0d06 100644
--- a/src/clicache/src/DataOutput.cpp
+++ b/src/clicache/src/DataOutput.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "DataOutput.hpp"
 #include <GeodeTypeIdsImpl.hpp>
 #include <vcclr.h>
 
-#include "IGFSerializable.hpp"
+#include "IGeodeSerializable.hpp"
 #include "CacheableObjectArray.hpp"
 #include "impl/PdxHelper.hpp"
 #include "impl/PdxWrapper.hpp"
@@ -401,12 +401,12 @@ namespace Apache
 
       /*void DataOutput::WriteObject( Object^ obj )
       {
-      WriteObjectInternal((IGFSerializable^)obj);
+      WriteObjectInternal((IGeodeSerializable^)obj);
       }*/
 
       /*void DataOutput::WriteObject( Object^ obj )
       {
-      WriteObject( (IGFSerializable^)obj );
+      WriteObject( (IGeodeSerializable^)obj );
       }*/
 
       int8_t DataOutput::GetTypeId(uint32_t classId)
@@ -647,7 +647,7 @@ namespace Apache
               return;
             }
 
-            IGFSerializable^ ct = dynamic_cast<IGFSerializable^>(obj);
+            IGeodeSerializable^ ct = dynamic_cast<IGeodeSerializable^>(obj);
             if (ct != nullptr) {
               WriteObjectInternal(ct);
               return;
@@ -682,7 +682,7 @@ namespace Apache
           WriteByte(-1);
       }
 
-      void DataOutput::WriteObjectInternal(IGFSerializable^ obj)
+      void DataOutput::WriteObjectInternal(IGeodeSerializable^ obj)
       {
         //CacheableKey^ key = gcnew CacheableKey();
         if (obj == nullptr) {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/DataOutput.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataOutput.hpp b/src/clicache/src/DataOutput.hpp
index ed88f4e..c98ec39 100644
--- a/src/clicache/src/DataOutput.hpp
+++ b/src/clicache/src/DataOutput.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/DataOutput.hpp>
 //#include "impl/NativeWrapper.hpp"
 #include "Log.hpp"
@@ -40,11 +40,11 @@ namespace Apache
     namespace Client
     {
 
-      interface class IGFSerializable;
+      interface class IGeodeSerializable;
 
       /// <summary>
       /// Provides operations for writing primitive data values, and
-      /// user-defined objects implementing IGFSerializable, to a byte stream.
+      /// user-defined objects implementing IGeodeSerializable, to a byte stream.
       /// This class is intentionally not thread safe.
       /// </summary>
       public ref class DataOutput sealed
@@ -231,16 +231,16 @@ namespace Apache
         void WriteASCIIHuge( String^ value );
 
         /// <summary>
-        /// Write an <c>IGFSerializable</c> object to the <c>DataOutput</c>.
+        /// Write an <c>IGeodeSerializable</c> object to the <c>DataOutput</c>.
         /// </summary>
         /// <param name="obj">The object to write.</param>
-       // void WriteObject( IGFSerializable^ obj );
+       // void WriteObject( IGeodeSerializable^ obj );
 
         /// <summary>
         /// Write a <c>Serializable</c> object to the <c>DataOutput</c>.
         /// This is provided to conveniently pass primitive types (like string)
         /// that shall be implicitly converted to corresponding
-        /// <c>IGFSerializable</c> wrapper types.
+        /// <c>IGeodeSerializable</c> wrapper types.
         /// </summary>
         /// <param name="obj">The object to write.</param>
         void WriteObject( Object^ obj );
@@ -485,7 +485,7 @@ namespace Apache
         
         static int8_t DSFID(uint32_t classId);        
   
-        void WriteObjectInternal( IGFSerializable^ obj );     
+        void WriteObjectInternal( IGeodeSerializable^ obj );     
 
         void WriteBytesToUMDataOutput();
         

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/DiskPolicyType.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DiskPolicyType.hpp b/src/clicache/src/DiskPolicyType.hpp
index 96b4ca9..03d66d8 100644
--- a/src/clicache/src/DiskPolicyType.hpp
+++ b/src/clicache/src/DiskPolicyType.hpp
@@ -19,7 +19,7 @@
 
 
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/DiskPolicyType.hpp>
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.cpp b/src/clicache/src/DistributedSystem.cpp
index 2403efc..cdc8bf2 100644
--- a/src/clicache/src/DistributedSystem.cpp
+++ b/src/clicache/src/DistributedSystem.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "version.h"
 #include "Serializable.hpp"
 #include "DistributedSystem.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/DistributedSystem.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.hpp b/src/clicache/src/DistributedSystem.hpp
index 09e534c..af95be1 100644
--- a/src/clicache/src/DistributedSystem.hpp
+++ b/src/clicache/src/DistributedSystem.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/DistributedSystem.hpp>
 //#include "impl/NativeWrapper.hpp"
 #include "SystemProperties.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/EntryEvent.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/EntryEvent.cpp b/src/clicache/src/EntryEvent.cpp
index bbe3191..49869f5 100644
--- a/src/clicache/src/EntryEvent.cpp
+++ b/src/clicache/src/EntryEvent.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "EntryEvent.hpp"
 #include "Region.hpp"
 #include "impl/SafeConvert.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/EntryEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/EntryEvent.hpp b/src/clicache/src/EntryEvent.hpp
index 2593d41..644fbbb 100644
--- a/src/clicache/src/EntryEvent.hpp
+++ b/src/clicache/src/EntryEvent.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/EntryEvent.hpp>
 #include "impl/NativeWrapper.hpp"
 #include "IRegion.hpp"
@@ -32,7 +32,7 @@ namespace Apache
     namespace Client
     {
 
-        interface class IGFSerializable;
+        interface class IGeodeSerializable;
 
      // ref class Region;
       //interface class ICacheableKey;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ExceptionTypes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.cpp b/src/clicache/src/ExceptionTypes.cpp
index 0d96457..ebe7ad9 100644
--- a/src/clicache/src/ExceptionTypes.cpp
+++ b/src/clicache/src/ExceptionTypes.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "ExceptionTypes.hpp"
 #include <stdlib.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ExceptionTypes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.hpp b/src/clicache/src/ExceptionTypes.hpp
index b9a1c1c..03eb11e 100644
--- a/src/clicache/src/ExceptionTypes.hpp
+++ b/src/clicache/src/ExceptionTypes.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/ExceptionTypes.hpp>
 #include "impl/ManagedString.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/Execution.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Execution.cpp b/src/clicache/src/Execution.cpp
index 96ea6411..3034382 100644
--- a/src/clicache/src/Execution.cpp
+++ b/src/clicache/src/Execution.cpp
@@ -16,7 +16,7 @@
  */
 
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "Execution.hpp"
 #include <geode/Execution.hpp>
 #include "ResultCollector.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/Execution.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Execution.hpp b/src/clicache/src/Execution.hpp
index 7e6938e..f45a5db 100644
--- a/src/clicache/src/Execution.hpp
+++ b/src/clicache/src/Execution.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/Execution.hpp>
 #include "impl/NativeWrapper.hpp"
 //#include "impl/ResultCollectorProxy.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ExpirationAction.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExpirationAction.hpp b/src/clicache/src/ExpirationAction.hpp
index 510442f..25c0564 100644
--- a/src/clicache/src/ExpirationAction.hpp
+++ b/src/clicache/src/ExpirationAction.hpp
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/ExpirationAction.hpp>
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/FunctionService.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/FunctionService.cpp b/src/clicache/src/FunctionService.cpp
index 1d4a0e5..4f3a3ed 100644
--- a/src/clicache/src/FunctionService.cpp
+++ b/src/clicache/src/FunctionService.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "FunctionService.hpp"
 #include "Pool.hpp"
 #include "Region.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/FunctionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/FunctionService.hpp b/src/clicache/src/FunctionService.hpp
index d8ff43c..923a625 100644
--- a/src/clicache/src/FunctionService.hpp
+++ b/src/clicache/src/FunctionService.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/FunctionService.hpp>
 #include "Cache.hpp"
 //#include "impl/NativeWrapper.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/GeodeClassIds.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/GeodeClassIds.hpp b/src/clicache/src/GeodeClassIds.hpp
index 8ab7459..1158afb 100644
--- a/src/clicache/src/GeodeClassIds.hpp
+++ b/src/clicache/src/GeodeClassIds.hpp
@@ -19,7 +19,7 @@
 
 
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/GeodeTypeIds.hpp>
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IAuthInitialize.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IAuthInitialize.hpp b/src/clicache/src/IAuthInitialize.hpp
index 17b92d4..c1e9c47 100644
--- a/src/clicache/src/IAuthInitialize.hpp
+++ b/src/clicache/src/IAuthInitialize.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 
 #include "Properties.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICacheListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheListener.hpp b/src/clicache/src/ICacheListener.hpp
index 693a292..a61632e 100644
--- a/src/clicache/src/ICacheListener.hpp
+++ b/src/clicache/src/ICacheListener.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "IRegion.hpp"
 //#include "Region.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheLoader.hpp b/src/clicache/src/ICacheLoader.hpp
index d72719f..76b2f19 100644
--- a/src/clicache/src/ICacheLoader.hpp
+++ b/src/clicache/src/ICacheLoader.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/CacheLoader.hpp>
 #include "IRegion.hpp"
 //#include "Region.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICacheWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheWriter.hpp b/src/clicache/src/ICacheWriter.hpp
index b8a4742..ea02933 100644
--- a/src/clicache/src/ICacheWriter.hpp
+++ b/src/clicache/src/ICacheWriter.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "IRegion.hpp"
 //#include "Region.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheableKey.hpp b/src/clicache/src/ICacheableKey.hpp
index 13f85b7..ce02104 100644
--- a/src/clicache/src/ICacheableKey.hpp
+++ b/src/clicache/src/ICacheableKey.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
-#include "IGFSerializable.hpp"
+#include "geode_defs.hpp"
+#include "IGeodeSerializable.hpp"
 
 
 using namespace System;
@@ -44,7 +44,7 @@ namespace Apache
       /// and will not work correctly.
       /// </remarks>
       public interface class ICacheableKey
-        : public IGFSerializable
+        : public IGeodeSerializable
       {
       public:
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqAttributes.hpp b/src/clicache/src/ICqAttributes.hpp
index 3a6c611..b401b56 100644
--- a/src/clicache/src/ICqAttributes.hpp
+++ b/src/clicache/src/ICqAttributes.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 
 
 namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqEvent.hpp b/src/clicache/src/ICqEvent.hpp
index b48e9eb..2f1bff0 100644
--- a/src/clicache/src/ICqEvent.hpp
+++ b/src/clicache/src/ICqEvent.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 
 #include "ICacheableKey.hpp"
 
@@ -28,7 +28,7 @@ namespace Apache
     namespace Client
     {
 
-      interface class IGFSerializable;
+      interface class IGeodeSerializable;
 
 
       generic<class TKey, class TResult>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICqListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqListener.hpp b/src/clicache/src/ICqListener.hpp
index 7415536..fbdaebc 100644
--- a/src/clicache/src/ICqListener.hpp
+++ b/src/clicache/src/ICqListener.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "CqEvent.hpp"
 using namespace System;
 namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICqResults.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqResults.hpp b/src/clicache/src/ICqResults.hpp
index 4adc95f..b0d5970 100644
--- a/src/clicache/src/ICqResults.hpp
+++ b/src/clicache/src/ICqResults.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/SelectResults.hpp>
 //#include "impl/NativeWrapper.hpp"
 #include "ISelectResults.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ICqStatusListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqStatusListener.hpp b/src/clicache/src/ICqStatusListener.hpp
index d572903..b623a68 100644
--- a/src/clicache/src/ICqStatusListener.hpp
+++ b/src/clicache/src/ICqStatusListener.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "ICqListener.hpp"
 
 using namespace System;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IFixedPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IFixedPartitionResolver.hpp b/src/clicache/src/IFixedPartitionResolver.hpp
index e516c0e..18962ee 100644
--- a/src/clicache/src/IFixedPartitionResolver.hpp
+++ b/src/clicache/src/IFixedPartitionResolver.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "IPartitionResolver.hpp"
 
 //using System::Collections::Generics;
@@ -29,7 +29,7 @@ namespace Apache
     namespace Client
     {
 
-      interface class IGFSerializable;
+      interface class IGeodeSerializable;
       /// <summary>
       /// Implementers of interface <code>FixedPartitionResolver</code> helps to
       /// achieve explicit mapping of a "user defined" partition to a data member node.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IGFDelta.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGFDelta.hpp b/src/clicache/src/IGFDelta.hpp
deleted file mode 100644
index 50ed638..0000000
--- a/src/clicache/src/IGFDelta.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma once
-
-#include "gf_defs.hpp"
-
-
-namespace Apache
-{
-  namespace Geode
-  {
-    namespace Client
-    {
-
-      ref class DataOutput;
-      ref class DataInput;
-      ref class Serializable;
-
-      /// <summary>
-      /// This interface is used for delta propagation.
-      /// To use delta propagation, an application class must implement interfaces <c>IGFDelta</c> as well as <c>IGFSerializable</c>.
-      /// The <c>IGFDelta</c> interface methods <c>HasDelta( ), ToDelta( )</c> and <c>FromDelta( )</c> must be implemented by the class, as these methods are used by Geode
-      /// to detect the presence of delta in an object, to serialize the delta, and to apply a serialized delta to an existing object
-      /// of the class.
-      /// If a customized cloning method is required, the class must also implement the interface <c>System.ICloneable</c>.
-      /// To use cloning in delta propagation for a region, the region attribute for cloning must be enabled.
-      /// </summary>
-      public interface class IGFDelta
-      {
-      public:
-
-        /// <summary>
-        /// Writes out delta information to out in a user-defined format. This is
-        /// invoked on an application object after Geode determines the presence
-        /// of delta in it by calling <c>HasDelta()</c> on the object.
-        /// </summary>
-        /// <exception cref="GeodeIOException">
-        /// </exception>
-        void ToDelta(DataOutput^ out);
-
-        /// <summary>
-        /// Reads in delta information to this object in a user-defined format. This is
-        /// invoked on an existing application object after Geode determines the
-        /// presence of delta in <c>DataInput</c> instance.
-        /// </summary>
-        /// <exception cref="InvalidDeltaException">
-        /// if the delta in the <c>DataInput</c> instance cannot be applied
-        /// to this instance (possible causes may include mismatch of Delta version or logic error).
-        /// </exception>
-        /// <exception cref="GeodeIOException">
-        /// </exception>
-        void FromDelta(DataInput^ in);
-
-        /// <summary>
-        /// <c>HasDelta( )</c> is invoked by Geode during <c>Region.Put( ICacheableKey, IGFSerializable )</c> to determine if the object contains a delta.
-        /// If <c>HasDelta( )</c> returns true, the delta in the object is serialized by invoking <c>ToDelta( DataOutput )</c>.
-        /// If <c>HasDelta( )</c> returns false, the object is serialized by invoking <c>IGFSerializable.ToData( DataOutput )</c>.
-        /// </summary>
-        bool HasDelta();
-      };
-    }  // namespace Client
-  }  // namespace Geode
-}  // namespace Apache
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IGFSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGFSerializable.hpp b/src/clicache/src/IGFSerializable.hpp
deleted file mode 100644
index 697181f..0000000
--- a/src/clicache/src/IGFSerializable.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include "gf_defs.hpp"
-#include "geode/gf_types.hpp"
-
-using namespace System;
-
-namespace Apache
-{
-  namespace Geode
-  {
-    namespace Client
-    {
-
-      ref class DataOutput;
-      ref class DataInput;
-      ref class Serializable;
-
-      /// <summary>
-      /// This interface class is the superclass of all user objects 
-      /// in the cache that can be serialized.
-      /// </summary>
-      public interface class IGFSerializable
-      {
-      public:
-
-        /// <summary>
-        /// Serializes this object.
-        /// </summary>
-        /// <param name="output">
-        /// the DataOutput object to use for serializing the object
-        /// </param>
-        void ToData( DataOutput^ output );
-
-        //bool HasDelta();
-
-        /// <summary>
-        /// Deserialize this object, typical implementation should return
-        /// the 'this' pointer.
-        /// </summary>
-        /// <param name="input">
-        /// the DataInput stream to use for reading the object data
-        /// </param>
-        /// <returns>the deserialized object</returns>
-        IGFSerializable^ FromData( DataInput^ input );
-
-        /// <summary>
-        /// Get the size of this object in bytes.
-        /// This is only needed if you use the HeapLRU feature.
-        /// </summary>
-        /// <remarks>
-        /// Note that you can simply return zero if you are not using the HeapLRU feature.
-        /// </remarks>
-        /// <returns>the size of this object in bytes.</returns>
-        property uint32_t ObjectSize
-        {
-          uint32_t get( );
-        }
-
-        /// <summary>
-        /// Returns the classId of the instance being serialized.
-        /// This is used by deserialization to determine what instance
-        /// type to create and deserialize into.
-        /// </summary>
-        /// <remarks>
-        /// The classId must be unique within an application suite
-        /// and in the range 0 to ((2^31)-1) both inclusive. An application can
-        /// thus define upto 2^31 custom <c>IGFSerializable</c> classes.
-        /// Returning a value greater than ((2^31)-1) may result in undefined
-        /// behaviour.
-        /// </remarks>
-        /// <returns>the classId</returns>
-        property uint32_t ClassId
-        {
-          uint32_t get( );
-        }
-
-        /// <summary>
-        /// Return a string representation of the object.
-        /// </summary>
-        String^ ToString( );
-      };
-    }  // namespace Client
-  }  // namespace Geode
-}  // namespace Apache
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IGeodeCache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGeodeCache.hpp b/src/clicache/src/IGeodeCache.hpp
index 69bb170..69bf539 100644
--- a/src/clicache/src/IGeodeCache.hpp
+++ b/src/clicache/src/IGeodeCache.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "IRegionService.hpp"
 #include "DistributedSystem.hpp"
 #include "CacheTransactionManager.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IGeodeDelta.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGeodeDelta.hpp b/src/clicache/src/IGeodeDelta.hpp
new file mode 100644
index 0000000..25832a3
--- /dev/null
+++ b/src/clicache/src/IGeodeDelta.hpp
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#pragma once
+
+#include "geode_defs.hpp"
+
+
+namespace Apache
+{
+  namespace Geode
+  {
+    namespace Client
+    {
+
+      ref class DataOutput;
+      ref class DataInput;
+      ref class Serializable;
+
+      /// <summary>
+      /// This interface is used for delta propagation.
+      /// To use delta propagation, an application class must implement interfaces <c>IGeodeDelta</c> as well as <c>IGeodeSerializable</c>.
+      /// The <c>IGeodeDelta</c> interface methods <c>HasDelta( ), ToDelta( )</c> and <c>FromDelta( )</c> must be implemented by the class, as these methods are used by Geode
+      /// to detect the presence of delta in an object, to serialize the delta, and to apply a serialized delta to an existing object
+      /// of the class.
+      /// If a customized cloning method is required, the class must also implement the interface <c>System.ICloneable</c>.
+      /// To use cloning in delta propagation for a region, the region attribute for cloning must be enabled.
+      /// </summary>
+      public interface class IGeodeDelta
+      {
+      public:
+
+        /// <summary>
+        /// Writes out delta information to out in a user-defined format. This is
+        /// invoked on an application object after Geode determines the presence
+        /// of delta in it by calling <c>HasDelta()</c> on the object.
+        /// </summary>
+        /// <exception cref="GeodeIOException">
+        /// </exception>
+        void ToDelta(DataOutput^ out);
+
+        /// <summary>
+        /// Reads in delta information to this object in a user-defined format. This is
+        /// invoked on an existing application object after Geode determines the
+        /// presence of delta in <c>DataInput</c> instance.
+        /// </summary>
+        /// <exception cref="InvalidDeltaException">
+        /// if the delta in the <c>DataInput</c> instance cannot be applied
+        /// to this instance (possible causes may include mismatch of Delta version or logic error).
+        /// </exception>
+        /// <exception cref="GeodeIOException">
+        /// </exception>
+        void FromDelta(DataInput^ in);
+
+        /// <summary>
+        /// <c>HasDelta( )</c> is invoked by Geode during <c>Region.Put( ICacheableKey, IGeodeSerializable )</c> to determine if the object contains a delta.
+        /// If <c>HasDelta( )</c> returns true, the delta in the object is serialized by invoking <c>ToDelta( DataOutput )</c>.
+        /// If <c>HasDelta( )</c> returns false, the object is serialized by invoking <c>IGeodeSerializable.ToData( DataOutput )</c>.
+        /// </summary>
+        bool HasDelta();
+      };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IGeodeSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGeodeSerializable.hpp b/src/clicache/src/IGeodeSerializable.hpp
new file mode 100644
index 0000000..b94c55d
--- /dev/null
+++ b/src/clicache/src/IGeodeSerializable.hpp
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "geode_defs.hpp"
+#include "geode/geode_types.hpp"
+
+using namespace System;
+
+namespace Apache
+{
+  namespace Geode
+  {
+    namespace Client
+    {
+
+      ref class DataOutput;
+      ref class DataInput;
+      ref class Serializable;
+
+      /// <summary>
+      /// This interface class is the superclass of all user objects 
+      /// in the cache that can be serialized.
+      /// </summary>
+      public interface class IGeodeSerializable
+      {
+      public:
+
+        /// <summary>
+        /// Serializes this object.
+        /// </summary>
+        /// <param name="output">
+        /// the DataOutput object to use for serializing the object
+        /// </param>
+        void ToData( DataOutput^ output );
+
+        //bool HasDelta();
+
+        /// <summary>
+        /// Deserialize this object, typical implementation should return
+        /// the 'this' pointer.
+        /// </summary>
+        /// <param name="input">
+        /// the DataInput stream to use for reading the object data
+        /// </param>
+        /// <returns>the deserialized object</returns>
+        IGeodeSerializable^ FromData( DataInput^ input );
+
+        /// <summary>
+        /// Get the size of this object in bytes.
+        /// This is only needed if you use the HeapLRU feature.
+        /// </summary>
+        /// <remarks>
+        /// Note that you can simply return zero if you are not using the HeapLRU feature.
+        /// </remarks>
+        /// <returns>the size of this object in bytes.</returns>
+        property uint32_t ObjectSize
+        {
+          uint32_t get( );
+        }
+
+        /// <summary>
+        /// Returns the classId of the instance being serialized.
+        /// This is used by deserialization to determine what instance
+        /// type to create and deserialize into.
+        /// </summary>
+        /// <remarks>
+        /// The classId must be unique within an application suite
+        /// and in the range 0 to ((2^31)-1) both inclusive. An application can
+        /// thus define upto 2^31 custom <c>IGeodeSerializable</c> classes.
+        /// Returning a value greater than ((2^31)-1) may result in undefined
+        /// behaviour.
+        /// </remarks>
+        /// <returns>the classId</returns>
+        property uint32_t ClassId
+        {
+          uint32_t get( );
+        }
+
+        /// <summary>
+        /// Return a string representation of the object.
+        /// </summary>
+        String^ ToString( );
+      };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPartitionResolver.hpp b/src/clicache/src/IPartitionResolver.hpp
index 8020132..ae3127f 100644
--- a/src/clicache/src/IPartitionResolver.hpp
+++ b/src/clicache/src/IPartitionResolver.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 //#include "ICacheableKey.hpp"
 
 #include "EntryEvent.hpp"
@@ -29,7 +29,7 @@ namespace Apache
     namespace Client
     {
 
-      interface class IGFSerializable;
+      interface class IGeodeSerializable;
 
 
       /// <summary>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IPdxReader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxReader.hpp b/src/clicache/src/IPdxReader.hpp
index e5a36ec..cccb840 100644
--- a/src/clicache/src/IPdxReader.hpp
+++ b/src/clicache/src/IPdxReader.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "IRegion.hpp"
 #include "IPdxUnreadFields.hpp"
 namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IPdxSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxSerializable.hpp b/src/clicache/src/IPdxSerializable.hpp
index 677fb6a..9c8865a 100644
--- a/src/clicache/src/IPdxSerializable.hpp
+++ b/src/clicache/src/IPdxSerializable.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "IPdxWriter.hpp"
 #include "IPdxReader.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IPdxSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxSerializer.hpp b/src/clicache/src/IPdxSerializer.hpp
index 52d52da..672c176 100755
--- a/src/clicache/src/IPdxSerializer.hpp
+++ b/src/clicache/src/IPdxSerializer.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "IPdxWriter.hpp"
 #include "IPdxReader.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IPdxWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxWriter.hpp b/src/clicache/src/IPdxWriter.hpp
index af854d2..3196efe 100644
--- a/src/clicache/src/IPdxWriter.hpp
+++ b/src/clicache/src/IPdxWriter.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 //#include "IRegion.hpp"
 #include "IPdxUnreadFields.hpp"
 using namespace System;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IPersistenceManager.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPersistenceManager.hpp b/src/clicache/src/IPersistenceManager.hpp
index 36b3f1f..b901114 100644
--- a/src/clicache/src/IPersistenceManager.hpp
+++ b/src/clicache/src/IPersistenceManager.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "IRegion.hpp"
 #include "Properties.hpp"
 using namespace System;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IRegion.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IRegion.hpp b/src/clicache/src/IRegion.hpp
index 3dcf9c5..3d40eb6 100644
--- a/src/clicache/src/IRegion.hpp
+++ b/src/clicache/src/IRegion.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "ISubscriptionService.hpp"
 #include <geode/DataOutput.hpp>
 //#include "ExceptionTypes.hpp"
@@ -39,7 +39,7 @@ namespace Apache
 
       ref class Cache;
       ref class CacheStatistics;
-      //interface class IGFSerializable;
+      //interface class IGeodeSerializable;
       interface class IRegionService;
 
       generic<class TResult>
@@ -920,7 +920,7 @@ namespace Apache
           /// </param>
           /// <param name="callbackArg">
           /// An argument passed into the CacheLoader if loader is used.
-          /// Has to be Serializable (i.e. implement <c>IGFSerializable</c>);
+          /// Has to be Serializable (i.e. implement <c>IGeodeSerializable</c>);
           /// can be null.
           /// </param>
           /// <returns>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IRegionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IRegionService.hpp b/src/clicache/src/IRegionService.hpp
index d09685d..51f4049 100644
--- a/src/clicache/src/IRegionService.hpp
+++ b/src/clicache/src/IRegionService.hpp
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
-//#include "gf_includes.hpp"
+#include "geode_defs.hpp"
+//#include "geode_includes.hpp"
 #include "QueryService.hpp"
 #include "Region.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/IResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IResultCollector.hpp b/src/clicache/src/IResultCollector.hpp
index 28ff8b0..3d97f27 100644
--- a/src/clicache/src/IResultCollector.hpp
+++ b/src/clicache/src/IResultCollector.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 
 using namespace System;
 namespace Apache
@@ -28,7 +28,7 @@ namespace Apache
     namespace Client
     {
 
-      interface class IGFSerializable;
+      interface class IGeodeSerializable;
       /*
       generic<class TKey>
       ref class ResultCollector;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ISelectResults.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ISelectResults.hpp b/src/clicache/src/ISelectResults.hpp
index f879119..026e660 100644
--- a/src/clicache/src/ISelectResults.hpp
+++ b/src/clicache/src/ISelectResults.hpp
@@ -17,10 +17,10 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/SelectResults.hpp>
 //#include "impl/NativeWrapper.hpp"
-#include "IGFSerializable.hpp"
+#include "IGeodeSerializable.hpp"
 
 using namespace System;
 
@@ -39,7 +39,7 @@ namespace Apache
       /// </summary>
       generic<class TResult>
       public interface class ISelectResults
-        : public System::Collections::Generic::IEnumerable</*IGFSerializable^*/TResult>
+        : public System::Collections::Generic::IEnumerable</*IGeodeSerializable^*/TResult>
       {
       public:
 
@@ -62,9 +62,9 @@ namespace Apache
         /// <summary>
         /// Get an object at the given index.
         /// </summary>
-        property /*Apache::Geode::Client::IGFSerializable^*/TResult GFINDEXER( size_t )
+        property /*Apache::Geode::Client::IGeodeSerializable^*/TResult GFINDEXER( size_t )
         {
-          /*Apache::Geode::Client::IGFSerializable^*/TResult get( size_t index );
+          /*Apache::Geode::Client::IGeodeSerializable^*/TResult get( size_t index );
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ISubscriptionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ISubscriptionService.hpp b/src/clicache/src/ISubscriptionService.hpp
index 36e7ad7..ec1d041 100644
--- a/src/clicache/src/ISubscriptionService.hpp
+++ b/src/clicache/src/ISubscriptionService.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 //#include "ExceptionTypes.hpp"
 using namespace System;
 namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ITransactionListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ITransactionListener.hpp b/src/clicache/src/ITransactionListener.hpp
index dfa3ee9..a4db8cf 100644
--- a/src/clicache/src/ITransactionListener.hpp
+++ b/src/clicache/src/ITransactionListener.hpp
@@ -17,7 +17,7 @@
 #ifdef CSTX_COMMENTED
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "TransactionEvent.hpp"
 
 
@@ -80,4 +80,4 @@ namespace Apache
   }  // namespace Geode
 }  // namespace Apache
 
-#endif
\ No newline at end of file
+#endif

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/ITransactionWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ITransactionWriter.hpp b/src/clicache/src/ITransactionWriter.hpp
index e51d7ef..3874d0d 100644
--- a/src/clicache/src/ITransactionWriter.hpp
+++ b/src/clicache/src/ITransactionWriter.hpp
@@ -17,7 +17,7 @@
 #ifdef CSTX_COMMENTED
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include "TransactionEvent.hpp"
 
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/LocalRegion.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/LocalRegion.cpp b/src/clicache/src/LocalRegion.cpp
index 136a8b4..7005c45 100644
--- a/src/clicache/src/LocalRegion.cpp
+++ b/src/clicache/src/LocalRegion.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
 #include "LocalRegion.hpp"
 #include "Cache.hpp"
 #include "CacheStatistics.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/LocalRegion.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/LocalRegion.hpp b/src/clicache/src/LocalRegion.hpp
index 3f66583..b10a859 100644
--- a/src/clicache/src/LocalRegion.hpp
+++ b/src/clicache/src/LocalRegion.hpp
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
 #include <geode/Cache.hpp>
 //#include "impl/NativeWrapper.hpp"
 #include "IRegion.hpp"


Mime
View raw message