geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [33/50] [abbrv] geode git commit: GEODE-2316: Removed namespace Apache.Geode.Client.Generic.
Date Mon, 23 Jan 2017 19:17:25 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableString.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableString.cpp b/src/clicache/src/CacheableString.cpp
index 97585c5..181be6d 100644
--- a/src/clicache/src/CacheableString.cpp
+++ b/src/clicache/src/CacheableString.cpp
@@ -32,8 +32,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       void CacheableString::ToData(DataOutput^ output)
       {
@@ -144,7 +142,7 @@ namespace Generic
         return (m_value->Length * sizeof(char));
       }
 
-      bool CacheableString::Equals(Apache::Geode::Client::Generic::ICacheableKey^ other)
+      bool CacheableString::Equals(Apache::Geode::Client::ICacheableKey^ other)
       {
         if (other == nullptr || other->ClassId != ClassId) {
           return false;
@@ -205,10 +203,10 @@ namespace Generic
             m_type = GemFireClassIds::CacheableStringHuge;
           else
             m_type = GemFireClassIds::CacheableString;  
-        }
-      }
-    }
-  }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 }
  } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableString.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableString.hpp b/src/clicache/src/CacheableString.hpp
index 6b29c45..1641e7b 100644
--- a/src/clicache/src/CacheableString.hpp
+++ b/src/clicache/src/CacheableString.hpp
@@ -33,8 +33,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// An immutable string wrapper that can serve as a distributable
       /// key object for caching as well as being a string value.
@@ -150,7 +149,7 @@ namespace Generic
         /// It invokes the '==' operator of the underlying
         /// <c>apache::geode::client::CacheableString</c> object.
         /// </summary>
-        virtual bool Equals(Apache::Geode::Client::Generic::ICacheableKey^ other) override;
+        virtual bool Equals(Apache::Geode::Client::ICacheableKey^ other) override;
 
         /// <summary>
         /// Return true if this key matches other object.
@@ -317,8 +316,8 @@ namespace Generic
         inline CacheableString(apache::geode::client::Serializable* nativeptr)
           : CacheableKey(nativeptr) { }
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableStringArray.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStringArray.cpp b/src/clicache/src/CacheableStringArray.cpp
index 2958ec5..0a860e4 100644
--- a/src/clicache/src/CacheableStringArray.cpp
+++ b/src/clicache/src/CacheableStringArray.cpp
@@ -30,8 +30,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       CacheableStringArray::CacheableStringArray(array<String^>^ strings)
         : Serializable()
@@ -90,10 +88,9 @@ namespace Generic
             }
           }
           return this;
-        }
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
 }
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableStringArray.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableStringArray.hpp b/src/clicache/src/CacheableStringArray.hpp
index 0a41cbe..e8fba28 100644
--- a/src/clicache/src/CacheableStringArray.hpp
+++ b/src/clicache/src/CacheableStringArray.hpp
@@ -33,8 +33,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       ref class CacheableString;
 
       /// <summary>
@@ -184,8 +183,8 @@ namespace Generic
         inline CacheableStringArray(apache::geode::client::Serializable* nativeptr)
           : Serializable(nativeptr) { }
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableUndefined.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableUndefined.cpp b/src/clicache/src/CacheableUndefined.cpp
index 21f8892..4da32ce 100644
--- a/src/clicache/src/CacheableUndefined.cpp
+++ b/src/clicache/src/CacheableUndefined.cpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       // Region: IGFSerializable Members
 
       void CacheableUndefined::ToData(DataOutput^ output)
@@ -47,10 +46,8 @@ namespace Generic
       uint32_t CacheableUndefined::ObjectSize::get()
       {
         return static_cast<uint32_t> (sizeof(CacheableUndefined^));
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-      // End Region: IGFSerializable Members
-    }
-  }
-}
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableUndefined.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableUndefined.hpp b/src/clicache/src/CacheableUndefined.hpp
index 131a5e0..ec414be 100644
--- a/src/clicache/src/CacheableUndefined.hpp
+++ b/src/clicache/src/CacheableUndefined.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// Encapsulate an undefined result.
       /// </summary>
@@ -104,7 +103,7 @@ namespace Generic
 					return gcnew CacheableUndefined();
         }
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableVector.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableVector.cpp b/src/clicache/src/CacheableVector.cpp
index 73de92d..b47f958 100644
--- a/src/clicache/src/CacheableVector.cpp
+++ b/src/clicache/src/CacheableVector.cpp
@@ -33,8 +33,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       // Region: IGFSerializable Members
 
       void CacheableVector::ToData(DataOutput^ output)
@@ -71,11 +70,9 @@ namespace Generic
           }
         }*/
         return m_arrayList->Count;
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-      // End Region: IGFSerializable Members
-    }
-  }
-}
  } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CacheableVector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableVector.hpp b/src/clicache/src/CacheableVector.hpp
index 9782535..666e3a8 100644
--- a/src/clicache/src/CacheableVector.hpp
+++ b/src/clicache/src/CacheableVector.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as
       /// a distributable object for caching. This class extends .NET generic
@@ -131,7 +130,7 @@ namespace Generic
         private:
           System::Collections::IList^ m_arrayList; 
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributes.cpp b/src/clicache/src/CqAttributes.cpp
index a386fcd..c6dbe10 100644
--- a/src/clicache/src/CqAttributes.cpp
+++ b/src/clicache/src/CqAttributes.cpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic<class TKey, class TResult>
       array<ICqListener<TKey, TResult>^>^ CqAttributes<TKey, TResult>::getCqListeners( )
       {
@@ -61,9 +60,8 @@ namespace Generic
           }
         }
         return listners;
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-    }
-  }
 } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributes.hpp b/src/clicache/src/CqAttributes.hpp
index 3c11fb0..dce5ab0 100644
--- a/src/clicache/src/CqAttributes.hpp
+++ b/src/clicache/src/CqAttributes.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic<class TKey, class TResult>
       interface class ICqListener;
 
@@ -47,7 +46,7 @@ namespace Generic
         /// <summary>
         /// get all listeners in this attributes
         /// </summary>
-        virtual array<Generic::ICqListener<TKey, TResult>^>^ getCqListeners();
+        virtual array<Client::ICqListener<TKey, TResult>^>^ getCqListeners();
 
       internal:
 
@@ -78,8 +77,7 @@ namespace Generic
         inline CqAttributes( apache::geode::client::CqAttributes* nativeptr )
           : SBWrap( nativeptr ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesFactory.cpp b/src/clicache/src/CqAttributesFactory.cpp
index 0f384ea..adf24d3 100644
--- a/src/clicache/src/CqAttributesFactory.cpp
+++ b/src/clicache/src/CqAttributesFactory.cpp
@@ -32,10 +32,9 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic<class TKey, class TResult>
-      void CqAttributesFactory<TKey, TResult>::AddCqListener(Generic::ICqListener<TKey, TResult>^ cqListener )
+      void CqAttributesFactory<TKey, TResult>::AddCqListener(Client::ICqListener<TKey, TResult>^ cqListener )
       {
         apache::geode::client::CqListenerPtr listenerptr;
         if ( cqListener != nullptr ) {
@@ -83,7 +82,7 @@ namespace Generic
       }
 
       generic<class TKey, class TResult>
-      void CqAttributesFactory<TKey, TResult>::InitCqListeners(array<Generic::ICqListener<TKey, TResult>^>^ cqListeners)
+      void CqAttributesFactory<TKey, TResult>::InitCqListeners(array<Client::ICqListener<TKey, TResult>^>^ cqListeners)
       {
         apache::geode::client::VectorOfCqListener vrr;
         for( int i = 0; i < cqListeners->Length; i++ )
@@ -134,12 +133,11 @@ namespace Generic
       }
 
       generic<class TKey, class TResult>
-      Generic::CqAttributes<TKey, TResult>^ CqAttributesFactory<TKey, TResult>::Create( )
+      Client::CqAttributes<TKey, TResult>^ CqAttributesFactory<TKey, TResult>::Create( )
       {
-        return Generic::CqAttributes<TKey, TResult>::Create(NativePtr->create().ptr());
-      }
+        return Client::CqAttributes<TKey, TResult>::Create(NativePtr->create().ptr());
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-    }
-  }
 } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesFactory.hpp b/src/clicache/src/CqAttributesFactory.hpp
