geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [15/50] [abbrv] geode-native git commit: GEODE-2365: Replace gemfire with geode in clicache.
Date Thu, 09 Feb 2017 18:09:12 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/ICacheListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheListener.hpp b/src/clicache/src/ICacheListener.hpp
index f87cf38..693a292 100644
--- a/src/clicache/src/ICacheListener.hpp
+++ b/src/clicache/src/ICacheListener.hpp
@@ -42,7 +42,7 @@ namespace Apache
       /// of <c>ICacheListener</c> methods.  If event A occurs before event B,
       /// there is no guarantee that their corresponding <c>ICacheListener</c>
       /// method invocations will occur in the same order. Any exceptions thrown by
-      /// the listener are caught by GemFire and logged. If the exception is due to
+      /// the listener are caught by Geode and logged. If the exception is due to
       /// listener invocation on the same thread where a region operation has been
       /// performed, then a <c>CacheListenerException</c> is thrown back to
       /// the application. If the exception is for a notification received from
@@ -55,7 +55,7 @@ namespace Apache
       /// There are two cases in which listeners are invoked. The first is when a
       /// region modification operation (e.g. put, create, destroy, invalidate)
       /// is performed. For this case it is important to ensure that minimal work is
-      /// done in the listener before returning control back to Gemfire since the
+      /// done in the listener before returning control back to Geode since the
       /// operation will block till the listener has not completed. For example,
       /// a listener implementation may choose to hand off the event to a thread pool
       /// that then processes the event on its thread rather than the listener thread.