index c85422c..8a7f4e7 100644
--- a/src/clicache/src/CqAttributesFactory.hpp
+++ b/src/clicache/src/CqAttributesFactory.hpp
@@ -33,8 +33,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /*
       generic<class TKey, class TValue>
@@ -61,7 +59,7 @@ namespace Generic
           : UMWrap( new apache::geode::client::CqAttributesFactory( ), true )
         { }
 
-        inline CqAttributesFactory(Generic::CqAttributes<TKey, TResult>^ cqAttributes )
+        inline CqAttributesFactory(Client::CqAttributes<TKey, TResult>^ cqAttributes )
           : UMWrap( new apache::geode::client::CqAttributesFactory(apache::geode::client::CqAttributesPtr(GetNativePtrFromSBWrapGeneric<apache::geode::client::CqAttributes>(cqAttributes ))), true )
         { }
 
@@ -70,22 +68,21 @@ namespace Generic
         /// <summary>
         /// add a cqListener 
         /// </summary>
-        void AddCqListener(Generic::ICqListener<TKey, TResult>^ cqListener);
+        void AddCqListener(Client::ICqListener<TKey, TResult>^ cqListener);
 
         /// <summary>
         /// Initialize with an array of listeners
         /// </summary>
-        void InitCqListeners( array<Generic::ICqListener<TKey, TResult>^>^ cqListeners );
+        void InitCqListeners( array<Client::ICqListener<TKey, TResult>^>^ cqListeners );
 
         // FACTORY METHOD
 
         /// <summary>
         /// Creates a <c>CqAttributes</c> with the current settings.
         /// </summary>
-        Generic::CqAttributes<TKey, TResult>^ Create( );
+        Client::CqAttributes<TKey, TResult>^ Create( );
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesMutator.cpp b/src/clicache/src/CqAttributesMutator.cpp
index 96532ba..0e2b303 100644
--- a/src/clicache/src/CqAttributesMutator.cpp
+++ b/src/clicache/src/CqAttributesMutator.cpp
@@ -30,11 +30,9 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TKey, class TResult>
-      void CqAttributesMutator<TKey, TResult>::AddCqListener( Generic::ICqListener<TKey, TResult>^ cqListener )
+      void CqAttributesMutator<TKey, TResult>::AddCqListener( Client::ICqListener<TKey, TResult>^ cqListener )
       {
         apache::geode::client::CqListenerPtr listenerptr;
         if ( cqListener != nullptr ) {
@@ -82,14 +80,14 @@ namespace Generic
       }
 
       generic<class TKey, class TResult>
-      void CqAttributesMutator<TKey, TResult>::RemoveCqListener( Generic::ICqListener<TKey, TResult>^ cqListener )
+      void CqAttributesMutator<TKey, TResult>::RemoveCqListener( Client::ICqListener<TKey, TResult>^ cqListener )
       {
-        Generic::ICqStatusListener<TKey, TResult>^ lister = dynamic_cast<Generic::ICqStatusListener<TKey, TResult>^>(cqListener);
+        Client::ICqStatusListener<TKey, TResult>^ lister = dynamic_cast<Client::ICqStatusListener<TKey, TResult>^>(cqListener);
         if (lister != nullptr) {
           CqStatusListenerGeneric<TKey, TResult>^ cqlg = gcnew CqStatusListenerGeneric<TKey, TResult>();
           cqlg->AddCqListener(cqListener);
           apache::geode::client::CqStatusListenerPtr lptr(new apache::geode::client::ManagedCqStatusListenerGeneric(
-          (Generic::ICqStatusListener<TKey, TResult>^) lister ));
+          (Client::ICqStatusListener<TKey, TResult>^) lister ));
           ((apache::geode::client::ManagedCqStatusListenerGeneric*)lptr.ptr())->setptr(cqlg);
           try {
             IntPtr value;
@@ -106,7 +104,7 @@ namespace Generic
           CqListenerGeneric<TKey, TResult>^ cqlg = gcnew CqListenerGeneric<TKey, TResult>();
           cqlg->AddCqListener(cqListener);
           apache::geode::client::CqListenerPtr lptr(new apache::geode::client::ManagedCqListenerGeneric(
-            (Generic::ICqListener<TKey, TResult>^) cqListener ));
+            (Client::ICqListener<TKey, TResult>^) cqListener ));
           ((apache::geode::client::ManagedCqListenerGeneric*)lptr.ptr())->setptr(cqlg);
           try {
             IntPtr value;
@@ -122,12 +120,12 @@ namespace Generic
       }
 
       generic<class TKey, class TResult>
-      void CqAttributesMutator<TKey, TResult>::SetCqListeners(array<Generic::ICqListener<TKey, TResult>^>^ newListeners)
+      void CqAttributesMutator<TKey, TResult>::SetCqListeners(array<Client::ICqListener<TKey, TResult>^>^ newListeners)
       {
         apache::geode::client::VectorOfCqListener vrr;
         for( int i = 0; i < newListeners->Length; i++ )
         {
-          Generic::ICqStatusListener<TKey, TResult>^ lister = dynamic_cast<Generic::ICqStatusListener<TKey, TResult>^>(newListeners[i]);
+          Client::ICqStatusListener<TKey, TResult>^ lister = dynamic_cast<Client::ICqStatusListener<TKey, TResult>^>(newListeners[i]);
           if (lister != nullptr) {
             apache::geode::client::CqStatusListenerPtr cptr(new apache::geode::client::ManagedCqStatusListenerGeneric(
               (ICqStatusListener<TKey, TResult>^)lister ));
@@ -148,7 +146,7 @@ namespace Generic
             ((apache::geode::client::ManagedCqStatusListenerGeneric*)vrr[i].ptr())->setptr(cqlg);
           }
           else {
-            Generic::ICqListener<TKey, TResult>^ lister = newListeners[i];
+            Client::ICqListener<TKey, TResult>^ lister = newListeners[i];
             apache::geode::client::CqListenerPtr cptr(new apache::geode::client::ManagedCqListenerGeneric(
               (ICqListener<TKey, TResult>^)lister ));
             vrr.push_back(cptr);
@@ -170,9 +168,8 @@ namespace Generic
         }
 
         NativePtr->setCqListeners( vrr );
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-    }
-  }
 } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqAttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesMutator.hpp b/src/clicache/src/CqAttributesMutator.hpp
index 8824aa3..c3a1e97 100644
--- a/src/clicache/src/CqAttributesMutator.hpp
+++ b/src/clicache/src/CqAttributesMutator.hpp
@@ -32,8 +32,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TKey, class TResult>
 	  interface class ICqListener;
@@ -41,9 +39,9 @@ namespace Generic
       generic<class TKey, class TResult>
       private ref class CqListenerHelper sealed{
         public:
-        static IDictionary<Generic::ICqListener<TKey, TResult>^, IntPtr>^
+        static IDictionary<Client::ICqListener<TKey, TResult>^, IntPtr>^
           m_ManagedVsUnManagedCqLstrDict = gcnew 
-          Dictionary<Generic::ICqListener<TKey, TResult>^, IntPtr>();
+          Dictionary<Client::ICqListener<TKey, TResult>^, IntPtr>();
 
         static ReaderWriterLock^ g_readerWriterLock = gcnew ReaderWriterLock();
       };
@@ -64,20 +62,20 @@ namespace Generic
         /// <param name="cqListener">
         /// user-defined cq listener, or null for no cache listener
         /// </param>
-        void AddCqListener( Generic::ICqListener<TKey, TResult>^ cqListener );
+        void AddCqListener( Client::ICqListener<TKey, TResult>^ cqListener );
 
         /// <summary>
         /// Remove a CqListener for the cq.
         /// </summary>
         
-        void RemoveCqListener(Generic::ICqListener<TKey, TResult>^ aListener);
+        void RemoveCqListener(Client::ICqListener<TKey, TResult>^ aListener);
 
 
         /// <summary>
 	/// Initialize with an array of listeners
         /// </summary>
         
-        void SetCqListeners(array<Generic::ICqListener<TKey, TResult>^>^ newListeners);
+        void SetCqListeners(array<Client::ICqListener<TKey, TResult>^>^ newListeners);
 
 
       internal:
@@ -89,13 +87,13 @@ namespace Generic
         /// <returns>
         /// The managed wrapper object; null if the native pointer is null.
         /// </returns>
-        inline static Generic::CqAttributesMutator<TKey, TResult>^ Create( apache::geode::client::CqAttributesMutator* nativeptr )
+        inline static Client::CqAttributesMutator<TKey, TResult>^ Create( apache::geode::client::CqAttributesMutator* nativeptr )
         {
           if (nativeptr == nullptr)
           {
             return nullptr;
           }
-          return gcnew Generic::CqAttributesMutator<TKey, TResult>( nativeptr );
+          return gcnew Client::CqAttributesMutator<TKey, TResult>( nativeptr );
         }
 
 
@@ -108,8 +106,7 @@ namespace Generic
         inline CqAttributesMutator<TKey, TResult>( apache::geode::client::CqAttributesMutator* nativeptr )
           : SBWrap( nativeptr ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqEvent.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqEvent.cpp b/src/clicache/src/CqEvent.cpp
index 4e0ecd3..dc1e2b0 100644
--- a/src/clicache/src/CqEvent.cpp
+++ b/src/clicache/src/CqEvent.cpp
@@ -28,8 +28,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TKey, class TResult>
       CqQuery<TKey, TResult>^ CqEvent<TKey, TResult>::getCq( )
@@ -70,10 +68,8 @@ namespace Generic
         apache::geode::client::CacheableBytesPtr deltaBytes = NativePtr->getDeltaValue( );
         CacheableBytes^ managedDeltaBytes = ( CacheableBytes^ ) CacheableBytes::Create( deltaBytes.ptr( ) );
         return ( array< Byte >^ ) managedDeltaBytes;
-      }
-
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqEvent.hpp b/src/clicache/src/CqEvent.hpp
index a394ce0..2e960da 100644
--- a/src/clicache/src/CqEvent.hpp
+++ b/src/clicache/src/CqEvent.hpp
@@ -34,8 +34,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
 			interface class IGFSerializable;
       //interface class ICqEvent;
       //interface class ICacheableKey;
@@ -89,8 +88,7 @@ namespace Generic
         inline CqEvent( const apache::geode::client::CqEvent* nativeptr )
           : UMWrap( const_cast<apache::geode::client::CqEvent*>( nativeptr ), false ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqListener.hpp b/src/clicache/src/CqListener.hpp
index 839a1b4..ddeda40 100644
--- a/src/clicache/src/CqListener.hpp
+++ b/src/clicache/src/CqListener.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
   generic<class TKey, class TResult>
 	ref class CqEvent;
 	//interface class ICqListener;
@@ -107,8 +106,7 @@ namespace Generic
         }
 
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqOperation.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqOperation.hpp b/src/clicache/src/CqOperation.hpp
index e8d2755..7a20773 100644
--- a/src/clicache/src/CqOperation.hpp
+++ b/src/clicache/src/CqOperation.hpp
@@ -31,8 +31,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Enumerated type for CqOperationType
@@ -82,8 +80,8 @@ namespace Generic
         inline CqOperation( apache::geode::client::CqOperation* nativeptr )
 		            : UMWrap( nativeptr, false ) { }
 	  };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqQuery.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.cpp b/src/clicache/src/CqQuery.cpp
index f28f367..48d7016 100644
--- a/src/clicache/src/CqQuery.cpp
+++ b/src/clicache/src/CqQuery.cpp
@@ -34,8 +34,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TKey, class TResult>
       ICqResults<TResult>^ CqQuery<TKey, TResult>::ExecuteWithInitialResults()
@@ -199,9 +197,8 @@ namespace Generic
           return NativePtr->isClosed( );
 
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqQuery.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqQuery.hpp b/src/clicache/src/CqQuery.hpp
index f91d415..b6427f6 100644
--- a/src/clicache/src/CqQuery.hpp
+++ b/src/clicache/src/CqQuery.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic<class TResult>
       interface class ICqResults;
 
@@ -186,8 +185,7 @@ namespace Generic
         inline CqQuery( apache::geode::client::CqQuery* nativeptr )
           : SBWrap( nativeptr ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqServiceStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqServiceStatistics.cpp b/src/clicache/src/CqServiceStatistics.cpp
index f2dd044..4f7d130 100644
--- a/src/clicache/src/CqServiceStatistics.cpp
+++ b/src/clicache/src/CqServiceStatistics.cpp
@@ -25,8 +25,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
 	uint32_t CqServiceStatistics::numCqsActive( )
 	{
 	  return NativePtr->numCqsActive( );
@@ -46,8 +45,8 @@ namespace Generic
     uint32_t CqServiceStatistics::numCqsOnClient( )
 	{
 	  return NativePtr->numCqsOnClient( );
-	}
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqServiceStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqServiceStatistics.hpp b/src/clicache/src/CqServiceStatistics.hpp
index 286a0d1..7f060cb 100644
--- a/src/clicache/src/CqServiceStatistics.hpp
+++ b/src/clicache/src/CqServiceStatistics.hpp
@@ -28,8 +28,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Defines common statistical information for cqservice 
@@ -96,8 +94,7 @@ namespace Generic
         inline CqServiceStatistics( apache::geode::client::CqServiceStatistics* nativeptr )
           : SBWrap( nativeptr ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqState.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqState.cpp b/src/clicache/src/CqState.cpp
index 8d7bdbf..d6af0c1 100644
--- a/src/clicache/src/CqState.cpp
+++ b/src/clicache/src/CqState.cpp
@@ -29,8 +29,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       String^ CqState::ToString()
       {
@@ -87,9 +85,8 @@ namespace Generic
 		else
 			state = CqStateType::INVALID;
 		return state;
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqState.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqState.hpp b/src/clicache/src/CqState.hpp
index fd3d065..11c5113 100644
--- a/src/clicache/src/CqState.hpp
+++ b/src/clicache/src/CqState.hpp
@@ -29,8 +29,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Enumerated type for cq state
@@ -93,8 +91,7 @@ namespace Generic
 		            : UMWrap( nativeptr, false ) { }
 
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqStatistics.cpp b/src/clicache/src/CqStatistics.cpp
index 696ae5f..b3e0aad 100644
--- a/src/clicache/src/CqStatistics.cpp
+++ b/src/clicache/src/CqStatistics.cpp
@@ -25,8 +25,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
 		uint32_t CqStatistics::numInserts( )
 	{
 	  return NativePtr->numInserts( );
@@ -42,8 +41,8 @@ namespace Generic
     uint32_t CqStatistics::numEvents( )
 	{
 	  return NativePtr->numEvents( );
-	}
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/CqStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqStatistics.hpp b/src/clicache/src/CqStatistics.hpp
index 5b5355d..043a085 100644
--- a/src/clicache/src/CqStatistics.hpp
+++ b/src/clicache/src/CqStatistics.hpp
@@ -28,8 +28,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Defines common statistical information for a cq.
@@ -88,8 +86,7 @@ namespace Generic
         inline CqStatistics( apache::geode::client::CqStatistics* nativeptr )
           : SBWrap( nativeptr ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DataInput.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataInput.cpp b/src/clicache/src/DataInput.cpp
index 7de8f6c..d2614d2 100644
--- a/src/clicache/src/DataInput.cpp
+++ b/src/clicache/src/DataInput.cpp
@@ -45,8 +45,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
         DataInput::DataInput( uint8_t* buffer, int size )
         {
           m_ispdxDesrialization = false;
@@ -1086,9 +1085,9 @@ namespace Generic
           else 
           {
             return ReadUTFHuge();
-          }
-				}
-      } // end namespace generic
-    }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
   }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DataInput.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataInput.hpp b/src/clicache/src/DataInput.hpp
index ccce9fa..198a762 100644
--- a/src/clicache/src/DataInput.hpp
+++ b/src/clicache/src/DataInput.hpp
@@ -34,8 +34,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
       interface class IGFSerializable;
 
@@ -44,7 +42,7 @@ namespace Generic
       /// strings, <c>IGFSerializable</c> objects from a byte stream.
       /// </summary>
       public ref class DataInput sealed
-				: public Generic::Internal::UMWrap<apache::geode::client::DataInput>
+				: public Client::Internal::UMWrap<apache::geode::client::DataInput>
       {
       public:
 
@@ -688,7 +686,7 @@ namespace Generic
       
         void Cleanup( );
       };
-      } // end namespace generic
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DataOutput.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataOutput.cpp b/src/clicache/src/DataOutput.cpp
index 0d901b0..5a16b8e 100644
--- a/src/clicache/src/DataOutput.cpp
+++ b/src/clicache/src/DataOutput.cpp
@@ -34,8 +34,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
 				void DataOutput::WriteByte( Byte value )
 				{
@@ -457,9 +455,9 @@ namespace Generic
            return;
          }
 
-					//Apache::Geode::Client::Generic::Log::Debug("DataOutput::WriteObject " + obj);
+					//Apache::Geode::Client::Log::Debug("DataOutput::WriteObject " + obj);
 
-					Byte typeId = Apache::Geode::Client::Generic::Serializable::GetManagedTypeMappingGeneric(obj->GetType());
+					Byte typeId = Apache::Geode::Client::Serializable::GetManagedTypeMappingGeneric(obj->GetType());
 
 					switch(typeId)
 					{
@@ -872,8 +870,8 @@ namespace Generic
 				void DataOutput::WriteDoubleArray(array<double>^ doubleArray)
 				{
 					WriteObject<double>(doubleArray);
-				}
-      } // end namespace generic
-    }
-  }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DataOutput.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DataOutput.hpp b/src/clicache/src/DataOutput.hpp
index ed4ab35..a4034df 100644
--- a/src/clicache/src/DataOutput.hpp
+++ b/src/clicache/src/DataOutput.hpp
@@ -39,8 +39,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
       interface class IGFSerializable;
 
@@ -50,7 +48,7 @@ namespace Generic
       /// This class is intentionally not thread safe.
       /// </summary>
       public ref class DataOutput sealed
-				: public Generic::Internal::UMWrap<apache::geode::client::DataOutput>
+				: public Client::Internal::UMWrap<apache::geode::client::DataOutput>
       {
       private:
         int32_t m_cursor;
@@ -603,7 +601,7 @@ namespace Generic
           m_ispdxSerialization = false;
         }
       };
-      } // end namespace generic
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DiskPolicyType.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DiskPolicyType.hpp b/src/clicache/src/DiskPolicyType.hpp
index f131066..051e123 100644
--- a/src/clicache/src/DiskPolicyType.hpp
+++ b/src/clicache/src/DiskPolicyType.hpp
@@ -31,8 +31,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Enumerated type for disk policy.
@@ -81,9 +79,8 @@ namespace Generic
         //  return (type == DiskPolicyType::Persist);
         //}
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.cpp b/src/clicache/src/DistributedSystem.cpp
index 8191d63..40e942a 100644
--- a/src/clicache/src/DistributedSystem.cpp
+++ b/src/clicache/src/DistributedSystem.cpp
@@ -127,8 +127,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
       DistributedSystem^ DistributedSystem::Connect(String^ name)
       {
         return DistributedSystem::Connect(name, nullptr);
@@ -573,12 +572,12 @@ namespace Generic
               
           /*  Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::PdxType,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Generic::Internal::PdxType::CreateDeserializable),
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::PdxType::CreateDeserializable),
               nullptr);*/
 
             Serializable::RegisterTypeGeneric(
               apache::geode::client::GemfireTypeIds::EnumInfo,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Generic::Internal::EnumInfo::CreateDeserializable),
+              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::EnumInfo::CreateDeserializable),
               nullptr);
           
           // End register generic wrapper types for built-in types
@@ -755,7 +754,7 @@ namespace Generic
         Create(apache::geode::client::DistributedSystem::getInstance().ptr());
 
         // Register managed AppDomain context with unmanaged.
-        apache::geode::client::createAppDomainContext = &Apache::Geode::Client::Generic::createAppDomainContext;
+        apache::geode::client::createAppDomainContext = &Apache::Geode::Client::createAppDomainContext;
       }
 
       void DistributedSystem::UnregisterBuiltinManagedTypes()
@@ -804,12 +803,12 @@ namespace Generic
         }
       }
 
-      Apache::Geode::Client::Generic::SystemProperties^ DistributedSystem::SystemProperties::get()
+      Apache::Geode::Client::SystemProperties^ DistributedSystem::SystemProperties::get()
       {
         _GF_MG_EXCEPTION_TRY2
 
           //  TODO
-					return Apache::Geode::Client::Generic::SystemProperties::Create(
+					return Apache::Geode::Client::SystemProperties::Create(
             apache::geode::client::DistributedSystem::getSystemProperties());
             
          //return nullptr;
@@ -905,8 +904,8 @@ namespace Generic
       void DistributedSystem::unregisterCliCallback()
       {
         apache::geode::client::DistributedSystemImpl::unregisterCliCallback( System::Threading::Thread::GetDomainID());
-      }
-      } // end namespace generic
-    }
-  }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/DistributedSystem.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.hpp b/src/clicache/src/DistributedSystem.hpp
index f69f112..381c402 100644
--- a/src/clicache/src/DistributedSystem.hpp
+++ b/src/clicache/src/DistributedSystem.hpp
@@ -32,8 +32,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
       /// <summary>
       /// DistributedSystem encapsulates this applications "connection" into the
       /// GemFire Java servers.