@@ -79,7 +79,7 @@ namespace Apache
       generic<class TKey, class TValue>
       public interface class ICacheListener
       {
-      public:
+        public:
 
         /// <summary>
         /// Handles the event of a new key being added to a region.
@@ -97,7 +97,7 @@ namespace Apache
         /// <seealso cref="Region.Create" />
         /// <seealso cref="Region.Put" />
         /// <seealso cref="Region.Get" />
-        void AfterCreate( EntryEvent<TKey, TValue>^ ev );
+        void AfterCreate(EntryEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Handles the event of an entry's value being modified in a region.
@@ -110,7 +110,7 @@ namespace Apache
         /// EntryEvent denotes the event object associated with updating the entry.
         /// </param>
         /// <seealso cref="Region.Put" />
-        void AfterUpdate( EntryEvent<TKey, TValue>^ ev );
+        void AfterUpdate(EntryEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Handles the event of an entry's value being invalidated.
@@ -118,7 +118,7 @@ namespace Apache
         /// <param name="ev">
         /// EntryEvent denotes the event object associated with the entry invalidation.
         /// </param>
-        void AfterInvalidate( EntryEvent<TKey, TValue>^ ev );
+        void AfterInvalidate(EntryEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Handles the event of an entry being destroyed.
@@ -127,12 +127,12 @@ namespace Apache
         /// EntryEvent denotes the event object associated with the entry destruction.
         /// </param>
         /// <seealso cref="Region.Destroy" />
-        void AfterDestroy( EntryEvent<TKey, TValue>^ ev );
+        void AfterDestroy(EntryEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Handles the event of a region being cleared.
         /// </summary>
-        void AfterRegionClear( RegionEvent<TKey, TValue>^ ev );
+        void AfterRegionClear(RegionEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Handles the event of a region being invalidated.
@@ -146,7 +146,7 @@ namespace Apache
         /// RegionEvent denotes the event object associated with the region invalidation.
         /// </param>
         /// <seealso cref="Region.InvalidateRegion" />
-        void AfterRegionInvalidate( RegionEvent<TKey, TValue>^ ev );
+        void AfterRegionInvalidate(RegionEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Handles the event of a region being destroyed.
@@ -160,7 +160,7 @@ namespace Apache
         /// RegionEvent denotes the event object associated with the region destruction.
         /// </param>
         /// <seealso cref="Region.DestroyRegion" />
-        void AfterRegionDestroy( RegionEvent<TKey, TValue>^ ev );
+        void AfterRegionDestroy(RegionEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Handles the event of a region going live.
@@ -172,7 +172,7 @@ namespace Apache
         /// RegionEvent denotes the event object associated with the region going live.
         /// </param>
         /// <seealso cref="Cache.ReadyForEvents" />
-        void AfterRegionLive( RegionEvent<TKey, TValue>^ ev );
+        void AfterRegionLive(RegionEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Called when the region containing this callback is destroyed, when
@@ -189,7 +189,7 @@ namespace Apache
         /// </param>
         /// <seealso cref="Cache.Close" />
         /// <seealso cref="Region.DestroyRegion" />
-        void Close( IRegion<TKey, TValue>^ region );
+        void Close(IRegion<TKey, TValue>^ region);
 
         ///<summary>
         ///Called when all the endpoints associated with region are down.
@@ -202,7 +202,7 @@ namespace Apache
         ///<param>
         ///region Region^ denotes the assosiated region.
         ///</param>
-        void AfterRegionDisconnected( IRegion<TKey, TValue>^ region );
+        void AfterRegionDisconnected(IRegion<TKey, TValue>^ region);
       };
     }  // namespace Client
   }  // namespace Geode

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/ICacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheLoader.hpp b/src/clicache/src/ICacheLoader.hpp
index aabd64f..5c900b7 100644
--- a/src/clicache/src/ICacheLoader.hpp
+++ b/src/clicache/src/ICacheLoader.hpp
@@ -48,7 +48,7 @@ namespace Apache
       /// <remarks>
       /// Loaders facilitate loading of data into the cache from a third-party data source. 
       /// When an application does a
-      /// lookup for a key in a region and it does not exist, GemFire checks to
+      /// lookup for a key in a region and it does not exist, Geode checks to
       /// see if any loaders are available for the region in the system and
       /// invokes them to get the value for the key into the cache.
       /// <para>
@@ -91,7 +91,7 @@ namespace Apache
         /// </returns>
         /// <seealso cref="Region.Get" />
         TValue Load(IRegion<TKey, TValue>^ region, TKey key,
-          Object^ callbackArgument);
+                    Object^ callbackArgument);
 
         /// <summary>
         /// Called when the region containing this callback is destroyed, when
@@ -107,7 +107,7 @@ namespace Apache
         /// </remarks>
         /// <seealso cref="Cache.Close" />
         /// <seealso cref="Region.DestroyRegion" />
-        void Close( IRegion<TKey, TValue>^ region );
+        void Close(IRegion<TKey, TValue>^ region);
       };
     }  // namespace Client
   }  // namespace Geode

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/ICacheWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheWriter.hpp b/src/clicache/src/ICacheWriter.hpp
index 0ff6be5..b8a4742 100644
--- a/src/clicache/src/ICacheWriter.hpp
+++ b/src/clicache/src/ICacheWriter.hpp
@@ -49,11 +49,11 @@ namespace Apache
       /// region modification occurs. 
       /// </para><para>
       /// Before a region is updated via a put, create, or destroy operation,
-      /// GemFire will call an <c>ICacheWriter</c> that is installed anywhere in any
+      /// Geode will call an <c>ICacheWriter</c> that is installed anywhere in any
       /// participating cache for that region, preferring a local <c>ICacheWriter</c>
       /// if there is one. Usually there will be only one <c>ICacheWriter</c> in
       /// the distributed system. If there are multiple <c>ICacheWriter</c>s
-      /// available in the distributed system, the GemFire
+      /// available in the distributed system, the Geode
       /// implementation always prefers one that is stored locally, or else picks one
       /// arbitrarily. In any case, only one <c>ICacheWriter</c> will be invoked.
       /// </para><para>
@@ -98,7 +98,7 @@ namespace Apache
         /// </param>
         /// <seealso cref="Region.Put" />
         /// <seealso cref="Region.Get" />
-        bool BeforeUpdate( EntryEvent<TKey, TValue>^ ev );
+        bool BeforeUpdate(EntryEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Called before an entry is created. Entry creation is initiated by a
@@ -116,7 +116,7 @@ namespace Apache
         /// <seealso cref="Region.Create" />
         /// <seealso cref="Region.Put" />
         /// <seealso cref="Region.Get" />
-        bool BeforeCreate( EntryEvent<TKey, TValue>^ ev );
+        bool BeforeCreate(EntryEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Called before an entry is destroyed.
@@ -131,12 +131,12 @@ namespace Apache
         /// event object associated with destroying the entry
         /// </param>
         /// <seealso cref="Region.Destroy" />
-        bool BeforeDestroy( EntryEvent<TKey, TValue>^ ev );
+        bool BeforeDestroy(EntryEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Called before this region is cleared.
         /// </summary>
-        bool BeforeRegionClear( RegionEvent<TKey, TValue>^ ev );
+        bool BeforeRegionClear(RegionEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Called before this region is destroyed.
@@ -145,7 +145,7 @@ namespace Apache
         /// event object associated with destroying the region
         /// </param>
         /// <seealso cref="Region.DestroyRegion" />
-        bool BeforeRegionDestroy( RegionEvent<TKey, TValue>^ ev );
+        bool BeforeRegionDestroy(RegionEvent<TKey, TValue>^ ev);
 
         /// <summary>
         /// Called when the region containing this callback is destroyed, when
@@ -164,7 +164,7 @@ namespace Apache
         /// <param name="region">region to close</param>
         /// <seealso cref="Cache.Close" />
         /// <seealso cref="Region.DestroyRegion" />
-        void Close( IRegion<TKey, TValue>^ region );
+        void Close(IRegion<TKey, TValue>^ region);
       };
     }  // namespace Client
   }  // namespace Geode

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/ICqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqAttributes.hpp b/src/clicache/src/ICqAttributes.hpp
index b2ba5a9..3a6c611 100644
--- a/src/clicache/src/ICqAttributes.hpp
+++ b/src/clicache/src/ICqAttributes.hpp
@@ -45,11 +45,11 @@ namespace Apache
       /// of <c>ICacheListener</c> methods.  If event A occurs before event B,
       /// there is no guarantee that their corresponding <c>ICacheListener</c>
       /// method invocations will occur in the same order.  Any exceptions thrown by
-      /// the listener are caught by GemFire and logged. 
+      /// the listener are caught by Geode and logged. 
       ///
       /// Listeners are user callbacks that
-      /// are invoked by GemFire. It is important to ensure that minimal work is done in the
-      /// listener before returning control back to GemFire. For example, a listener
+      /// are invoked by Geode. It is important to ensure that minimal work is done in the
+      /// listener before returning control back to Geode. For example, a listener
       /// implementation may choose to hand off the event to a thread pool that then processes
       /// the event on its thread rather than the listener thread
       /// </remarks>
@@ -77,7 +77,7 @@ namespace Apache
         /// <seealso cref="Region.Create" />
         /// <seealso cref="Region.Put" />
         /// <seealso cref="Region.Get" />
-        void OnEvent( CqEvent^ ev );
+        void OnEvent(CqEvent^ ev);
 
         /// <summary>
         /// Handles the event of an entry's value being modified in a region.
@@ -90,7 +90,7 @@ namespace Apache
         /// EntryEvent denotes the event object associated with updating the entry.
         /// </param>
         /// <seealso cref="Region.Put" />
-        void OnError( CqEvent^ ev );
+        void OnError(CqEvent^ ev);
 
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/ICqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqEvent.hpp b/src/clicache/src/ICqEvent.hpp
index f4e2bb2..b48e9eb 100644
--- a/src/clicache/src/ICqEvent.hpp
+++ b/src/clicache/src/ICqEvent.hpp
@@ -28,8 +28,8 @@ namespace Apache
     namespace Client
     {
 
-			 interface class IGFSerializable;
-       
+      interface class IGFSerializable;
+
 
       generic<class TKey, class TResult>
       ref class CqQuery;
@@ -51,11 +51,11 @@ namespace Apache
       /// of <c>ICacheListener</c> methods.  If event A occurs before event B,
       /// there is no guarantee that their corresponding <c>ICacheListener</c>
       /// method invocations will occur in the same order.  Any exceptions thrown by
-      /// the listener are caught by GemFire and logged. 
+      /// the listener are caught by Geode and logged. 
       ///
       /// Listeners are user callbacks that
-      /// are invoked by GemFire. It is important to ensure that minimal work is done in the
-      /// listener before returning control back to GemFire. For example, a listener
+      /// are invoked by Geode. It is important to ensure that minimal work is done in the
+      /// listener before returning control back to Geode. For example, a listener
       /// implementation may choose to hand off the event to a thread pool that then processes
       /// the event on its thread rather than the listener thread
       /// </remarks>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/ICqListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqListener.hpp b/src/clicache/src/ICqListener.hpp
index 2791aef..7415536 100644
--- a/src/clicache/src/ICqListener.hpp
+++ b/src/clicache/src/ICqListener.hpp
@@ -46,11 +46,11 @@ namespace Apache
       /// of <c>ICacheListener</c> methods.  If event A occurs before event B,
       /// there is no guarantee that their corresponding <c>ICacheListener</c>
       /// method invocations will occur in the same order.  Any exceptions thrown by
-      /// the listener are caught by GemFire and logged. 
+      /// the listener are caught by Geode and logged. 
       ///
       /// Listeners are user callbacks that
-      /// are invoked by GemFire. It is important to ensure that minimal work is done in the
-      /// listener before returning control back to GemFire. For example, a listener
+      /// are invoked by Geode. It is important to ensure that minimal work is done in the
+      /// listener before returning control back to Geode. For example, a listener
       /// implementation may choose to hand off the event to a thread pool that then processes
       /// the event on its thread rather than the listener thread
       /// </remarks>
@@ -80,7 +80,7 @@ namespace Apache
         /// <seealso cref="Region.Create" />
         /// <seealso cref="Region.Put" />
         /// <seealso cref="Region.Get" />
-        void OnEvent( CqEvent<TKey, TResult>^ ev );
+        void OnEvent(CqEvent<TKey, TResult>^ ev);
 
         /// <summary>
         /// Handles the event of an entry's value being modified in a region.
@@ -94,7 +94,7 @@ namespace Apache
         /// </param>
         /// <seealso cref="Region.Put" />
         //generic<class TKey, class TValue>
-        void OnError( CqEvent<TKey, TResult>^ ev );
+        void OnError(CqEvent<TKey, TResult>^ ev);
 
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IFixedPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IFixedPartitionResolver.hpp b/src/clicache/src/IFixedPartitionResolver.hpp
index 7ed58a1..e516c0e 100644
--- a/src/clicache/src/IFixedPartitionResolver.hpp
+++ b/src/clicache/src/IFixedPartitionResolver.hpp
@@ -30,66 +30,66 @@ namespace Apache
     {
 
       interface class IGFSerializable;
-        /// <summary>
-        /// Implementers of interface <code>FixedPartitionResolver</code> helps to
-        /// achieve explicit mapping of a "user defined" partition to a data member node.
-        /// </summary>
-        /// <remarks>
-        /// <p>
-        /// GemFire uses the partition name returned by 
-        /// {@link FixedPartitionResolver#getPartitionName(EntryEvent, CacheableHashSet)}
-        /// to determine on which member the data is being managed. Say, for example, you want to
-        /// partition all Trades according to quarters. You can implement
-        /// FixedPartitionResolver to get the name of the quarter based on the date given
-        /// as part of {@link EntryEvent}.
-        /// </p>
-        ///  
-        /// public class QuarterPartitionResolver implements FixedPartitionResolver{<br>
-        /// &nbsp &nbsp public String getPartitionName(EntryOperation opDetails, CacheableHashSet
-        /// allAvailablePartitions) {<br>
-        /// &nbsp &nbsp Date date = sdf.parse((String)opDetails.getKey());<br>
-        /// &nbsp &nbsp Calendar cal = Calendar.getInstance();<br>
-        /// &nbsp &nbsp cal.setTime(date);<br>
-        /// &nbsp &nbsp int month = cal.get(Calendar.MONTH);<br>
-        /// &nbsp &nbsp if (month == 0 || month == 1 || month == 2) {<br>
-        /// &nbsp &nbsp &nbsp return "Quarter1";<br>
-        /// &nbsp &nbsp }<br>
-        /// &nbsp &nbsp else if (month == 3 || month == 4 || month == 5) {<br>
-        /// &nbsp &nbsp &nbsp return "Quarter2";<br>
-        /// &nbsp &nbsp }<br>
-        /// &nbsp &nbsp else if (month == 6 || month == 7 || month == 8) {<br>
-        /// &nbsp &nbsp &nbsp return "Quarter3";<br>
-        /// &nbsp &nbsp }<br>
-        /// &nbsp &nbsp else if (month == 9 || month == 10 || month == 11) {<br>
-        /// &nbsp &nbsp &nbsp return "Quarter4";<br>
-        /// &nbsp &nbsp }<br>
-        /// &nbsp &nbsp else {<br>
-        /// &nbsp &nbsp &nbsp return "Invalid Quarter";<br>
-        /// &nbsp &nbsp }<br>
-        /// &nbsp }<br>
-        ///
-        /// @see PartitionResolver
-        ///
-        /// </remarks>
-        /// <seealso cref="AttributesFactory.SetPartitionResolver" />
-        /// <seealso cref="RegionAttributes.PartitionResolver" />
-        generic<class TKey, class TValue>
-        public interface class IFixedPartitionResolver: public IPartitionResolver<TKey, TValue>
-        {
-        public:
+      /// <summary>
+      /// Implementers of interface <code>FixedPartitionResolver</code> helps to
+      /// achieve explicit mapping of a "user defined" partition to a data member node.
+      /// </summary>
+      /// <remarks>
+      /// <p>
+      /// Geode uses the partition name returned by 
+      /// {@link FixedPartitionResolver#getPartitionName(EntryEvent, CacheableHashSet)}
+      /// to determine on which member the data is being managed. Say, for example, you want to
+      /// partition all Trades according to quarters. You can implement
+      /// FixedPartitionResolver to get the name of the quarter based on the date given
+      /// as part of {@link EntryEvent}.
+      /// </p>
+      ///  
+      /// public class QuarterPartitionResolver implements FixedPartitionResolver{<br>
+      /// &nbsp &nbsp public String getPartitionName(EntryOperation opDetails, CacheableHashSet
+      /// allAvailablePartitions) {<br>
+      /// &nbsp &nbsp Date date = sdf.parse((String)opDetails.getKey());<br>
+      /// &nbsp &nbsp Calendar cal = Calendar.getInstance();<br>
+      /// &nbsp &nbsp cal.setTime(date);<br>
+      /// &nbsp &nbsp int month = cal.get(Calendar.MONTH);<br>
+      /// &nbsp &nbsp if (month == 0 || month == 1 || month == 2) {<br>
+      /// &nbsp &nbsp &nbsp return "Quarter1";<br>
+      /// &nbsp &nbsp }<br>
+      /// &nbsp &nbsp else if (month == 3 || month == 4 || month == 5) {<br>
+      /// &nbsp &nbsp &nbsp return "Quarter2";<br>
+      /// &nbsp &nbsp }<br>
+      /// &nbsp &nbsp else if (month == 6 || month == 7 || month == 8) {<br>
+      /// &nbsp &nbsp &nbsp return "Quarter3";<br>
+      /// &nbsp &nbsp }<br>
+      /// &nbsp &nbsp else if (month == 9 || month == 10 || month == 11) {<br>
+      /// &nbsp &nbsp &nbsp return "Quarter4";<br>
+      /// &nbsp &nbsp }<br>
+      /// &nbsp &nbsp else {<br>
+      /// &nbsp &nbsp &nbsp return "Invalid Quarter";<br>
+      /// &nbsp &nbsp }<br>
+      /// &nbsp }<br>
+      ///
+      /// @see PartitionResolver
+      ///
+      /// </remarks>
+      /// <seealso cref="AttributesFactory.SetPartitionResolver" />
+      /// <seealso cref="RegionAttributes.PartitionResolver" />
+      generic<class TKey, class TValue>
+      public interface class IFixedPartitionResolver : public IPartitionResolver<TKey, TValue>
+      {
+      public:
 
-         /// <summary>
-         /// This method is used to get the name of the partition for the given entry
-         /// operation.
-         /// </summary> 
-         /// <param name="opDetails"> 
-         /// the details of the entry event e.g. {@link Region#get(Object)}
-         /// </param>
-         /// <return> partition-name associated with node which allows mapping of given
-         /// data to user defined partition
-         /// </return>         
-          String^ GetPartitionName(EntryEvent<TKey, TValue>^ opDetails);
-        };
+        /// <summary>
+        /// This method is used to get the name of the partition for the given entry
+        /// operation.
+        /// </summary> 
+        /// <param name="opDetails"> 
+        /// the details of the entry event e.g. {@link Region#get(Object)}
+        /// </param>
+        /// <return> partition-name associated with node which allows mapping of given
+        /// data to user defined partition
+        /// </return>         
+        String^ GetPartitionName(EntryEvent<TKey, TValue>^ opDetails);
+      };
     }  // namespace Client
   }  // namespace Geode
 }  // namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IGFDelta.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGFDelta.hpp b/src/clicache/src/IGFDelta.hpp
index 759b41e..50ed638 100644
--- a/src/clicache/src/IGFDelta.hpp
+++ b/src/clicache/src/IGFDelta.hpp
@@ -33,7 +33,7 @@ namespace Apache
       /// <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 GemFire
+      /// 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>.
@@ -42,35 +42,35 @@ namespace Apache
       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 GemFire determines the presence
+        /// 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="GemFireIOException">
+        /// <exception cref="GeodeIOException">
         /// </exception>
-        void ToDelta( DataOutput^ out );
+        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 GemFire determines the
+        /// 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="GemFireIOException">
+        /// <exception cref="GeodeIOException">
         /// </exception>
-        void FromDelta( DataInput^ in );
-       
+        void FromDelta(DataInput^ in);
+
         /// <summary>
-        /// <c>HasDelta( )</c> is invoked by GemFire during <c>Region.Put( ICacheableKey, IGFSerializable )</c> to determine if the object contains a delta.
+        /// <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( );
+        bool HasDelta();
       };
     }  // namespace Client
   }  // namespace Geode

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IGemFireCache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGemFireCache.hpp b/src/clicache/src/IGemFireCache.hpp
deleted file mode 100644
index 8e87955..0000000
--- a/src/clicache/src/IGemFireCache.hpp
+++ /dev/null
@@ -1,110 +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 "IRegionService.hpp"
-#include "DistributedSystem.hpp"
-#include "CacheTransactionManager.hpp"
-using namespace System;
-using namespace System::Collections::Generic;
-
-namespace Apache
-{
-  namespace Geode
-  {
-    namespace Client
-    {
-
-      /// <summary>
-      /// GemFireCache represents the singleton cache that must be created
-      /// in order to connect to Gemfire server.
-      /// </summary>
-      /// <remarks>
-      /// Caches are obtained from Crest methods on the
-      /// <see cref="CacheFactory.Create"/> class.
-      /// <para>
-      /// When a cache is created a <see cref="DistributedSystem" />
-      /// must be specified.
-      /// </para><para>
-      /// When a cache will no longer be used, call <see cref="Cache.Close" />.
-      /// Once it <see cref="Cache.IsClosed" /> any attempt to use it
-      /// will cause a <c>CacheClosedException</c> to be thrown.
-      /// </para><para>
-      /// A cache can have multiple root regions, each with a different name.
-      /// </para>
-      /// </remarks>
-      public interface class IGemFireCache : IRegionService
-      {
-      public:        
-        
-        /// <summary>
-        /// Returns the name of this cache.
-        /// </summary>
-        /// <remarks>
-        /// This method does not throw
-        /// <c>CacheClosedException</c> if the cache is closed.
-        /// </remarks>
-        /// <returns>the string name of this cache</returns>
-        property String^ Name
-        {
-          String^ get( );
-        }
-
-        /// <summary>
-        /// Initializes the cache from an XML file.
-        /// </summary>
-        /// <param name="cacheXml">pathname of a <c>cache.xml</c> file</param>
-        void InitializeDeclarativeCache( String^ cacheXml );
-
-        /// <summary>
-        /// Returns the distributed system used to
-        /// <see cref="CacheFactory.Create" /> this cache.
-        /// </summary>
-        /// <remarks>
-        /// This method does not throw
-        /// <c>CacheClosedException</c> if the cache is closed.
-        /// </remarks>
-        property DistributedSystem^ DistributedSystem
-        {
-          Apache::Geode::Client::DistributedSystem^ get( );
-        } 
-
-        /// <summary>
-        /// Returns the cache transaction manager of
-        /// <see cref="CacheFactory.Create" /> this cache.
-        /// </summary>
-        property Apache::Geode::Client::CacheTransactionManager^ CacheTransactionManager
-        {
-          Apache::Geode::Client::CacheTransactionManager^ get( );
-        }
-
-				///<summary>
-				/// Returns whether Cache saves unread fields for Pdx types.
-				///</summary>
-				bool GetPdxIgnoreUnreadFields();
-
-        ///<summary>
-        /// Returns whether { @link PdxInstance} is preferred for PDX types instead of .NET object.
-        ///</summary>
-        bool GetPdxReadSerialized();
-      };
-    }  // namespace Client
-  }  // namespace Geode
-}  // namespace Apache
-

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IGeodeCache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGeodeCache.hpp b/src/clicache/src/IGeodeCache.hpp
new file mode 100644
index 0000000..69bb170
--- /dev/null
+++ b/src/clicache/src/IGeodeCache.hpp
@@ -0,0 +1,110 @@
+/*
+ * 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 "IRegionService.hpp"
+#include "DistributedSystem.hpp"
+#include "CacheTransactionManager.hpp"
+using namespace System;
+using namespace System::Collections::Generic;
+
+namespace Apache
+{
+  namespace Geode
+  {
+    namespace Client
+    {
+
+      /// <summary>
+      /// GeodeCache represents the singleton cache that must be created
+      /// in order to connect to Geode server.
+      /// </summary>
+      /// <remarks>
+      /// Caches are obtained from Crest methods on the
+      /// <see cref="CacheFactory.Create"/> class.
+      /// <para>
+      /// When a cache is created a <see cref="DistributedSystem" />
+      /// must be specified.
+      /// </para><para>
+      /// When a cache will no longer be used, call <see cref="Cache.Close" />.
+      /// Once it <see cref="Cache.IsClosed" /> any attempt to use it
+      /// will cause a <c>CacheClosedException</c> to be thrown.
+      /// </para><para>
+      /// A cache can have multiple root regions, each with a different name.
+      /// </para>
+      /// </remarks>
+      public interface class IGeodeCache : IRegionService
+      {
+      public:
+
+        /// <summary>
+        /// Returns the name of this cache.
+        /// </summary>
+        /// <remarks>
+        /// This method does not throw
+        /// <c>CacheClosedException</c> if the cache is closed.
+        /// </remarks>
+        /// <returns>the string name of this cache</returns>
+        property String^ Name
+        {
+          String^ get();
+        }
+
+        /// <summary>
+        /// Initializes the cache from an XML file.
+        /// </summary>
+        /// <param name="cacheXml">pathname of a <c>cache.xml</c> file</param>
+        void InitializeDeclarativeCache(String^ cacheXml);
+
+        /// <summary>
+        /// Returns the distributed system used to
+        /// <see cref="CacheFactory.Create" /> this cache.
+        /// </summary>
+        /// <remarks>
+        /// This method does not throw
+        /// <c>CacheClosedException</c> if the cache is closed.
+        /// </remarks>
+        property DistributedSystem^ DistributedSystem
+        {
+          Apache::Geode::Client::DistributedSystem^ get();
+        }
+
+        /// <summary>
+        /// Returns the cache transaction manager of
+        /// <see cref="CacheFactory.Create" /> this cache.
+        /// </summary>
+        property Apache::Geode::Client::CacheTransactionManager^ CacheTransactionManager
+        {
+          Apache::Geode::Client::CacheTransactionManager^ get();
+        }
+
+        ///<summary>
+        /// Returns whether Cache saves unread fields for Pdx types.
+        ///</summary>
+        bool GetPdxIgnoreUnreadFields();
+
+        ///<summary>
+        /// Returns whether { @link PdxInstance} is preferred for PDX types instead of .NET object.
+        ///</summary>
+        bool GetPdxReadSerialized();
+      };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPartitionResolver.hpp b/src/clicache/src/IPartitionResolver.hpp
index b693311..8020132 100644
--- a/src/clicache/src/IPartitionResolver.hpp
+++ b/src/clicache/src/IPartitionResolver.hpp
@@ -29,45 +29,45 @@ namespace Apache
     namespace Client
     {
 
-        interface class IGFSerializable;
+      interface class IGFSerializable;
 
 
-       /// <summary>
-       /// Implementers of interface <code>PartitionResolver</code> enable custom
-       /// partitioning on the <code>PartitionedRegion</code>.
-       /// </summary>
-        /// <remarks>
-       /// 1. The Key class or callback arg can implement PartitionResolver interface to
-       /// enable custom partitioning OR
-       /// 2. Configure your own PartitionResolver class in partition attributes (For
-       /// instance when the Key is a primitive type or String) Implement the
-       /// appropriate equals - For all implementations, you need to be sure to code the
-       /// class equals method so it properly verifies equality for the
-       /// PartitionResolver implementation. This might mean verifying that class names
-       /// are the same or that the returned routing objects are the same etc.. When you
-       /// initiate the partitioned region on multiple nodes, GemFire uses the equals
-       /// method to ensure you are using the same PartitionResolver implementation for
-       /// all of the nodes for the region.
-       /// GemFire uses the routing object's hashCode to determine where the data is
-       /// being managed. Say, for example, you want to colocate all Trades by month and
-       /// year.The key is implemented by TradeKey class which also implements the
-       /// PartitionResolver interface.
-       /// public class TradeKey implements PartitionResolver {<br>
-       /// &nbsp &nbsp private String tradeID;<br>
-       /// &nbsp &nbsp private Month month ;<br>
-       /// &nbsp &nbsp private Year year ;<br>
-       ///
-       /// &nbsp &nbsp public TradingKey(){ } <br>
-       /// &nbsp &nbsp public TradingKey(Month month, Year year){<br>
-       /// &nbsp &nbsp &nbsp &nbsp this.month = month;<br>
-       /// &nbsp &nbsp &nbsp &nbsp this.year = year;<br>
-       /// &nbsp &nbsp } <br>
-       /// &nbsp &nbsp public Serializable getRoutingObject(EntryOperation key){<br>
-       /// &nbsp &nbsp &nbsp &nbsp return this.month + this.year;<br>
-       /// &nbsp &nbsp }<br> }<br>
-       ///
-       /// In the example above, all trade entries with the same month and year are
-       /// guaranteed to be colocated.
+      /// <summary>
+      /// Implementers of interface <code>PartitionResolver</code> enable custom
+      /// partitioning on the <code>PartitionedRegion</code>.
+      /// </summary>
+      /// <remarks>
+      /// 1. The Key class or callback arg can implement PartitionResolver interface to
+      /// enable custom partitioning OR
+      /// 2. Configure your own PartitionResolver class in partition attributes (For
+      /// instance when the Key is a primitive type or String) Implement the
+      /// appropriate equals - For all implementations, you need to be sure to code the
+      /// class equals method so it properly verifies equality for the
+      /// PartitionResolver implementation. This might mean verifying that class names
+      /// are the same or that the returned routing objects are the same etc.. When you
+      /// initiate the partitioned region on multiple nodes, Geode uses the equals
+      /// method to ensure you are using the same PartitionResolver implementation for
+      /// all of the nodes for the region.
+      /// Geode uses the routing object's hashCode to determine where the data is
+      /// being managed. Say, for example, you want to colocate all Trades by month and
+      /// year.The key is implemented by TradeKey class which also implements the
+      /// PartitionResolver interface.
+      /// public class TradeKey implements PartitionResolver {<br>
+      /// &nbsp &nbsp private String tradeID;<br>
+      /// &nbsp &nbsp private Month month ;<br>
+      /// &nbsp &nbsp private Year year ;<br>
+      ///
+      /// &nbsp &nbsp public TradingKey(){ } <br>
+      /// &nbsp &nbsp public TradingKey(Month month, Year year){<br>
+      /// &nbsp &nbsp &nbsp &nbsp this.month = month;<br>
+      /// &nbsp &nbsp &nbsp &nbsp this.year = year;<br>
+      /// &nbsp &nbsp } <br>
+      /// &nbsp &nbsp public Serializable getRoutingObject(EntryOperation key){<br>
+      /// &nbsp &nbsp &nbsp &nbsp return this.month + this.year;<br>
+      /// &nbsp &nbsp }<br> }<br>
+      ///
+      /// In the example above, all trade entries with the same month and year are
+      /// guaranteed to be colocated.
       /// </remarks>
       /// <seealso cref="AttributesFactory.SetPartitionResolver" />
       /// <seealso cref="RegionAttributes.PartitionResolver" />
@@ -83,11 +83,11 @@ namespace Apache
         /// <para>
         /// This function does not throw any exception.
         /// </para>
-         /// <returns>
+        /// <returns>
         /// the name of the PartitionResolver
         /// </returns>
         /// </remarks>
-        String^ GetName();       
+        String^ GetName();
 
         /// <summary>
         /// return object associated with entry event which allows the Partitioned Region to store associated data together.
@@ -100,7 +100,7 @@ namespace Apache
         /// key the detail of the entry event.
         /// </param>
 
-        Object^ GetRoutingObject(EntryEvent<TKey, TValue>^ key) ;
+        Object^ GetRoutingObject(EntryEvent<TKey, TValue>^ key);
       };
     }  // namespace Client
   }  // namespace Geode

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IPdxSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxSerializable.hpp b/src/clicache/src/IPdxSerializable.hpp
index caca571..677fb6a 100644
--- a/src/clicache/src/IPdxSerializable.hpp
+++ b/src/clicache/src/IPdxSerializable.hpp
@@ -28,39 +28,39 @@ namespace Apache
     namespace Client
     {
 
-				/// <summary>
-				/// When a domain class implements PdxSerializable it marks 
-				/// itself as a PDX. 
-				/// The implementation of toData provides the serialization 
-				/// code and fromData provides the deserialization code. 
-				/// These methods also define each field name and field type 
-				/// of the PDX. Domain classes should serialize and de-serialize 
-				/// all its member fields in same order in toData and fromData 
-				/// method. 
-				/// A domain class which implements this interface should register delgate <see cref="Serializable.RegisterPdxType" /> to create new 
-				/// instance of type for de-serilization.
-				/// </summary>
-				public interface class IPdxSerializable
-				{
-				public:
+      /// <summary>
+      /// When a domain class implements PdxSerializable it marks 
+      /// itself as a PDX. 
+      /// The implementation of toData provides the serialization 
+      /// code and fromData provides the deserialization code. 
+      /// These methods also define each field name and field type 
+      /// of the PDX. Domain classes should serialize and de-serialize 
+      /// all its member fields in same order in toData and fromData 
+      /// method. 
+      /// A domain class which implements this interface should register delgate <see cref="Serializable.RegisterPdxType" /> to create new 
+      /// instance of type for de-serilization.
+      /// </summary>
+      public interface class IPdxSerializable
+      {
+      public:
 
-					/// <summary>
-					/// Serializes this object in gemfire PDX format.
-					/// </summary>
-					/// <param name="writer">
-					/// the IPdxWriter object to use for serializing the object
-					/// </param>
-					void ToData( IPdxWriter^ writer );
+        /// <summary>
+        /// Serializes this object in geode PDX format.
+        /// </summary>
+        /// <param name="writer">
+        /// the IPdxWriter object to use for serializing the object
+        /// </param>
+        void ToData(IPdxWriter^ writer);
 
-					/// <summary>
-					/// Deserialize this object.
-					/// </summary>
-					/// <param name="reader">
-					/// the IPdxReader stream to use for reading the object data
-					/// </param>
-					void FromData( IPdxReader^ reader );
+        /// <summary>
+        /// Deserialize this object.
+        /// </summary>
+        /// <param name="reader">
+        /// the IPdxReader stream to use for reading the object data
+        /// </param>
+        void FromData(IPdxReader^ reader);
 
-				};
+      };
     }  // namespace Client
   }  // namespace Geode
 }  // namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IPdxSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxSerializer.hpp b/src/clicache/src/IPdxSerializer.hpp
index b125ce7..52d52da 100755
--- a/src/clicache/src/IPdxSerializer.hpp
+++ b/src/clicache/src/IPdxSerializer.hpp
@@ -28,40 +28,40 @@ namespace Apache
     namespace Client
     {
 
-				/// <summary>
-				/// The IPdxSerializer interface allows domain classes to be 
-        /// serialized and deserialized as PDXs without modification 
-        /// of the domain class.
-				/// A domain class should register delgate <see cref="Serializable.RegisterPdxType" /> to create new 
-				/// instance of type for de-serilization.
-				/// </summary>
-				public interface class IPdxSerializer
-				{
-				public:
+      /// <summary>
+      /// The IPdxSerializer interface allows domain classes to be 
+      /// serialized and deserialized as PDXs without modification 
+      /// of the domain class.
+      /// A domain class should register delgate <see cref="Serializable.RegisterPdxType" /> to create new 
+      /// instance of type for de-serilization.
+      /// </summary>
+      public interface class IPdxSerializer
+      {
+      public:
 
-					/// <summary>
-					/// Serializes this object in gemfire PDX format.
-					/// </summary>
-          /// <param name="o">
-					/// the object which need to serialize
-					/// </param>
-					/// <param name="writer">
-					/// the IPdxWriter object to use for serializing the object
-					/// </param>
-					bool ToData( Object^ o,IPdxWriter^ writer );
+        /// <summary>
+        /// Serializes this object in geode PDX format.
+        /// </summary>
+        /// <param name="o">
+        /// the object which need to serialize
+        /// </param>
+        /// <param name="writer">
+        /// the IPdxWriter object to use for serializing the object
+        /// </param>
+        bool ToData(Object^ o, IPdxWriter^ writer);
 
-					/// <summary>
-					/// Deserialize this object.
-					/// </summary>
-          /// <param name="classname">
-					/// the classname whose object need to de-serialize
-					/// </param>
-					/// <param name="reader">
-					/// the IPdxReader stream to use for reading the object data
-					/// </param>
-					Object^ FromData(String^ classname, IPdxReader^ reader );
+        /// <summary>
+        /// Deserialize this object.
+        /// </summary>
+        /// <param name="classname">
+        /// the classname whose object need to de-serialize
+        /// </param>
+        /// <param name="reader">
+        /// the IPdxReader stream to use for reading the object data
+        /// </param>
+        Object^ FromData(String^ classname, IPdxReader^ reader);
 
-				};
+      };
     }  // namespace Client
   }  // namespace Geode
 }  // namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IPdxUnreadFields.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxUnreadFields.hpp b/src/clicache/src/IPdxUnreadFields.hpp
index a9d9ba3..96c57aa 100644
--- a/src/clicache/src/IPdxUnreadFields.hpp
+++ b/src/clicache/src/IPdxUnreadFields.hpp
@@ -25,15 +25,15 @@ namespace Apache
     namespace Client
     {
 
-				/// <summary>
-				/// Serialize the data in gemfire Portable Data eXchange(Pdx) Format.
-				/// This format provides class versioning(forward and backward compability of types) in cache.
-				/// This provides ability to query .NET domian objects.
-				/// </summary>
-				public interface class IPdxUnreadFields
-				{
+      /// <summary>
+      /// Serialize the data in geode Portable Data eXchange(Pdx) Format.
+      /// This format provides class versioning(forward and backward compability of types) in cache.
+      /// This provides ability to query .NET domian objects.
+      /// </summary>
+      public interface class IPdxUnreadFields
+      {
 
-				};
+      };
     }  // namespace Client
   }  // namespace Geode
 }  // namespace Apache

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IRegion.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IRegion.hpp b/src/clicache/src/IRegion.hpp
index f3dc502..58d18a7 100644
--- a/src/clicache/src/IRegion.hpp
+++ b/src/clicache/src/IRegion.hpp
@@ -106,7 +106,7 @@ namespace Apache
           /// This property is applicable to local as well as distributed region.
           /// For local region instance - Puts/Gets a new value into an entry in this region in the local cache only.
           /// For distributed region instance - Puts/Gets a new value into an entry in this region
-          /// and this operation is propogated to the Gemfire cache server to which it is connected with.
+          /// and this operation is propogated to the Geode cache server to which it is connected with.
           /// </remarks>
           /// <param name="key">
           /// The key of the element to get or set.
@@ -138,7 +138,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -301,7 +301,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to a GemFire system because the client cannot
+          /// if not connected to a Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -355,7 +355,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to a GemFire system because the client cannot
+          /// if not connected to a Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -423,7 +423,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to a GemFire system because the client cannot
+          /// if not connected to a Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -446,7 +446,7 @@ namespace Apache
           /// </summary>
           /// <remarks>
           /// For local region instance - removes the entry with the specified key from the local cache only.
-          /// For distributed region instance - remove is propogated to the Gemfire cache server.
+          /// For distributed region instance - remove is propogated to the Geode cache server.
           /// </remarks>
           /// <param name="key">
           /// The key of the element to remove.
@@ -460,7 +460,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -488,7 +488,7 @@ namespace Apache
           /// </para>
           /// <para>
           /// For local region instance - removes the value with the specified key in the local cache only.
-          /// For distributed region instance - destroy is propogated to the Gemfire cache server
+          /// For distributed region instance - destroy is propogated to the Geode cache server
           /// to which it is connected with.          
           /// </para>
           /// <para>
@@ -505,7 +505,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -555,7 +555,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -607,7 +607,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -670,7 +670,7 @@ namespace Apache
           /// from this region.
           /// </para>
           /// <para>
-          /// The Remove is propogated to the Gemfire cache server to which it is connected with.
+          /// The Remove is propogated to the Geode cache server to which it is connected with.
           /// </para>
           /// <para>
           /// Does not update any <c>CacheStatistics</c>.
@@ -689,7 +689,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -718,7 +718,7 @@ namespace Apache
           /// from this region.
           /// </para>
           /// <para>
-          /// The Remove is propogated to the Gemfire cache server to which it is connected with.
+          /// The Remove is propogated to the Geode cache server to which it is connected with.
           /// </para>
           /// <para>
           /// Does not update any <c>CacheStatistics</c>.
@@ -733,7 +733,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -775,7 +775,7 @@ namespace Apache
           /// Returns all the keys for this region. This includes
           /// keys for which the entry is invalid.
           /// For local region instance - gets collection of keys from local cache only.
-          /// For distributed region instance - gets collection of keys from the Gemfire cache server.
+          /// For distributed region instance - gets collection of keys from the Geode cache server.
           /// </summary>
           /// <returns>collection of keys</returns>
           /// <remark>
@@ -792,7 +792,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -842,7 +842,7 @@ namespace Apache
           /// cache to manage the creation and loading of objects.
           /// For local region instance - Puts a new value into an entry in this region in the local cache only.
           /// For distributed region instance - Puts a new value into an entry in this region
-          /// and this operation is propogated to the Gemfire cache server to which it is connected with.
+          /// and this operation is propogated to the Geode cache server to which it is connected with.
           /// </para><para>
           /// Updates the <see cref="CacheStatistics.LastAccessedTime" /> and
           /// <see cref="CacheStatistics.LastModifiedTime" /> for this region and the entry.
@@ -878,7 +878,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -937,7 +937,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -966,7 +966,7 @@ namespace Apache
           /// and the entries in it will still exist.
           /// For local region instance - invalidates this region without distributing to other caches.
           /// For distributed region instance - Invalidates this region and this 
-          /// operation is propogated to the Gemfire cache server to which it is connected with.
+          /// operation is propogated to the Geode cache server to which it is connected with.
           /// </para>          
           /// <para>
           /// To remove all the
@@ -980,7 +980,7 @@ namespace Apache
           /// subregions may have already been successfully invalidated
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1002,7 +1002,7 @@ namespace Apache
           /// and the entries in it will still exist.
           /// For local region instance - invalidates this region without distributing to other caches.
           /// For distributed region instance - Invalidates this region and this 
-          /// operation is propogated to the Gemfire cache server to which it is connected with.
+          /// operation is propogated to the Geode cache server to which it is connected with.
           /// </para>
           /// <para>
           /// To remove all the
@@ -1015,7 +1015,7 @@ namespace Apache
           /// user-defined parameter to pass to callback events triggered by this method
           /// </param>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1044,7 +1044,7 @@ namespace Apache
           /// server region.
           /// For local region instance - destroys the whole local region only
           /// For distributed region instance - destroys the whole local region and this
-          /// operation is also propogated to the Gemfire cache server to which it is connected with.
+          /// operation is also propogated to the Geode cache server to which it is connected with.
           /// </para><para>
           /// Does not update any <c>CacheStatistics</c>.
           /// </para>
@@ -1062,7 +1062,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1086,7 +1086,7 @@ namespace Apache
           /// server region.
           /// For local region instance - destroys the whole local region only
           /// For distributed region instance - destroys the whole local region and this
-          /// operation is also propogated to the Gemfire cache server to which it is connected with.
+          /// operation is also propogated to the Geode cache server to which it is connected with.
           /// </para><para>
           /// Does not update any <c>CacheStatistics</c>.
           /// </para>
@@ -1107,7 +1107,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1131,7 +1131,7 @@ namespace Apache
           /// </para>
           /// <para>
           /// For both local & distributed region instaces, invalidate is not propogated to the 
-          /// Gemfire cache server to which it is connected with.
+          /// Geode cache server to which it is connected with.
           /// </para>
           /// <para>
           /// Does not update any <c>CacheStatistics</c>.
@@ -1162,7 +1162,7 @@ namespace Apache
           /// </para>
           /// <para>
           /// For both local & distributed region instaces, invalidate is not propogated to the 
-          /// Gemfire cache server to which it is connected with.
+          /// Geode cache server to which it is connected with.
           /// </para>
           /// <para>
           /// Does not update any <c>CacheStatistics</c>.
@@ -1211,7 +1211,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1263,7 +1263,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1318,7 +1318,7 @@ namespace Apache
           /// Only for Native Client regions.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1796,7 +1796,7 @@ namespace Apache
           /// If an exception is received from the Java cache server.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1841,7 +1841,7 @@ namespace Apache
           /// If an exception is received from the Java cache server.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1889,7 +1889,7 @@ namespace Apache
           /// If an exception is received from the Java cache server.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1939,7 +1939,7 @@ namespace Apache
           /// If an exception is received from the Java cache server.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -1986,7 +1986,7 @@ namespace Apache
           /// If an exception is received from the Java cache server.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.
@@ -2038,7 +2038,7 @@ namespace Apache
           /// If an exception is received from the Java cache server.
           /// </exception>
           /// <exception cref="NotConnectedException">
-          /// if not connected to the GemFire system because the client cannot
+          /// if not connected to the Geode system because the client cannot
           /// establish usable connections to any of the servers given to it.
           /// For pools configured with locators, if no locators are available, innerException
           /// of NotConnectedException is set to NoAvailableLocatorsException.

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fc9f1f6f/src/clicache/src/IResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IResultCollector.hpp b/src/clicache/src/IResultCollector.hpp
index 3adc048..28ff8b0 100644
--- a/src/clicache/src/IResultCollector.hpp
+++ b/src/clicache/src/IResultCollector.hpp
@@ -28,7 +28,7 @@ namespace Apache
     namespace Client
     {
 
-			 interface class IGFSerializable;
+      interface class IGFSerializable;
       /*
       generic<class TKey>
       ref class ResultCollector;
@@ -45,33 +45,33 @@ namespace Apache
         /// <summary>
         /// add result from a single function execution
         /// </summary>
-        void AddResult(  TResult rs );
+        void AddResult(TResult rs);
 
         /// <summary>
         /// get result 
         /// </summary>
-        System::Collections::Generic::ICollection<TResult>^  GetResult(); 
+        System::Collections::Generic::ICollection<TResult>^  GetResult();
 
         /// <summary>
         /// get result 
         /// </summary>
-        System::Collections::Generic::ICollection<TResult>^  GetResult(UInt32 timeout); 
+        System::Collections::Generic::ICollection<TResult>^  GetResult(UInt32 timeout);
 
         /// <summary>
         ///Call back provided to caller, which is called after function execution is
         ///complete and caller can retrieve results using getResult()
         /// </summary>
-  //generic<class TKey>
-	void EndResults(); 
+        //generic<class TKey>
+        void EndResults();
 
-  /// <summary>
-  ///GemFire will invoke this method before re-executing function (in case of
-  /// Function Execution HA) This is to clear the previous execution results from
-   /// the result collector
-  /// @since 6.5
-  /// </summary>
-  //generic<class TKey>
-  void ClearResults(/*bool*/);
+        /// <summary>
+        ///Geode will invoke this method before re-executing function (in case of
+        /// Function Execution HA) This is to clear the previous execution results from
+        /// the result collector
+        /// @since 6.5
+        /// </summary>
+        //generic<class TKey>
+        void ClearResults(/*bool*/);
 
       };
     }  // namespace Client


Mime
View raw message