@@ -44,7 +43,7 @@ namespace Generic
       /// DistributedSystem.
       /// </remarks>
       public ref class DistributedSystem sealed
-				: public Generic::Internal::SBWrap<apache::geode::client::DistributedSystem>
+				: public Client::Internal::SBWrap<apache::geode::client::DistributedSystem>
       {
       public:
 
@@ -91,9 +90,9 @@ namespace Generic
         /// <c>DistributedSystem</c>.
         /// </summary>
         /// <returns>the SystemProperties</returns>
-        static property Apache::Geode::Client::Generic::SystemProperties^ SystemProperties
+        static property Apache::Geode::Client::SystemProperties^ SystemProperties
         {
-          static Apache::Geode::Client::Generic::SystemProperties^ get( );
+          static Apache::Geode::Client::SystemProperties^ get( );
         }
 
         /// <summary>
@@ -212,7 +211,7 @@ namespace Generic
 
         static CliCallbackDelegate^ m_cliCallBackObj;
       };
-      } // end namespace generic
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/EntryEvent.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/EntryEvent.cpp b/src/clicache/src/EntryEvent.cpp
index baca33d..bbe3191 100644
--- a/src/clicache/src/EntryEvent.cpp
+++ b/src/clicache/src/EntryEvent.cpp
@@ -28,8 +28,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TKey, class TValue>
       EntryEvent<TKey, TValue>::EntryEvent(IRegion<TKey, TValue>^ region,
@@ -54,7 +52,7 @@ namespace Generic
       IRegion<TKey, TValue>^ EntryEvent<TKey, TValue>::Region::get( )
       {
         apache::geode::client::RegionPtr& regionptr( NativePtr->getRegion( ) );
-        return Generic::Region<TKey, TValue>::Create( regionptr.ptr( ) );
+        return Client::Region<TKey, TValue>::Create( regionptr.ptr( ) );
       }
 
       generic<class TKey, class TValue>
@@ -89,9 +87,8 @@ namespace Generic
       bool EntryEvent<TKey, TValue>::RemoteOrigin::get( )
       {
         return NativePtr->remoteOrigin( );
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/EntryEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/EntryEvent.hpp b/src/clicache/src/EntryEvent.hpp
index 3be6e4d..b5cb069 100644
--- a/src/clicache/src/EntryEvent.hpp
+++ b/src/clicache/src/EntryEvent.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
         interface class IGFSerializable;
 
      // ref class Region;
@@ -118,8 +117,7 @@ namespace Generic
           : Internal::UMWrap<apache::geode::client::EntryEvent>(
             const_cast<apache::geode::client::EntryEvent*>( nativeptr ), false ) { }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ExceptionTypes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.cpp b/src/clicache/src/ExceptionTypes.cpp
index 9c739fc..805a62c 100644
--- a/src/clicache/src/ExceptionTypes.cpp
+++ b/src/clicache/src/ExceptionTypes.cpp
@@ -27,8 +27,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
 #define _GF_MG_EXCEPTION_ADD3(x) { "apache::geode::client::" #x, gcnew CreateException2( x::Create ) }
 #define _GF_MG_EXCEPTION_ADD4(x,y) { "apache::geode::client::" #y, gcnew CreateException2( x::Create ) }
@@ -143,10 +141,10 @@ namespace Generic
                       gcnew array<Object^>{ mgMsg, innerException }));
                 if ( mgEx != nullptr ) {
                   return mgEx;
-                }
-              }
-            }
-          }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
         }
         if (innerException == nullptr) {
           return gcnew GemFireException(exName + ": " + exMsg,

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ExceptionTypes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.hpp b/src/clicache/src/ExceptionTypes.hpp
index 090a93c..8094619 100644
--- a/src/clicache/src/ExceptionTypes.hpp
+++ b/src/clicache/src/ExceptionTypes.hpp
@@ -32,8 +32,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
       ref class GemFireException;
 
@@ -273,7 +271,7 @@ namespace Generic
 #define _GF_MG_EXCEPTION_CATCH_ALL2  \
       } \
       catch (const apache::geode::client::Exception& ex) { \
-      throw Apache::Geode::Client::Generic::GemFireException::Get(ex); \
+      throw Apache::Geode::Client::GemFireException::Get(ex); \
       } \
       catch (System::AccessViolationException^ ex) { \
         throw ex; \
@@ -679,8 +677,7 @@ namespace Generic
       /// Thrown if commit rebalance happens during a transaction.
       /// </summary>
       _GF_MG_EXCEPTION_DEF3( TransactionDataRebalancedException );
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-      } // end namespace Generic
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/Execution.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Execution.cpp b/src/clicache/src/Execution.cpp
index 53feacb..fdf6b98 100644
--- a/src/clicache/src/Execution.cpp
+++ b/src/clicache/src/Execution.cpp
@@ -34,8 +34,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TResult>
       generic<class TFilter>
@@ -70,7 +68,7 @@ namespace Generic
       }
 
       generic<class TResult>
-      Execution<TResult>^ Execution<TResult>::WithCollector(Generic::IResultCollector<TResult>^ rc)
+      Execution<TResult>^ Execution<TResult>::WithCollector(Client::IResultCollector<TResult>^ rc)
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
           apache::geode::client::ResultCollectorPtr rcptr;
@@ -102,8 +100,8 @@ namespace Generic
       IResultCollector<TResult>^ Execution<TResult>::Execute(String^ func)
       {
         return Execute(func, DEFAULT_QUERY_RESPONSE_TIMEOUT);
-      }
-    }
-    }
-  }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
 } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/Execution.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Execution.hpp b/src/clicache/src/Execution.hpp
index 173a56f..c821776 100644
--- a/src/clicache/src/Execution.hpp
+++ b/src/clicache/src/Execution.hpp
@@ -30,9 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-//interface class IGFSerializable;
-      namespace Generic
-    {
+
       generic<class TResult>
       interface class IResultCollector;
 
@@ -105,8 +103,7 @@ namespace Apache
       private:
         IResultCollector<TResult>^ m_rc;
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ExpirationAction.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExpirationAction.hpp b/src/clicache/src/ExpirationAction.hpp
index d0ae932..f5ccd10 100644
--- a/src/clicache/src/ExpirationAction.hpp
+++ b/src/clicache/src/ExpirationAction.hpp
@@ -31,8 +31,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// Enumerated type for expiration (LRU) actions.
@@ -130,9 +128,8 @@ namespace Generic
             (type == ExpirationAction::Destroy);
         }
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/FunctionService.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/FunctionService.cpp b/src/clicache/src/FunctionService.cpp
index 62bd9b4..6442151 100644
--- a/src/clicache/src/FunctionService.cpp
+++ b/src/clicache/src/FunctionService.cpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic <class TResult>
       generic <class TKey, class TValue>
       Execution<TResult>^ FunctionService<TResult>::OnRegion( IRegion<TKey, TValue>^ rg )
@@ -41,7 +40,7 @@ namespace Generic
           
           IRegion<TKey, TValue>^ regImpl = safe_cast<IRegion<TKey, TValue>^>( rg);
 
-        apache::geode::client::RegionPtr regionptr(GetNativePtrFromSBWrapGeneric((Generic::Region<TKey, TValue>^)regImpl));
+        apache::geode::client::RegionPtr regionptr(GetNativePtrFromSBWrapGeneric((Client::Region<TKey, TValue>^)regImpl));
 
           apache::geode::client::ExecutionPtr& nativeptr( apache::geode::client::FunctionService::onRegion(
             regionptr ) );
@@ -82,8 +81,8 @@ namespace Generic
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
-          Apache::Geode::Client::Generic::Cache^ realCache =
-            dynamic_cast<Apache::Geode::Client::Generic::Cache^>(cache);
+          Apache::Geode::Client::Cache^ realCache =
+            dynamic_cast<Apache::Geode::Client::Cache^>(cache);
 
         if(realCache != nullptr)
         {
@@ -95,8 +94,8 @@ namespace Generic
         }
         else
         {
-          Apache::Geode::Client::Generic::AuthenticatedCache^ authCache =
-            dynamic_cast<Apache::Geode::Client::Generic::AuthenticatedCache^>(cache);
+          Apache::Geode::Client::AuthenticatedCache^ authCache =
+            dynamic_cast<Apache::Geode::Client::AuthenticatedCache^>(cache);
           apache::geode::client::RegionServicePtr cacheptr(GetNativePtr<apache::geode::client::RegionService>( authCache ) );
 
             apache::geode::client::ExecutionPtr& nativeptr( apache::geode::client::FunctionService::onServer(
@@ -113,8 +112,8 @@ namespace Generic
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
-          Apache::Geode::Client::Generic::Cache^ realCache =
-          dynamic_cast<Apache::Geode::Client::Generic::Cache^>(cache);
+          Apache::Geode::Client::Cache^ realCache =
+          dynamic_cast<Apache::Geode::Client::Cache^>(cache);
 
           if(realCache != nullptr)
           {
@@ -126,8 +125,8 @@ namespace Generic
           }
           else
           {
-            Apache::Geode::Client::Generic::AuthenticatedCache^ authCache =
-              dynamic_cast<Apache::Geode::Client::Generic::AuthenticatedCache^>(cache);
+            Apache::Geode::Client::AuthenticatedCache^ authCache =
+              dynamic_cast<Apache::Geode::Client::AuthenticatedCache^>(cache);
             apache::geode::client::RegionServicePtr cacheptr(GetNativePtr<apache::geode::client::RegionService>( authCache ) );
 
             apache::geode::client::ExecutionPtr& nativeptr( apache::geode::client::FunctionService::onServers(
@@ -136,8 +135,8 @@ namespace Generic
           }
 
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
-      }
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
  } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/FunctionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/FunctionService.hpp b/src/clicache/src/FunctionService.hpp
index 430afaa..b63bc59 100644
--- a/src/clicache/src/FunctionService.hpp
+++ b/src/clicache/src/FunctionService.hpp
@@ -31,8 +31,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
     //  generic<class TKey, class TValue>
       ref class Pool;
      
@@ -104,8 +103,7 @@ namespace Generic
           : SBWrap( nativeptr ) { }
 
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/GemFireClassIds.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/GemFireClassIds.hpp b/src/clicache/src/GemFireClassIds.hpp
index b76fa8b..03973e2 100644
--- a/src/clicache/src/GemFireClassIds.hpp
+++ b/src/clicache/src/GemFireClassIds.hpp
@@ -29,8 +29,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
 			struct PdxTypes
       {
@@ -364,9 +362,8 @@ namespace Generic
   
         literal Byte DATE_SIZE = 8;
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IAuthInitialize.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IAuthInitialize.hpp b/src/clicache/src/IAuthInitialize.hpp
index de926af..17b92d4 100644
--- a/src/clicache/src/IAuthInitialize.hpp
+++ b/src/clicache/src/IAuthInitialize.hpp
@@ -29,8 +29,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// Specifies the mechanism to obtain credentials for a client.
       /// It is mandantory for clients when the server is running in secure
@@ -78,7 +77,7 @@ namespace Generic
         void Close();
 
       };
-    }
-  }
-}
- } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICacheListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheListener.hpp b/src/clicache/src/ICacheListener.hpp
index 3c6e3b8..f87cf38 100644
--- a/src/clicache/src/ICacheListener.hpp
+++ b/src/clicache/src/ICacheListener.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// An application plug-in that can be installed on a region.
       /// </summary>
@@ -205,8 +204,7 @@ namespace Generic
         ///</param>
         void AfterRegionDisconnected( IRegion<TKey, TValue>^ region );
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheLoader.hpp b/src/clicache/src/ICacheLoader.hpp
index 6a54b9d..aabd64f 100644
--- a/src/clicache/src/ICacheLoader.hpp
+++ b/src/clicache/src/ICacheLoader.hpp
@@ -29,8 +29,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       //interface class ICacheableKey;
 
       /// <summary>
@@ -110,8 +109,7 @@ namespace Generic
         /// <seealso cref="Region.DestroyRegion" />
         void Close( IRegion<TKey, TValue>^ region );
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICacheWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheWriter.hpp b/src/clicache/src/ICacheWriter.hpp
index d3e78c1..0ff6be5 100644
--- a/src/clicache/src/ICacheWriter.hpp
+++ b/src/clicache/src/ICacheWriter.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// An application plug-in that can be installed on a region.
       /// Defines methods that are called <b>before</b> entry modification,
@@ -167,8 +166,7 @@ namespace Generic
         /// <seealso cref="Region.DestroyRegion" />
         void Close( IRegion<TKey, TValue>^ region );
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICacheableKey.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICacheableKey.hpp b/src/clicache/src/ICacheableKey.hpp
index eb04a68..13f85b7 100644
--- a/src/clicache/src/ICacheableKey.hpp
+++ b/src/clicache/src/ICacheableKey.hpp
@@ -29,8 +29,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       /// <summary>
       /// This interface class is the superclass of all user objects 
@@ -64,8 +62,7 @@ namespace Generic
         /// </summary>
         bool Equals( ICacheableKey^ other );
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqAttributes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqAttributes.hpp b/src/clicache/src/ICqAttributes.hpp
index 5e15ded..b2ba5a9 100644
--- a/src/clicache/src/ICqAttributes.hpp
+++ b/src/clicache/src/ICqAttributes.hpp
@@ -26,8 +26,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       interface class CqListener;
 
@@ -112,8 +110,7 @@ namespace Generic
         /// <seealso cref="Region.DestroyRegion" />
         void Close();
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqEvent.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqEvent.hpp b/src/clicache/src/ICqEvent.hpp
index 89f4d25..f4e2bb2 100644
--- a/src/clicache/src/ICqEvent.hpp
+++ b/src/clicache/src/ICqEvent.hpp
@@ -27,9 +27,7 @@ namespace Apache
   {
     namespace Client
     {
-//ref class CqOperationType;
-      namespace Generic
-    {
+
 			 interface class IGFSerializable;
        
 
@@ -116,8 +114,7 @@ namespace Apache
 
         TResult /*Object^*/ getNewValue();
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqListener.hpp b/src/clicache/src/ICqListener.hpp
index e0350dd..2791aef 100644
--- a/src/clicache/src/ICqListener.hpp
+++ b/src/clicache/src/ICqListener.hpp
@@ -26,8 +26,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TKey, class TResult>
       ref class CqEvent;
@@ -116,8 +114,7 @@ namespace Generic
         /// <seealso cref="Region.DestroyRegion" />
         void Close();
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqResults.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqResults.hpp b/src/clicache/src/ICqResults.hpp
index 31cad15..481b5d5 100644
--- a/src/clicache/src/ICqResults.hpp
+++ b/src/clicache/src/ICqResults.hpp
@@ -31,8 +31,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TResult>
       ref class SelectResultsIterator;
@@ -45,8 +43,7 @@ namespace Generic
         : public ISelectResults<TResult>
       {
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ICqStatusListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ICqStatusListener.hpp b/src/clicache/src/ICqStatusListener.hpp
index 8f6e189..d572903 100644
--- a/src/clicache/src/ICqStatusListener.hpp
+++ b/src/clicache/src/ICqStatusListener.hpp
@@ -28,8 +28,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
         /// <summary>
         /// Extension of CqListener. Adds two new methods to CqListener, one that
@@ -53,7 +51,7 @@ namespace Generic
           virtual void OnCqConnected(); 
 
         };
-      }
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IFixedPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IFixedPartitionResolver.hpp b/src/clicache/src/IFixedPartitionResolver.hpp
index fc24007..7ed58a1 100644
--- a/src/clicache/src/IFixedPartitionResolver.hpp
+++ b/src/clicache/src/IFixedPartitionResolver.hpp
@@ -28,10 +28,8 @@ namespace Apache
   {
     namespace Client
     {
-ref class EntryEvent;
+
       interface class IGFSerializable;
-      namespace Generic
-      {
         /// <summary>
         /// Implementers of interface <code>FixedPartitionResolver</code> helps to
         /// achieve explicit mapping of a "user defined" partition to a data member node.
@@ -92,8 +90,7 @@ ref class EntryEvent;
          /// </return>         
           String^ GetPartitionName(EntryEvent<TKey, TValue>^ opDetails);
         };
-      }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IGFDelta.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGFDelta.hpp b/src/clicache/src/IGFDelta.hpp
index 6098a9f..759b41e 100644
--- a/src/clicache/src/IGFDelta.hpp
+++ b/src/clicache/src/IGFDelta.hpp
@@ -25,8 +25,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       ref class DataOutput;
       ref class DataInput;
@@ -74,8 +72,7 @@ namespace Generic
         /// </summary>
         bool HasDelta( );
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IGFSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGFSerializable.hpp b/src/clicache/src/IGFSerializable.hpp
index 2143b93..49d3e20 100644
--- a/src/clicache/src/IGFSerializable.hpp
+++ b/src/clicache/src/IGFSerializable.hpp
@@ -28,8 +28,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
       ref class DataOutput;
       ref class DataInput;
@@ -99,7 +97,7 @@ namespace Generic
         /// </summary>
         String^ ToString( );
       };
-      } // end namespace generic
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IGemFireCache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IGemFireCache.hpp b/src/clicache/src/IGemFireCache.hpp
index 795bc68..8e87955 100644
--- a/src/clicache/src/IGemFireCache.hpp
+++ b/src/clicache/src/IGemFireCache.hpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
       /// <summary>
       /// GemFireCache represents the singleton cache that must be created
       /// in order to connect to Gemfire server.
@@ -83,16 +82,16 @@ namespace Generic
         /// </remarks>
         property DistributedSystem^ DistributedSystem
         {
-          Apache::Geode::Client::Generic::DistributedSystem^ get( );
+          Apache::Geode::Client::DistributedSystem^ get( );
         } 
 
         /// <summary>
         /// Returns the cache transaction manager of
         /// <see cref="CacheFactory.Create" /> this cache.
         /// </summary>
-        property Apache::Geode::Client::Generic::CacheTransactionManager^ CacheTransactionManager
+        property Apache::Geode::Client::CacheTransactionManager^ CacheTransactionManager
         {
-          Apache::Geode::Client::Generic::CacheTransactionManager^ get( );
+          Apache::Geode::Client::CacheTransactionManager^ get( );
         }
 
 				///<summary>
@@ -105,7 +104,7 @@ namespace Generic
         ///</summary>
         bool GetPdxReadSerialized();
       };
-      } // end namespace Generic      
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPartitionResolver.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPartitionResolver.hpp b/src/clicache/src/IPartitionResolver.hpp
index 4fdcb40..b693311 100644
--- a/src/clicache/src/IPartitionResolver.hpp
+++ b/src/clicache/src/IPartitionResolver.hpp
@@ -28,8 +28,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
         interface class IGFSerializable;
 
 
@@ -103,8 +102,7 @@ namespace Generic
 
         Object^ GetRoutingObject(EntryEvent<TKey, TValue>^ key) ;
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxInstance.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxInstance.hpp b/src/clicache/src/IPdxInstance.hpp
index 0e8f198..dee3cd0 100755
--- a/src/clicache/src/IPdxInstance.hpp
+++ b/src/clicache/src/IPdxInstance.hpp
@@ -25,9 +25,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{         
-			
+
          /// <summary>
          ///PdxInstance provides run time access to the fields of a PDX without 
          ///deserializing the PDX. Preventing deserialization saves time
@@ -181,8 +179,7 @@ namespace Generic
            IWritablePdxInstance^ CreateWriter();
 
         };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-			}
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxInstanceFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxInstanceFactory.hpp b/src/clicache/src/IPdxInstanceFactory.hpp
index 0bcebd9..64f9d18 100644
--- a/src/clicache/src/IPdxInstanceFactory.hpp
+++ b/src/clicache/src/IPdxInstanceFactory.hpp
@@ -25,9 +25,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{         
-			
+
         /// <summary>
         /// PdxInstanceFactory gives you a way to create PdxInstances.
         /// Call the write methods to populate the field data and then call <see cref="Create"/>
@@ -342,8 +340,7 @@ namespace Generic
          IPdxInstanceFactory^ MarkIdentityField(String^ fieldName);
 
         };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-			}
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxReader.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxReader.hpp b/src/clicache/src/IPdxReader.hpp
index 96df19e..e5a36ec 100644
--- a/src/clicache/src/IPdxReader.hpp
+++ b/src/clicache/src/IPdxReader.hpp
@@ -26,8 +26,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{
+
 				/// <summary>
 				/// A IPdxReader will be passed to IPdxSerializable.fromData or 
 				/// during deserialization of a PDX. The domain class needs to deserialize field members 
@@ -206,7 +205,7 @@ namespace Generic
           /// <param name="type">The type of a member field, which value needs to read.</param>
           Object^ ReadField(String^ fieldName, Type^ type);
 				};
-			}
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxSerializable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxSerializable.hpp b/src/clicache/src/IPdxSerializable.hpp
index 3f1a8e2..caca571 100644
--- a/src/clicache/src/IPdxSerializable.hpp
+++ b/src/clicache/src/IPdxSerializable.hpp
@@ -27,8 +27,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{      
+
 				/// <summary>
 				/// When a domain class implements PdxSerializable it marks 
 				/// itself as a PDX. 
@@ -62,7 +61,7 @@ namespace Generic
 					void FromData( IPdxReader^ reader );
 
 				};
-			}
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxSerializer.hpp b/src/clicache/src/IPdxSerializer.hpp
index 6676b48..b125ce7 100755
--- a/src/clicache/src/IPdxSerializer.hpp
+++ b/src/clicache/src/IPdxSerializer.hpp
@@ -27,8 +27,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{      
+
 				/// <summary>
 				/// The IPdxSerializer interface allows domain classes to be 
         /// serialized and deserialized as PDXs without modification 
@@ -63,7 +62,7 @@ namespace Generic
 					Object^ FromData(String^ classname, IPdxReader^ reader );
 
 				};
-			}
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxTypeMapper.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxTypeMapper.hpp b/src/clicache/src/IPdxTypeMapper.hpp
index 6530946..f2b5fd6 100755
--- a/src/clicache/src/IPdxTypeMapper.hpp
+++ b/src/clicache/src/IPdxTypeMapper.hpp
@@ -24,9 +24,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{         
-			
+
          /// <summary>
          /// Application can implement this interface to map pdx type name to local type name.
         /// Need to set this using <see cref="Serializable.SetPdxTypeMapper" />
@@ -48,8 +46,7 @@ namespace Generic
            /// </summary>          
             String^ FromPdxTypeName(String^ pdxTypeName);
         };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-			}
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxUnreadFields.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxUnreadFields.hpp b/src/clicache/src/IPdxUnreadFields.hpp
index 5986437..a9d9ba3 100644
--- a/src/clicache/src/IPdxUnreadFields.hpp
+++ b/src/clicache/src/IPdxUnreadFields.hpp
@@ -24,8 +24,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{     
+
 				/// <summary>
 				/// Serialize the data in gemfire Portable Data eXchange(Pdx) Format.
 				/// This format provides class versioning(forward and backward compability of types) in cache.
@@ -35,7 +34,7 @@ namespace Generic
 				{
 
 				};
-			}
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPdxWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPdxWriter.hpp b/src/clicache/src/IPdxWriter.hpp
index 16a1fa6..af854d2 100644
--- a/src/clicache/src/IPdxWriter.hpp
+++ b/src/clicache/src/IPdxWriter.hpp
@@ -28,8 +28,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{     
+
 				/// <summary>
 				/// A IPdxWriter will be passed to IPdxSerializable.toData
 				/// when it is serializing the domain class. The domain class needs to serialize member 
@@ -242,7 +241,7 @@ namespace Generic
 					/// <returns>this PdxWriter</returns>
           IPdxWriter^ WriteField(String^ fieldName, Object^ fieldValue, Type^ type);
 				};
-			}
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IPersistenceManager.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IPersistenceManager.hpp b/src/clicache/src/IPersistenceManager.hpp
index e175dc7..36b3f1f 100644
--- a/src/clicache/src/IPersistenceManager.hpp
+++ b/src/clicache/src/IPersistenceManager.hpp
@@ -28,8 +28,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
 
          /// <summary>
         /// IPersistenceManager interface for persistence and overflow. 
@@ -102,7 +100,7 @@ namespace Generic
           void Close();
 
         };
-      }
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IRegion.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IRegion.hpp b/src/clicache/src/IRegion.hpp
index a3ed6a1..f3dc502 100644
--- a/src/clicache/src/IRegion.hpp
+++ b/src/clicache/src/IRegion.hpp
@@ -27,7 +27,7 @@ using namespace System::Collections::Generic;
 
 /*
 using namespace Apache::Geode::Client;
-using namespace Apache::Geode::Client::Generic;
+using namespace Apache::Geode::Client;
 */
 
 namespace Apache
@@ -36,8 +36,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       ref class Cache;
       ref class CacheStatistics;
       //interface class IGFSerializable;
@@ -1655,7 +1654,7 @@ namespace Generic
           /// </exception>
           property AttributesMutator<TKey, TValue>^ AttributesMutator
           {
-            Apache::Geode::Client::Generic::AttributesMutator<TKey, TValue>^ get();
+            Apache::Geode::Client::AttributesMutator<TKey, TValue>^ get();
           }
 
           /// <summary>
@@ -1709,7 +1708,7 @@ namespace Generic
           /// <exception cref="RegionDestroyedException">
           /// region has been destroyed
           /// </exception>
-          Generic::RegionEntry<TKey, TValue>^ GetEntry( TKey key );
+          Client::RegionEntry<TKey, TValue>^ GetEntry( TKey key );
 
           /// <summary>
           /// Gets the entries in this region.
@@ -1719,15 +1718,15 @@ namespace Generic
           /// if true, also return all nested subregion entries
           /// </param>
           /// <returns>collection of entries</returns>
-          System::Collections::Generic::ICollection<Generic::RegionEntry<TKey, TValue>^>^ GetEntries(bool recursive);
+          System::Collections::Generic::ICollection<Client::RegionEntry<TKey, TValue>^>^ GetEntries(bool recursive);
 
           /// <summary>
           /// Gets the RegionService for this region.
           /// </summary>
           /// <returns>RegionService</returns>
-          property Apache::Geode::Client::Generic::IRegionService^ RegionService
+          property Apache::Geode::Client::IRegionService^ RegionService
           {
-            Apache::Geode::Client::Generic::IRegionService^ get( );
+            Apache::Geode::Client::IRegionService^ get( );
           }
 
           /// <summary>
@@ -2069,8 +2068,7 @@ namespace Generic
           Object^ SelectValue( String^ predicate, uint32_t timeout );
 
       };
-
-    }
-  }
-}
-} //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+ //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IRegionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IRegionService.hpp b/src/clicache/src/IRegionService.hpp
index 708a284..d09685d 100644
--- a/src/clicache/src/IRegionService.hpp
+++ b/src/clicache/src/IRegionService.hpp
@@ -33,8 +33,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
       interface class IPdxInstanceFactory;
       /// <summary>
       /// A RegionService provides access to existing regions that exist
@@ -103,7 +102,7 @@ namespace Generic
         /// before actually firing a query.
         /// </remarks>
         generic<class TKey, class TResult>
-        Generic::QueryService<TKey, TResult>^ GetQueryService();
+        Client::QueryService<TKey, TResult>^ GetQueryService();
         /// <summary>
         /// Returns an array of root regions in the cache. This set is a
         /// snapshot and is not backed by the cache.
@@ -123,7 +122,7 @@ namespace Generic
         /// </summary>
         IPdxInstanceFactory^ CreatePdxInstanceFactory(String^ className);
       };
-      } // end namespace Generic
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IResultCollector.hpp b/src/clicache/src/IResultCollector.hpp
index 1da4846..3adc048 100644
--- a/src/clicache/src/IResultCollector.hpp
+++ b/src/clicache/src/IResultCollector.hpp
@@ -27,8 +27,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
 			 interface class IGFSerializable;
       /*
       generic<class TKey>
@@ -75,8 +74,7 @@ namespace Generic
   void ClearResults(/*bool*/);
 
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ISelectResults.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ISelectResults.hpp b/src/clicache/src/ISelectResults.hpp
index 378ff82..0b9fa4e 100644
--- a/src/clicache/src/ISelectResults.hpp
+++ b/src/clicache/src/ISelectResults.hpp
@@ -30,8 +30,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
 
       generic<class TResult>
       ref class SelectResultsIterator;
@@ -64,18 +62,17 @@ namespace Generic
         /// <summary>
         /// Get an object at the given index.
         /// </summary>
-        property /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult GFINDEXER( size_t )
+        property /*Apache::Geode::Client::IGFSerializable^*/TResult GFINDEXER( size_t )
         {
-          /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult get( size_t index );
+          /*Apache::Geode::Client::IGFSerializable^*/TResult get( size_t index );
         }
 
         /// <summary>
         /// Get an iterator for the result set.
         /// </summary>
-        Apache::Geode::Client::Generic::SelectResultsIterator<TResult>^ GetIterator( );
+        Apache::Geode::Client::SelectResultsIterator<TResult>^ GetIterator( );
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ISubscriptionService.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ISubscriptionService.hpp b/src/clicache/src/ISubscriptionService.hpp
index da1e635..79acb4b 100644
--- a/src/clicache/src/ISubscriptionService.hpp
+++ b/src/clicache/src/ISubscriptionService.hpp
@@ -26,8 +26,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic<class TKey>
       /// <summary>
       /// This generic interface class provides all Register Interest API's for 
@@ -621,10 +620,7 @@ namespace Generic
           void UnregisterRegex( String^ regex );
 
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-
-  }
-
-}
- } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ITransactionListener.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ITransactionListener.hpp b/src/clicache/src/ITransactionListener.hpp
index 1b04fe0..dfa3ee9 100644
--- a/src/clicache/src/ITransactionListener.hpp
+++ b/src/clicache/src/ITransactionListener.hpp
@@ -27,8 +27,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       /// <summary>
       /// An application plug-in that can be installed for getting events for 
       /// cache transactions. 
@@ -77,9 +76,8 @@ namespace Generic
         /// <seealso cref="Region.DestroyRegion" />
         void Close();
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 
 #endif
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/ITransactionWriter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ITransactionWriter.hpp b/src/clicache/src/ITransactionWriter.hpp
index 7889445..bb41fff 100644
--- a/src/clicache/src/ITransactionWriter.hpp
+++ b/src/clicache/src/ITransactionWriter.hpp
@@ -27,8 +27,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{
+
 				/// <summary>
 				/// A callback that is allowed to veto a transaction. Only one TransactionWriter can exist
 				/// per cache, and only one TransactionWriter will be fired in the
@@ -55,9 +54,8 @@ namespace Generic
 					void BeforeCommit(TransactionEvent<TKey, TValue>^ te);
 
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-    }
-  }
-}
- } //namespace 
 #endif

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/IWritablePdxInstance.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/IWritablePdxInstance.hpp b/src/clicache/src/IWritablePdxInstance.hpp
index 51b2058..160ffb8 100755
--- a/src/clicache/src/IWritablePdxInstance.hpp
+++ b/src/clicache/src/IWritablePdxInstance.hpp
@@ -24,8 +24,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{     
+
 				/// <summary>
 	      /// WritablePdxInstance is a <see cref="IPdxInstance" /> that also supports field modification 
         /// using the <see cref="SetField" />method. 
@@ -48,7 +47,7 @@ namespace Generic
           
           void SetField(String^ fieldName, Object^ value);
 				};
-			}
-    }
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/LocalRegion.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/LocalRegion.cpp b/src/clicache/src/LocalRegion.cpp
index fc89957..3040a49 100644
--- a/src/clicache/src/LocalRegion.cpp
+++ b/src/clicache/src/LocalRegion.cpp
@@ -34,8 +34,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic<class TKey, class TValue>
       TValue LocalRegion<TKey, TValue>::Get(TKey key, Object^ callbackArg)
       {
@@ -547,13 +546,13 @@ namespace Generic
       }
 
       generic<class TKey, class TValue>
-      Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ LocalRegion<TKey, TValue>::Attributes::get()
+      Apache::Geode::Client::RegionAttributes<TKey, TValue>^ LocalRegion<TKey, TValue>::Attributes::get()
       { 
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
         apache::geode::client::RegionAttributesPtr& nativeptr( NativePtr->getAttributes( ) );
 
-        return Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr());
+        return Apache::Geode::Client::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr());
 
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
       } 
@@ -566,18 +565,18 @@ namespace Generic
           apache::geode::client::AttributesMutatorPtr& nativeptr(
             NativePtr->getAttributesMutator( ) );
 
-        return Apache::Geode::Client::Generic::AttributesMutator<TKey, TValue>::Create( nativeptr.ptr( ) );
+        return Apache::Geode::Client::AttributesMutator<TKey, TValue>::Create( nativeptr.ptr( ) );
 
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
       }
 
       generic<class TKey, class TValue>
-			Apache::Geode::Client::Generic::CacheStatistics^ LocalRegion<TKey, TValue>::Statistics::get()
+			Apache::Geode::Client::CacheStatistics^ LocalRegion<TKey, TValue>::Statistics::get()
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
         apache::geode::client::CacheStatisticsPtr& nativeptr( NativePtr->getStatistics( ) );
-        return Apache::Geode::Client::Generic::CacheStatistics::Create( nativeptr.ptr( ) );
+        return Apache::Geode::Client::CacheStatistics::Create( nativeptr.ptr( ) );
 
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
       }
@@ -601,7 +600,7 @@ namespace Generic
 
       generic<class TKey, class TValue>
       IRegion<TKey, TValue>^ LocalRegion<TKey, TValue>::CreateSubRegion( String^ subRegionName, 
-        Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ attributes)
+        Apache::Geode::Client::RegionAttributes<TKey, TValue>^ attributes)
       {
         _GF_MG_EXCEPTION_TRY2/* due to auto replace */
 
@@ -686,11 +685,11 @@ namespace Generic
 
           if(realCache != NULL)
           {
-						return Apache::Geode::Client::Generic::Cache::Create( ((apache::geode::client::CachePtr)nativeptr).ptr( ) );
+						return Apache::Geode::Client::Cache::Create( ((apache::geode::client::CachePtr)nativeptr).ptr( ) );
           }
           else
           {
-            return Apache::Geode::Client::Generic::AuthenticatedCache::Create( nativeptr.ptr( ) );
+            return Apache::Geode::Client::AuthenticatedCache::Create( nativeptr.ptr( ) );
           }
           
         _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
@@ -819,7 +818,7 @@ namespace Generic
       IRegion<TKey, TValue>^ LocalRegion<TKey, TValue>::GetLocalView()
       {
         throw gcnew System::NotSupportedException;   
-      }
-    }
-  }
-} } //namespace 
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+ } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/LocalRegion.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/LocalRegion.hpp b/src/clicache/src/LocalRegion.hpp
index e01308e..cdd40c5 100644
--- a/src/clicache/src/LocalRegion.hpp
+++ b/src/clicache/src/LocalRegion.hpp
@@ -34,8 +34,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-    {
+
       generic<class TKey, class TValue>
       ref class RegionEntry;
 
@@ -43,7 +42,7 @@ namespace Generic
       ref class AttributesMutator;
 
       generic<class TKey, class TValue>
-			public ref class LocalRegion : public Generic::Internal::SBWrap<apache::geode::client::Region>, public IRegion<TKey, TValue>  
+			public ref class LocalRegion : public Client::Internal::SBWrap<apache::geode::client::Region>, public IRegion<TKey, TValue>  
       {
       public:
 
@@ -166,12 +165,12 @@ namespace Generic
 
           virtual property AttributesMutator<TKey, TValue>^ AttributesMutator
           {
-            Apache::Geode::Client::Generic::AttributesMutator<TKey, TValue>^ get();
+            Apache::Geode::Client::AttributesMutator<TKey, TValue>^ get();
           }
 
-          virtual property Apache::Geode::Client::Generic::CacheStatistics^ Statistics 
+          virtual property Apache::Geode::Client::CacheStatistics^ Statistics 
           {
-            Apache::Geode::Client::Generic::CacheStatistics^ get();
+            Apache::Geode::Client::CacheStatistics^ get();
           }
 
           virtual IRegion<TKey, TValue>^ GetSubRegion( String^ path );
@@ -185,9 +184,9 @@ namespace Generic
 
           virtual System::Collections::Generic::ICollection<RegionEntry<TKey,TValue>^>^ GetEntries(bool recursive);
 
-          virtual property Apache::Geode::Client::Generic::IRegionService^ RegionService
+          virtual property Apache::Geode::Client::IRegionService^ RegionService
           {
-            Apache::Geode::Client::Generic::IRegionService^ get( );
+            Apache::Geode::Client::IRegionService^ get( );
           }
 
           virtual bool ContainsValueForKey( TKey key );
@@ -244,8 +243,7 @@ namespace Generic
         inline apache::geode::client::SerializablePtr getRegionEntryValue(apache::geode::client::CacheableKeyPtr& key);
         bool AreValuesEqual(apache::geode::client::CacheablePtr& val1, apache::geode::client::CacheablePtr& val2);
       };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
 
-
-    }
-  }
-} } //namespace 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/src/Log.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Log.cpp b/src/clicache/src/Log.cpp
index 683a9bd..08707f6 100644
--- a/src/clicache/src/Log.cpp
+++ b/src/clicache/src/Log.cpp
@@ -30,8 +30,7 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-      {
+
       void Log::Init( LogLevel level, String^ logFileName )
       {
         _GF_MG_EXCEPTION_TRY2
@@ -117,9 +116,9 @@ namespace Generic
             "GemFire exception {0} caught: {1}{2}{3}", ex->GetType( ),
             ex->Message, Environment::NewLine, msg );
           Log::Write( level, logMsg );
-        }
-      }
-      } // end namespace generic
-    }
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
   }
 }


Mime
View raw message