geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [12/18] geode git commit: GEODE-2365: Replace gemfire with geode in clicache.
Date Thu, 02 Feb 2017 22:28:02 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/src/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.cpp b/src/clicache/src/DistributedSystem.cpp
index 7b0acfa..df64dea 100644
--- a/src/clicache/src/DistributedSystem.cpp
+++ b/src/clicache/src/DistributedSystem.cpp
@@ -78,7 +78,7 @@ namespace apache
       public:
 
         static CacheLoader* create(const char* assemblyPath,
-          const char* factoryFunctionName);
+                                   const char* factoryFunctionName);
       };
 
       class ManagedCacheListenerGeneric
@@ -87,7 +87,7 @@ namespace apache
       public:
 
         static CacheListener* create(const char* assemblyPath,
-          const char* factoryFunctionName);
+                                     const char* factoryFunctionName);
       };
 
       class ManagedFixedPartitionResolverGeneric
@@ -96,7 +96,7 @@ namespace apache
       public:
 
         static PartitionResolver* create(const char* assemblyPath,
-          const char* factoryFunctionName);
+                                         const char* factoryFunctionName);
       };
 
       class ManagedCacheWriterGeneric
@@ -105,7 +105,7 @@ namespace apache
       public:
 
         static CacheWriter* create(const char* assemblyPath,
-          const char* factoryFunctionName);
+                                   const char* factoryFunctionName);
       };
 
       class ManagedAuthInitializeGeneric
@@ -114,7 +114,7 @@ namespace apache
       public:
 
         static AuthInitialize* create(const char* assemblyPath,
-          const char* factoryFunctionName);
+                                      const char* factoryFunctionName);
       };
     }  // namespace client
   }  // namespace geode
@@ -141,27 +141,27 @@ namespace Apache
 
           ManagedString mg_name(name);
 
-          apache::geode::client::PropertiesPtr nativepropsptr(
-            GetNativePtr<apache::geode::client::Properties>(config));
-          
-         // apache::geode::client::PropertiesPtr nativepropsptr;
-          DistributedSystem::AppDomainInstanceInitialization(nativepropsptr);
+        apache::geode::client::PropertiesPtr nativepropsptr(
+          GetNativePtr<apache::geode::client::Properties>(config));
 
-          // this we are calling after all .NET initialization required in
-          // each AppDomain
-          apache::geode::client::DistributedSystemPtr& nativeptr(
-            apache::geode::client::DistributedSystem::connect(mg_name.CharPtr,
-            nativepropsptr));
+        // apache::geode::client::PropertiesPtr nativepropsptr;
+        DistributedSystem::AppDomainInstanceInitialization(nativepropsptr);
 
-          ManagedPostConnect();
+        // this we are calling after all .NET initialization required in
+        // each AppDomain
+        apache::geode::client::DistributedSystemPtr& nativeptr(
+          apache::geode::client::DistributedSystem::connect(mg_name.CharPtr,
+          nativepropsptr));
+
+        ManagedPostConnect();
 
-//          DistributedSystem::AppDomainInstancePostInitialization();
+        //          DistributedSystem::AppDomainInstancePostInitialization();
 
-          return Create(nativeptr.ptr());
+        return Create(nativeptr.ptr());
 
         _GF_MG_EXCEPTION_CATCH_ALL2
 
-        finally {
+          finally {
           apache::geode::client::DistributedSystemImpl::releaseDisconnectLock();
         }
       }
@@ -173,437 +173,437 @@ namespace Apache
         _GF_MG_EXCEPTION_TRY2
 
           if (apache::geode::client::DistributedSystem::isConnected()) {
-           // apache::geode::client::CacheImpl::expiryTaskManager->cancelTask(
-             // s_memoryPressureTaskID);
+            // apache::geode::client::CacheImpl::expiryTaskManager->cancelTask(
+            // s_memoryPressureTaskID);
             Serializable::UnregisterNativesGeneric();
             DistributedSystem::UnregisterBuiltinManagedTypes();
           }
-          apache::geode::client::DistributedSystem::disconnect();
-      
+        apache::geode::client::DistributedSystem::disconnect();
+
         _GF_MG_EXCEPTION_CATCH_ALL2
 
-        finally {
+          finally {
           apache::geode::client::DistributedSystemImpl::releaseDisconnectLock();
         }
       }
 
 
-    /*  DistributedSystem^ DistributedSystem::ConnectOrGetInstance(String^ name)
-      {
+      /*  DistributedSystem^ DistributedSystem::ConnectOrGetInstance(String^ name)
+        {
         return DistributedSystem::ConnectOrGetInstance(name, nullptr);
-      }
+        }
 
-      DistributedSystem^ DistributedSystem::ConnectOrGetInstance(String^ name,
-          Properties^ config)
-      {
+        DistributedSystem^ DistributedSystem::ConnectOrGetInstance(String^ name,
+        Properties^ config)
+        {
         apache::geode::client::DistributedSystemImpl::acquireDisconnectLock();
 
         _GF_MG_EXCEPTION_TRY
 
-          ManagedString mg_name(name);
-          apache::geode::client::PropertiesPtr nativepropsptr(
-            GetNativePtr<apache::geode::client::Properties>(config));
-          DistributedSystem::AppDomainInstanceInitialization(nativepropsptr);
-
-          // this we are calling after all .NET initialization required in
-          // each AppDomain
-          apache::geode::client::DistributedSystemPtr& nativeptr(
-            apache::geode::client::DistributedSystem::connectOrGetInstance(mg_name.CharPtr,
-            nativepropsptr));
-
-          if (apache::geode::client::DistributedSystem::currentInstances() == 1) {
-            // stuff to be done only for the first connect
-            ManagedPostConnect();
-          }
+        ManagedString mg_name(name);
+        apache::geode::client::PropertiesPtr nativepropsptr(
+        GetNativePtr<apache::geode::client::Properties>(config));
+        DistributedSystem::AppDomainInstanceInitialization(nativepropsptr);
+
+        // this we are calling after all .NET initialization required in
+        // each AppDomain
+        apache::geode::client::DistributedSystemPtr& nativeptr(
+        apache::geode::client::DistributedSystem::connectOrGetInstance(mg_name.CharPtr,
+        nativepropsptr));
+
+        if (apache::geode::client::DistributedSystem::currentInstances() == 1) {
+        // stuff to be done only for the first connect
+        ManagedPostConnect();
+        }
 
-          DistributedSystem::AppDomainInstancePostInitialization();
+        DistributedSystem::AppDomainInstancePostInitialization();
+
+        return Create(nativeptr.ptr());
 
-          return Create(nativeptr.ptr());
-          
         _GF_MG_EXCEPTION_CATCH_ALL
 
         finally {
-          apache::geode::client::DistributedSystemImpl::releaseDisconnectLock();
+        apache::geode::client::DistributedSystemImpl::releaseDisconnectLock();
         }
-      }
-*/
-   /*   int DistributedSystem::DisconnectInstance()
-      {
-        apache::geode::client::DistributedSystemImpl::acquireDisconnectLock();
+        }
+        */
+      /*   int DistributedSystem::DisconnectInstance()
+         {
+         apache::geode::client::DistributedSystemImpl::acquireDisconnectLock();
 
-        _GF_MG_EXCEPTION_TRY
+         _GF_MG_EXCEPTION_TRY
 
-          int remainingInstances =
-            apache::geode::client::DistributedSystem::currentInstances();
-          if (remainingInstances <= 0) {
-            throw gcnew NotConnectedException("DistributedSystem."
-              "DisconnectInstance: no remaining instance connections");
-          }
+         int remainingInstances =
+         apache::geode::client::DistributedSystem::currentInstances();
+         if (remainingInstances <= 0) {
+         throw gcnew NotConnectedException("DistributedSystem."
+         "DisconnectInstance: no remaining instance connections");
+         }
 
-          //apache::geode::client::CacheImpl::expiryTaskManager->cancelTask(
-            //s_memoryPressureTaskID);
-          Serializable::UnregisterNatives();
+         //apache::geode::client::CacheImpl::expiryTaskManager->cancelTask(
+         //s_memoryPressureTaskID);
+         Serializable::UnregisterNatives();
 
-          if (remainingInstances == 1) { // last instance
-            DistributedSystem::UnregisterBuiltinManagedTypes();
-          }
-          return apache::geode::client::DistributedSystem::disconnectInstance();
+         if (remainingInstances == 1) { // last instance
+         DistributedSystem::UnregisterBuiltinManagedTypes();
+         }
+         return apache::geode::client::DistributedSystem::disconnectInstance();
 
-        _GF_MG_EXCEPTION_CATCH_ALL
+         _GF_MG_EXCEPTION_CATCH_ALL
 
-        finally {
-          apache::geode::client::DistributedSystemImpl::releaseDisconnectLock();
-        }
-      }
-*/
+         finally {
+         apache::geode::client::DistributedSystemImpl::releaseDisconnectLock();
+         }
+         }
+         */
 
       void DistributedSystem::AppDomainInstanceInitialization(
         const apache::geode::client::PropertiesPtr& nativepropsptr)
       {
         _GF_MG_EXCEPTION_TRY2
-          
+
           // Register wrapper types for built-in types, this are still cpp wrapper
-           
+
           /*
             Serializable::RegisterWrapperGeneric(
-              gcnew WrapperDelegateGeneric(Apache::Geode::Client::CacheableHashSet::Create),
-              apache::geode::client::GeodeTypeIds::CacheableHashSet);
-            
-             Serializable::RegisterWrapperGeneric(
-              gcnew WrapperDelegateGeneric(Apache::Geode::Client::CacheableLinkedHashSet::Create),
-              apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet);
-
-             Serializable::RegisterWrapperGeneric(
-              gcnew WrapperDelegateGeneric(Apache::Geode::Client::Struct::Create),
-              apache::geode::client::GeodeTypeIds::Struct);
-            
-             Serializable::RegisterWrapperGeneric(
-              gcnew WrapperDelegateGeneric(Apache::Geode::Client::Properties::CreateDeserializable),
-              apache::geode::client::GeodeTypeIds::Properties);
-
-          // End register wrapper types for built-in types
-
-  // Register with cpp using unmanaged Cacheablekey wrapper
+            gcnew WrapperDelegateGeneric(Apache::Geode::Client::CacheableHashSet::Create),
+            apache::geode::client::GeodeTypeIds::CacheableHashSet);
+
+            Serializable::RegisterWrapperGeneric(
+            gcnew WrapperDelegateGeneric(Apache::Geode::Client::CacheableLinkedHashSet::Create),
+            apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet);
+
+            Serializable::RegisterWrapperGeneric(
+            gcnew WrapperDelegateGeneric(Apache::Geode::Client::Struct::Create),
+            apache::geode::client::GeodeTypeIds::Struct);
+
+            Serializable::RegisterWrapperGeneric(
+            gcnew WrapperDelegateGeneric(Apache::Geode::Client::Properties::CreateDeserializable),
+            apache::geode::client::GeodeTypeIds::Properties);
+
+            // End register wrapper types for built-in types
+
+            // Register with cpp using unmanaged Cacheablekey wrapper
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableByte,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableByte::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableByte,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableByte::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableBoolean,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableBoolean::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableBoolean,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableBoolean::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableBytes,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableBytes::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableBytes,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableBytes::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::BooleanArray, 
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::BooleanArray::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::BooleanArray,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::BooleanArray::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableWideChar,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableCharacter::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableWideChar,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableCharacter::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CharArray,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CharArray::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CharArray,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CharArray::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableDouble,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDouble::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableDouble,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDouble::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableDoubleArray,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDoubleArray::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableDoubleArray,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDoubleArray::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableFloat,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFloat::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableFloat,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFloat::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableFloatArray,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFloatArray::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableFloatArray,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFloatArray::CreateDeserializable));
+
 
-           
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableHashSet,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashSet::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableHashSet,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashSet::CreateDeserializable));
 
-           Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableLinkedHashSet::CreateDeserializable));
+            Serializable::RegisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableLinkedHashSet::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt16,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt16::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableInt16,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt16::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt16Array,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt16Array::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableInt16Array,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt16Array::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt32,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt32::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableInt32,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt32::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt32Array,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt32Array::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableInt32Array,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt32Array::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt64,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt64::CreateDeserializable));
+            apache::geode::client::GeodeTypeIds::CacheableInt64,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt64::CreateDeserializable));
 
             Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt64Array,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt64Array::CreateDeserializable));
-              */
+            apache::geode::client::GeodeTypeIds::CacheableInt64Array,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableInt64Array::CreateDeserializable));
+            */
 
             /*Serializable::RegisterTypeGeneric(
               apache::geode::client::GeodeTypeIds::CacheableASCIIString,
               gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::CreateDeserializable));
 
-            Serializable::RegisterTypeGeneric(
+              Serializable::RegisterTypeGeneric(
               apache::geode::client::GeodeTypeIds::CacheableASCIIStringHuge,
               gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::createDeserializableHuge));
 
-            Serializable::RegisterTypeGeneric(
+              Serializable::RegisterTypeGeneric(
               apache::geode::client::GeodeTypeIds::CacheableString,
               gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::createUTFDeserializable));
 
-            Serializable::RegisterTypeGeneric(
+              Serializable::RegisterTypeGeneric(
               apache::geode::client::GeodeTypeIds::CacheableStringHuge,
               gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::createUTFDeserializableHuge));*/
 
-            /*
-            Serializable::RegisterTypeGeneric(
+              /*
+              Serializable::RegisterTypeGeneric(
               apache::geode::client::GeodeTypeIds::CacheableNullString,
               gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableString::CreateDeserializable));
 
-            Serializable::RegisterTypeGeneric(
+              Serializable::RegisterTypeGeneric(
               apache::geode::client::GeodeTypeIds::CacheableStringArray,
               gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableStringArray::CreateDeserializable));
 
-            Serializable::RegisterTypeGeneric(
+              Serializable::RegisterTypeGeneric(
               apache::geode::client::GeodeTypeIds::Struct,
               gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Struct::CreateDeserializable));
 
-            Serializable::RegisterTypeGeneric(
+              Serializable::RegisterTypeGeneric(
               apache::geode::client::GeodeTypeIds::Properties,
               gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Properties::CreateDeserializable));
-            */
-            
-            // End register other built-in types
-
-            //primitive types are still C++, as these are used as keys mostly
-          // Register generic wrapper types for built-in types
-          //byte
-
-         /* Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableByte::Create),
-            apache::geode::client::GeodeTypeIds::CacheableByte, Byte::typeid);*/
-
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableByte::Create),
-            apache::geode::client::GeodeTypeIds::CacheableByte, SByte::typeid);
-          
-          //boolean
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableBoolean::Create),
-            apache::geode::client::GeodeTypeIds::CacheableBoolean, Boolean::typeid);
-          //wide char
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableCharacter::Create),
-            apache::geode::client::GeodeTypeIds::CacheableWideChar, Char::typeid);
-          //double
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableDouble::Create),
-            apache::geode::client::GeodeTypeIds::CacheableDouble, Double::typeid);
-          //ascii string
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableString::Create),
-            apache::geode::client::GeodeTypeIds::CacheableASCIIString, String::typeid);
-            
-          //TODO:
-          ////ascii string huge
-          //Serializable::RegisterWrapperGeneric(
-          //  gcnew WrapperDelegateGeneric(CacheableString::Create),
-          //  apache::geode::client::GeodeTypeIds::CacheableASCIIStringHuge, String::typeid);
-          ////string
-          //Serializable::RegisterWrapperGeneric(
-          //  gcnew WrapperDelegateGeneric(CacheableString::Create),
-          //  apache::geode::client::GeodeTypeIds::CacheableString, String::typeid);
-          ////string huge
-          //Serializable::RegisterWrapperGeneric(
-          //  gcnew WrapperDelegateGeneric(CacheableString::Create),
-          //  apache::geode::client::GeodeTypeIds::CacheableStringHuge, String::typeid);
-          //float
-
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableFloat::Create),
-            apache::geode::client::GeodeTypeIds::CacheableFloat, float::typeid);
-          //int 16
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableInt16::Create),
-            apache::geode::client::GeodeTypeIds::CacheableInt16, Int16::typeid);
-          //int32
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableInt32::Create),
-            apache::geode::client::GeodeTypeIds::CacheableInt32, Int32::typeid);
-          //int64
-          Serializable::RegisterWrapperGeneric(
-            gcnew WrapperDelegateGeneric(CacheableInt64::Create),
-            apache::geode::client::GeodeTypeIds::CacheableInt64, Int64::typeid);
-
-          ////uint16
-          //Serializable::RegisterWrapperGeneric(
-          //  gcnew WrapperDelegateGeneric(CacheableInt16::Create),
-          //  apache::geode::client::GeodeTypeIds::CacheableInt16, UInt16::typeid);
-          ////uint32
-          //Serializable::RegisterWrapperGeneric(
-          //  gcnew WrapperDelegateGeneric(CacheableInt32::Create),
-          //  apache::geode::client::GeodeTypeIds::CacheableInt32, UInt32::typeid);
-          ////uint64
-          //Serializable::RegisterWrapperGeneric(
-          //  gcnew WrapperDelegateGeneric(CacheableInt64::Create),
-          //  apache::geode::client::GeodeTypeIds::CacheableInt64, UInt64::typeid);
-          //=======================================================================
-
-            //Now onwards all will be wrap in managed cacheable key..
+              */
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableBytes,
-              gcnew TypeFactoryMethodGeneric(CacheableBytes::CreateDeserializable), 
-              Type::GetType("System.Byte[]"));
+              // End register other built-in types
+
+              //primitive types are still C++, as these are used as keys mostly
+              // Register generic wrapper types for built-in types
+              //byte
+
+              /* Serializable::RegisterWrapperGeneric(
+                 gcnew WrapperDelegateGeneric(CacheableByte::Create),
+                 apache::geode::client::GeodeTypeIds::CacheableByte, Byte::typeid);*/
+
+                 Serializable::RegisterWrapperGeneric(
+                 gcnew WrapperDelegateGeneric(CacheableByte::Create),
+                 apache::geode::client::GeodeTypeIds::CacheableByte, SByte::typeid);
+
+        //boolean
+        Serializable::RegisterWrapperGeneric(
+          gcnew WrapperDelegateGeneric(CacheableBoolean::Create),
+          apache::geode::client::GeodeTypeIds::CacheableBoolean, Boolean::typeid);
+        //wide char
+        Serializable::RegisterWrapperGeneric(
+          gcnew WrapperDelegateGeneric(CacheableCharacter::Create),
+          apache::geode::client::GeodeTypeIds::CacheableWideChar, Char::typeid);
+        //double
+        Serializable::RegisterWrapperGeneric(
+          gcnew WrapperDelegateGeneric(CacheableDouble::Create),
+          apache::geode::client::GeodeTypeIds::CacheableDouble, Double::typeid);
+        //ascii string
+        Serializable::RegisterWrapperGeneric(
+          gcnew WrapperDelegateGeneric(CacheableString::Create),
+          apache::geode::client::GeodeTypeIds::CacheableASCIIString, String::typeid);
+
+        //TODO:
+        ////ascii string huge
+        //Serializable::RegisterWrapperGeneric(
+        //  gcnew WrapperDelegateGeneric(CacheableString::Create),
+        //  apache::geode::client::GeodeTypeIds::CacheableASCIIStringHuge, String::typeid);
+        ////string
+        //Serializable::RegisterWrapperGeneric(
+        //  gcnew WrapperDelegateGeneric(CacheableString::Create),
+        //  apache::geode::client::GeodeTypeIds::CacheableString, String::typeid);
+        ////string huge
+        //Serializable::RegisterWrapperGeneric(
+        //  gcnew WrapperDelegateGeneric(CacheableString::Create),
+        //  apache::geode::client::GeodeTypeIds::CacheableStringHuge, String::typeid);
+        //float
+
+        Serializable::RegisterWrapperGeneric(
+          gcnew WrapperDelegateGeneric(CacheableFloat::Create),
+          apache::geode::client::GeodeTypeIds::CacheableFloat, float::typeid);
+        //int 16
+        Serializable::RegisterWrapperGeneric(
+          gcnew WrapperDelegateGeneric(CacheableInt16::Create),
+          apache::geode::client::GeodeTypeIds::CacheableInt16, Int16::typeid);
+        //int32
+        Serializable::RegisterWrapperGeneric(
+          gcnew WrapperDelegateGeneric(CacheableInt32::Create),
+          apache::geode::client::GeodeTypeIds::CacheableInt32, Int32::typeid);
+        //int64
+        Serializable::RegisterWrapperGeneric(
+          gcnew WrapperDelegateGeneric(CacheableInt64::Create),
+          apache::geode::client::GeodeTypeIds::CacheableInt64, Int64::typeid);
+
+        ////uint16
+        //Serializable::RegisterWrapperGeneric(
+        //  gcnew WrapperDelegateGeneric(CacheableInt16::Create),
+        //  apache::geode::client::GeodeTypeIds::CacheableInt16, UInt16::typeid);
+        ////uint32
+        //Serializable::RegisterWrapperGeneric(
+        //  gcnew WrapperDelegateGeneric(CacheableInt32::Create),
+        //  apache::geode::client::GeodeTypeIds::CacheableInt32, UInt32::typeid);
+        ////uint64
+        //Serializable::RegisterWrapperGeneric(
+        //  gcnew WrapperDelegateGeneric(CacheableInt64::Create),
+        //  apache::geode::client::GeodeTypeIds::CacheableInt64, UInt64::typeid);
+        //=======================================================================
+
+        //Now onwards all will be wrap in managed cacheable key..
 
-           /* Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableBytes,
-              gcnew TypeFactoryMethodGeneric(CacheableBytes::CreateDeserializable), 
-              Type::GetType("System.SByte[]"));*/
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableBytes,
+          gcnew TypeFactoryMethodGeneric(CacheableBytes::CreateDeserializable),
+          Type::GetType("System.Byte[]"));
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableDoubleArray,
-              gcnew TypeFactoryMethodGeneric(CacheableDoubleArray::CreateDeserializable),
-              Type::GetType("System.Double[]"));
+        /* Serializable::RegisterTypeGeneric(
+           apache::geode::client::GeodeTypeIds::CacheableBytes,
+           gcnew TypeFactoryMethodGeneric(CacheableBytes::CreateDeserializable),
+           Type::GetType("System.SByte[]"));*/
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableFloatArray,
-              gcnew TypeFactoryMethodGeneric(CacheableFloatArray::CreateDeserializable),
-              Type::GetType("System.Single[]"));
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableDoubleArray,
+          gcnew TypeFactoryMethodGeneric(CacheableDoubleArray::CreateDeserializable),
+          Type::GetType("System.Double[]"));
 
-           //TODO:
-            //as it is
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableHashSet,
-              gcnew TypeFactoryMethodGeneric(CacheableHashSet::CreateDeserializable),
-              nullptr);
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableFloatArray,
+          gcnew TypeFactoryMethodGeneric(CacheableFloatArray::CreateDeserializable),
+          Type::GetType("System.Single[]"));
 
-            //as it is
-           Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet,
-              gcnew TypeFactoryMethodGeneric(CacheableLinkedHashSet::CreateDeserializable),
-              nullptr);
+        //TODO:
+        //as it is
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableHashSet,
+          gcnew TypeFactoryMethodGeneric(CacheableHashSet::CreateDeserializable),
+          nullptr);
+
+        //as it is
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet,
+          gcnew TypeFactoryMethodGeneric(CacheableLinkedHashSet::CreateDeserializable),
+          nullptr);
 
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt16Array,
-              gcnew TypeFactoryMethodGeneric(CacheableInt16Array::CreateDeserializable),
-              Type::GetType("System.Int16[]"));
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableInt16Array,
+          gcnew TypeFactoryMethodGeneric(CacheableInt16Array::CreateDeserializable),
+          Type::GetType("System.Int16[]"));
 
-          /*  Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt16Array,
-              gcnew TypeFactoryMethodGeneric(CacheableInt16Array::CreateDeserializable),
-              Type::GetType("System.UInt16[]"));*/
+        /*  Serializable::RegisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableInt16Array,
+            gcnew TypeFactoryMethodGeneric(CacheableInt16Array::CreateDeserializable),
+            Type::GetType("System.UInt16[]"));*/
 
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt32Array,
-              gcnew TypeFactoryMethodGeneric(CacheableInt32Array::CreateDeserializable),
-              Type::GetType("System.Int32[]"));
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableInt32Array,
+          gcnew TypeFactoryMethodGeneric(CacheableInt32Array::CreateDeserializable),
+          Type::GetType("System.Int32[]"));
 
-           /* Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt32Array,
-              gcnew TypeFactoryMethodGeneric(CacheableInt32Array::CreateDeserializable),
-              Type::GetType("System.UInt32[]"));*/
+        /* Serializable::RegisterTypeGeneric(
+           apache::geode::client::GeodeTypeIds::CacheableInt32Array,
+           gcnew TypeFactoryMethodGeneric(CacheableInt32Array::CreateDeserializable),
+           Type::GetType("System.UInt32[]"));*/
 
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt64Array,
-              gcnew TypeFactoryMethodGeneric(CacheableInt64Array::CreateDeserializable),
-              Type::GetType("System.Int64[]"));
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableInt64Array,
+          gcnew TypeFactoryMethodGeneric(CacheableInt64Array::CreateDeserializable),
+          Type::GetType("System.Int64[]"));
 
-           /* Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableInt64Array,
-              gcnew TypeFactoryMethodGeneric(CacheableInt64Array::CreateDeserializable),
-              Type::GetType("System.UInt64[]"));*/
-						//TODO:;split
+        /* Serializable::RegisterTypeGeneric(
+           apache::geode::client::GeodeTypeIds::CacheableInt64Array,
+           gcnew TypeFactoryMethodGeneric(CacheableInt64Array::CreateDeserializable),
+           Type::GetType("System.UInt64[]"));*/
+        //TODO:;split
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::BooleanArray,
-              gcnew TypeFactoryMethodGeneric(BooleanArray::CreateDeserializable),
-              Type::GetType("System.Boolean[]"));
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::BooleanArray,
+          gcnew TypeFactoryMethodGeneric(BooleanArray::CreateDeserializable),
+          Type::GetType("System.Boolean[]"));
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CharArray,
-              gcnew TypeFactoryMethodGeneric(CharArray::CreateDeserializable),
-              Type::GetType("System.Char[]"));
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CharArray,
+          gcnew TypeFactoryMethodGeneric(CharArray::CreateDeserializable),
+          Type::GetType("System.Char[]"));
 
-            //TODO::
+        //TODO::
 
-            //Serializable::RegisterTypeGeneric(
-            //  apache::geode::client::GeodeTypeIds::CacheableNullString,
-            //  gcnew TypeFactoryMethodNew(Apache::Geode::Client::CacheableString::CreateDeserializable));
+        //Serializable::RegisterTypeGeneric(
+        //  apache::geode::client::GeodeTypeIds::CacheableNullString,
+        //  gcnew TypeFactoryMethodNew(Apache::Geode::Client::CacheableString::CreateDeserializable));
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableStringArray,
-              gcnew TypeFactoryMethodGeneric(CacheableStringArray::CreateDeserializable),
-              Type::GetType("System.String[]"));
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::CacheableStringArray,
+          gcnew TypeFactoryMethodGeneric(CacheableStringArray::CreateDeserializable),
+          Type::GetType("System.String[]"));
 
-            //as it is
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::Struct,
-              gcnew TypeFactoryMethodGeneric(Struct::CreateDeserializable),
-              nullptr);
+        //as it is
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::Struct,
+          gcnew TypeFactoryMethodGeneric(Struct::CreateDeserializable),
+          nullptr);
 
-            //as it is
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::Properties,
-              gcnew TypeFactoryMethodGeneric(Properties<String^, String^>::CreateDeserializable),
-              nullptr);
-              
-          /*  Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::PdxType,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::PdxType::CreateDeserializable),
-              nullptr);*/
+        //as it is
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::Properties,
+          gcnew TypeFactoryMethodGeneric(Properties<String^, String^>::CreateDeserializable),
+          nullptr);
 
-            Serializable::RegisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::EnumInfo,
-              gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::EnumInfo::CreateDeserializable),
-              nullptr);
-          
-          // End register generic wrapper types for built-in types
-
-          if (!apache::geode::client::DistributedSystem::isConnected()) 
-          {
-            // Set the Generic ManagedAuthInitialize factory function
-            apache::geode::client::SystemProperties::managedAuthInitializeFn =
-              apache::geode::client::ManagedAuthInitializeGeneric::create;
-
-            // Set the Generic ManagedCacheLoader/Listener/Writer factory functions.
-            apache::geode::client::CacheXmlParser::managedCacheLoaderFn =
-              apache::geode::client::ManagedCacheLoaderGeneric::create;
-            apache::geode::client::CacheXmlParser::managedCacheListenerFn =
-              apache::geode::client::ManagedCacheListenerGeneric::create;
-            apache::geode::client::CacheXmlParser::managedCacheWriterFn =
-              apache::geode::client::ManagedCacheWriterGeneric::create;
-
-            // Set the Generic ManagedPartitionResolver factory function
-            apache::geode::client::CacheXmlParser::managedPartitionResolverFn =
-              apache::geode::client::ManagedFixedPartitionResolverGeneric::create;
-
-            // Set the Generic ManagedPersistanceManager factory function
-            apache::geode::client::CacheXmlParser::managedPersistenceManagerFn =
-              apache::geode::client::ManagedPersistenceManagerGeneric::create;
-          }
+        /*  Serializable::RegisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::PdxType,
+            gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::PdxType::CreateDeserializable),
+            nullptr);*/
+
+        Serializable::RegisterTypeGeneric(
+          apache::geode::client::GeodeTypeIds::EnumInfo,
+          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::Internal::EnumInfo::CreateDeserializable),
+          nullptr);
+
+        // End register generic wrapper types for built-in types
+
+        if (!apache::geode::client::DistributedSystem::isConnected())
+        {
+          // Set the Generic ManagedAuthInitialize factory function
+          apache::geode::client::SystemProperties::managedAuthInitializeFn =
+            apache::geode::client::ManagedAuthInitializeGeneric::create;
+
+          // Set the Generic ManagedCacheLoader/Listener/Writer factory functions.
+          apache::geode::client::CacheXmlParser::managedCacheLoaderFn =
+            apache::geode::client::ManagedCacheLoaderGeneric::create;
+          apache::geode::client::CacheXmlParser::managedCacheListenerFn =
+            apache::geode::client::ManagedCacheListenerGeneric::create;
+          apache::geode::client::CacheXmlParser::managedCacheWriterFn =
+            apache::geode::client::ManagedCacheWriterGeneric::create;
+
+          // Set the Generic ManagedPartitionResolver factory function
+          apache::geode::client::CacheXmlParser::managedPartitionResolverFn =
+            apache::geode::client::ManagedFixedPartitionResolverGeneric::create;
+
+          // Set the Generic ManagedPersistanceManager factory function
+          apache::geode::client::CacheXmlParser::managedPersistenceManagerFn =
+            apache::geode::client::ManagedPersistenceManagerGeneric::create;
+        }
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
@@ -616,60 +616,60 @@ namespace Apache
         // Register other built-in types
         /*
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableDate,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDate::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableDate,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableDate::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableFileName,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFileName::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableFileName,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableFileName::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableHashMap,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashMap::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableHashMap,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashMap::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableHashTable,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashTable::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableHashTable,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableHashTable::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableIdentityHashMap,
-          gcnew TypeFactoryMethodGeneric(
-          Apache::Geode::Client::CacheableIdentityHashMap::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableIdentityHashMap,
+        gcnew TypeFactoryMethodGeneric(
+        Apache::Geode::Client::CacheableIdentityHashMap::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableUndefined,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableUndefined::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableUndefined,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableUndefined::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableVector,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableVector::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableVector,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableVector::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableObjectArray,
-          gcnew TypeFactoryMethodGeneric(
-          Apache::Geode::Client::CacheableObjectArray::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableObjectArray,
+        gcnew TypeFactoryMethodGeneric(
+        Apache::Geode::Client::CacheableObjectArray::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableArrayList,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableArrayList::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableArrayList,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableArrayList::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          apache::geode::client::GeodeTypeIds::CacheableStack,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableStack::CreateDeserializable));
+        apache::geode::client::GeodeTypeIds::CacheableStack,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableStack::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          GemFireClassIds::CacheableManagedObject - 0x80000000,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableObject::CreateDeserializable));
+        GeodeClassIds::CacheableManagedObject - 0x80000000,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableObject::CreateDeserializable));
         Serializable::RegisterTypeGeneric(
-          GemFireClassIds::CacheableManagedObjectXml - 0x80000000,
-          gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableObjectXml::CreateDeserializable));
-          */
+        GeodeClassIds::CacheableManagedObjectXml - 0x80000000,
+        gcnew TypeFactoryMethodGeneric(Apache::Geode::Client::CacheableObjectXml::CreateDeserializable));
+        */
         // End register other built-in types
 
         // Register other built-in types for generics
         //c# datatime
-        
+
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GeodeTypeIds::CacheableDate,
           gcnew TypeFactoryMethodGeneric(CacheableDate::CreateDeserializable),
           Type::GetType("System.DateTime"));
-        
+
         //as it is
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GeodeTypeIds::CacheableFileName,
           gcnew TypeFactoryMethodGeneric(CacheableFileName::CreateDeserializable),
           nullptr);
-        
+
         //for generic dictionary define its type in static constructor of Serializable.hpp
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GeodeTypeIds::CacheableHashMap,
@@ -688,7 +688,7 @@ namespace Apache
           gcnew TypeFactoryMethodGeneric(
           CacheableIdentityHashMap::CreateDeserializable),
           nullptr);
-        
+
         //keep as it is
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GeodeTypeIds::CacheableUndefined,
@@ -713,7 +713,7 @@ namespace Apache
           apache::geode::client::GeodeTypeIds::CacheableArrayList,
           gcnew TypeFactoryMethodGeneric(CacheableArrayList::CreateDeserializable),
           nullptr);
-        
+
         //c# generic stack 
         Serializable::RegisterTypeGeneric(
           apache::geode::client::GeodeTypeIds::CacheableStack,
@@ -722,16 +722,16 @@ namespace Apache
 
         //as it is
         Serializable::RegisterTypeGeneric(
-          GemFireClassIds::CacheableManagedObject - 0x80000000,
+          GeodeClassIds::CacheableManagedObject - 0x80000000,
           gcnew TypeFactoryMethodGeneric(CacheableObject::CreateDeserializable),
           nullptr);
 
         //as it is
         Serializable::RegisterTypeGeneric(
-          GemFireClassIds::CacheableManagedObjectXml - 0x80000000,
+          GeodeClassIds::CacheableManagedObjectXml - 0x80000000,
           gcnew TypeFactoryMethodGeneric(CacheableObjectXml::CreateDeserializable),
           nullptr);
-        
+
         // End register other built-in types
 
         // TODO: what will happen for following if first appDomain unload ??
@@ -739,13 +739,13 @@ namespace Apache
         // maintain per AppDomainID functions in C++ layer.
 
         // Log the version of the C# layer being used
-       Log::Config(".NET layer assembly version: {0}({1})", System::Reflection::
-          Assembly::GetExecutingAssembly()->GetName()->Version->ToString(), 
-          System::Reflection::Assembly::GetExecutingAssembly()->ImageRuntimeVersion);
-        
-        Log::Config(".NET runtime version: {0} ",System::Environment::Version);
+        Log::Config(".NET layer assembly version: {0}({1})", System::Reflection::
+                    Assembly::GetExecutingAssembly()->GetName()->Version->ToString(),
+                    System::Reflection::Assembly::GetExecutingAssembly()->ImageRuntimeVersion);
+
+        Log::Config(".NET runtime version: {0} ", System::Environment::Version);
         Log::Config(".NET layer source repository (revision): {0} ({1})",
-          PRODUCT_SOURCE_REPOSITORY, PRODUCT_SOURCE_REVISION);
+                    PRODUCT_SOURCE_REPOSITORY, PRODUCT_SOURCE_REVISION);
       }
 
       void DistributedSystem::AppDomainInstancePostInitialization()
@@ -759,46 +759,46 @@ namespace Apache
 
       void DistributedSystem::UnregisterBuiltinManagedTypes()
       {
-         _GF_MG_EXCEPTION_TRY2
+        _GF_MG_EXCEPTION_TRY2
 
-         apache::geode::client::DistributedSystemImpl::acquireDisconnectLock();
+          apache::geode::client::DistributedSystemImpl::acquireDisconnectLock();
+
+        Serializable::UnregisterNativesGeneric();
+
+        int remainingInstances =
+          apache::geode::client::DistributedSystemImpl::currentInstances();
+
+        if (remainingInstances == 0) { // last instance
+
+
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableDate);
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableFileName);
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableHashMap);
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableHashTable);
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableIdentityHashMap);
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableVector);
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableObjectArray);
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableArrayList);
+          Serializable::UnregisterTypeGeneric(
+            apache::geode::client::GeodeTypeIds::CacheableStack);
+          Serializable::UnregisterTypeGeneric(
+            GeodeClassIds::CacheableManagedObject - 0x80000000);
+          Serializable::UnregisterTypeGeneric(
+            GeodeClassIds::CacheableManagedObjectXml - 0x80000000);
 
-         Serializable::UnregisterNativesGeneric();
-         
-         int remainingInstances =
-           apache::geode::client::DistributedSystemImpl::currentInstances();
-
-          if (remainingInstances == 0) { // last instance
-           
-            
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableDate);
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableFileName);
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableHashMap);
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableHashTable);
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableIdentityHashMap);
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableVector);
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableObjectArray);
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableArrayList);
-            Serializable::UnregisterTypeGeneric(
-              apache::geode::client::GeodeTypeIds::CacheableStack);
-            Serializable::UnregisterTypeGeneric(
-              GemFireClassIds::CacheableManagedObject - 0x80000000);
-            Serializable::UnregisterTypeGeneric(
-              GemFireClassIds::CacheableManagedObjectXml - 0x80000000);            
-              
-          }
+        }
 
-           _GF_MG_EXCEPTION_CATCH_ALL2
+        _GF_MG_EXCEPTION_CATCH_ALL2
 
-        finally {
+          finally {
           apache::geode::client::DistributedSystemImpl::releaseDisconnectLock();
         }
       }
@@ -808,10 +808,10 @@ namespace Apache
         _GF_MG_EXCEPTION_TRY2
 
           //  TODO
-					return Apache::Geode::Client::SystemProperties::Create(
-            apache::geode::client::DistributedSystem::getSystemProperties());
-            
-         //return nullptr;
+          return Apache::Geode::Client::SystemProperties::Create(
+          apache::geode::client::DistributedSystem::getSystemProperties());
+
+        //return nullptr;
 
         _GF_MG_EXCEPTION_CATCH_ALL2
       }
@@ -847,7 +847,7 @@ namespace Apache
           msclr::lock lockInstance(m_singletonSync);
           if (m_instance == nullptr) {
             m_instance = (nativeptr != nullptr
-                ? gcnew DistributedSystem(nativeptr) : nullptr);
+                          ? gcnew DistributedSystem(nativeptr) : nullptr);
           }
         }
         DistributedSystem^ instance = (DistributedSystem^)m_instance;
@@ -855,12 +855,12 @@ namespace Apache
       }
 
       DistributedSystem::DistributedSystem(apache::geode::client::DistributedSystem* nativeptr)
-        : SBWrap(nativeptr) 
+        : SBWrap(nativeptr)
       {
         System::Threading::TimerCallback^ timerCallback = gcnew System::
           Threading::TimerCallback(&DistributedSystem::HandleMemoryPressure);
         m_memoryPressureHandler = gcnew System::Threading::Timer(
-          timerCallback, "MemoryPressureHandler", 3*60000, 3*60000);
+          timerCallback, "MemoryPressureHandler", 3 * 60000, 3 * 60000);
       }
 
       DistributedSystem::~DistributedSystem()
@@ -895,17 +895,17 @@ namespace Apache
           gcnew cliCallback(m_cliCallBackObj,
           &CliCallbackDelegate::Callback);
 
-        apache::geode::client::DistributedSystemImpl::registerCliCallback( System::Threading::Thread::GetDomainID(),
-              (apache::geode::client::CliCallbackMethod)System::Runtime::InteropServices::
-							Marshal::GetFunctionPointerForDelegate(
-							nativeCallback).ToPointer());
+        apache::geode::client::DistributedSystemImpl::registerCliCallback(System::Threading::Thread::GetDomainID(),
+                                                                          (apache::geode::client::CliCallbackMethod)System::Runtime::InteropServices::
+                                                                          Marshal::GetFunctionPointerForDelegate(
+                                                                          nativeCallback).ToPointer());
       }
 
       void DistributedSystem::unregisterCliCallback()
       {
-        apache::geode::client::DistributedSystemImpl::unregisterCliCallback( System::Threading::Thread::GetDomainID());
-    }  // namespace Client
-  }  // namespace Geode
-}  // namespace Apache
+        apache::geode::client::DistributedSystemImpl::unregisterCliCallback(System::Threading::Thread::GetDomainID());
+      }  // namespace Client
+    }  // namespace Geode
+  }  // namespace Apache
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/src/DistributedSystem.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/DistributedSystem.hpp b/src/clicache/src/DistributedSystem.hpp
index 381c402..931f905 100644
--- a/src/clicache/src/DistributedSystem.hpp
+++ b/src/clicache/src/DistributedSystem.hpp
@@ -35,20 +35,20 @@ namespace Apache
 
       /// <summary>
       /// DistributedSystem encapsulates this applications "connection" into the
-      /// GemFire Java servers.
+      /// Geode Java servers.
       /// </summary>
       /// <remarks>
-      /// In order to participate as a client in the GemFire Java servers
+      /// In order to participate as a client in the Geode Java servers
       /// distributed system, each application needs to connect to the
       /// DistributedSystem.
       /// </remarks>
       public ref class DistributedSystem sealed
-				: public Client::Internal::SBWrap<apache::geode::client::DistributedSystem>
+        : public Client::Internal::SBWrap<apache::geode::client::DistributedSystem>
       {
       public:
 
         /// <summary>
-        /// Initializes the Native Client system to be able to connect to the GemFire Java servers.
+        /// Initializes the Native Client system to be able to connect to the Geode Java servers.
         /// </summary>
         /// <param name="name">the name of the system to connect to</param>
         /// <exception cref="IllegalArgumentException">if name is null</exception>
@@ -60,11 +60,11 @@ namespace Apache
         /// An application can have one only one connection to a DistributedSystem.
         /// </exception>
         /// <exception cref="UnknownException">otherwise</exception>
-        static DistributedSystem^ Connect( String^ name );
+        static DistributedSystem^ Connect(String^ name);
 
         /// <summary>
         /// Initializes the Native Client system to be able to connect to the
-        /// GemFire Java servers.
+        /// Geode Java servers.
         /// </summary>
         /// <param name="name">the name of the system to connect to</param>
         /// <param name="config">the set of properties</param>
@@ -77,8 +77,8 @@ namespace Apache
         /// An application can have one only one connection to a DistributedSystem.
         /// </exception>
         /// <exception cref="UnknownException">otherwise</exception>
-        static DistributedSystem^ Connect( String^ name, Properties<String^, String^>^ config );
-        
+        static DistributedSystem^ Connect(String^ name, Properties<String^, String^>^ config);
+
         /// <summary>
         /// Disconnect from the distributed system.
         /// </summary>
@@ -92,7 +92,7 @@ namespace Apache
         /// <returns>the SystemProperties</returns>
         static property Apache::Geode::Client::SystemProperties^ SystemProperties
         {
-          static Apache::Geode::Client::SystemProperties^ get( );
+          static Apache::Geode::Client::SystemProperties^ get();
         }
 
         /// <summary>
@@ -101,7 +101,7 @@ namespace Apache
         /// <returns>the name of the DistributedSystem instance.</returns>
         property String^ Name
         {
-          String^ get( );
+          String^ get();
         }
 
         /// <summary>
@@ -110,14 +110,14 @@ namespace Apache
         /// <returns>true if connected, false otherwise</returns>
         static property bool IsConnected
         {
-          static bool get( );
+          static bool get();
         }
 
         /// <summary>
         /// Returns a reference to this DistributedSystem instance.
         /// </summary>
         /// <returns>the DistributedSystem instance</returns>
-        static DistributedSystem^ GetInstance( );
+        static DistributedSystem^ GetInstance();
 
 
       internal:
@@ -145,7 +145,7 @@ namespace Apache
         static void registerCliCallback();
 
         static void unregisterCliCallback();
-          /// <summary>
+        /// <summary>
         /// Stuff that needs to be done for Connect in each AppDomain.
         /// </summary>
         static void AppDomainInstanceInitialization(
@@ -187,7 +187,7 @@ namespace Apache
         /// </summary>
         ~DistributedSystem();
 
-       
+
 
         /// <summary>
         /// Periodically adjust memory pressure of unmanaged heap for GC.

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/src/GemFireClassIds.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/GemFireClassIds.hpp b/src/clicache/src/GemFireClassIds.hpp
deleted file mode 100644
index cc5707a..0000000
--- a/src/clicache/src/GemFireClassIds.hpp
+++ /dev/null
@@ -1,369 +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 <gfcpp/GeodeTypeIds.hpp>
-
-
-namespace Apache
-{
-  namespace Geode
-  {
-    namespace Client
-    {
-
-			struct PdxTypes
-      {
-				enum PdxTypesInternal
-				{
-					BOOLEAN,
-					BYTE,
-					CHAR,
-					SHORT,
-					INT,
-					LONG,
-					FLOAT,
-					DOUBLE,
-					DATE,
-					STRING,
-					OBJECT,
-					BOOLEAN_ARRAY,
-					CHAR_ARRAY,
-					BYTE_ARRAY,
-					SHORT_ARRAY,
-					INT_ARRAY,
-					LONG_ARRAY,
-					FLOAT_ARRAY,
-					DOUBLE_ARRAY,
-					STRING_ARRAY,
-					OBJECT_ARRAY,
-					ARRAY_OF_BYTE_ARRAYS
-				};
-      };
-
-      /// <summary>
-      /// Static class containing the classIds of the built-in cacheable types.
-      /// </summary>
-      public ref class GemFireClassIds
-      {
-      public:
-
-        /// <summary>
-        /// ClassId of <c>Properties</c> class
-        /// </summary>
-        literal uint32_t Properties =
-          apache::geode::client::GeodeTypeIds::Properties + 0x80000000;
-
-        /// <summary>        
-        /// ClassId of <c>CharArray</c> class
-        /// </summary>
-        literal uint32_t CharArray =
-          apache::geode::client::GeodeTypeIds::CharArray + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>BooleanArray</c> class
-        /// </summary>
-        literal uint32_t BooleanArray =
-          apache::geode::client::GeodeTypeIds::BooleanArray + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>RegionAttributes</c> class
-        /// </summary>
-        literal uint32_t RegionAttributes =
-          apache::geode::client::GeodeTypeIds::RegionAttributes + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableUndefined</c> class
-        /// Implementation note: this has DSFID of FixedIDByte hence a
-        /// different increment.
-        /// </summary>
-        literal uint32_t CacheableUndefined =
-          apache::geode::client::GeodeTypeIds::CacheableUndefined + 0xa0000000;
-
-        literal uint32_t EnumInfo =
-          apache::geode::client::GeodeTypeIds::EnumInfo + 0xa0000000;
-
-        /// <summary>
-        /// ClassId of <c>Struct</c> class
-        /// </summary>
-        literal uint32_t Struct =
-          apache::geode::client::GeodeTypeIds::Struct + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableString</c> class
-        /// </summary>
-        literal uint32_t CacheableString =
-          apache::geode::client::GeodeTypeIds::CacheableString + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableString</c> class for huge strings
-        /// </summary>
-        literal uint32_t CacheableStringHuge =
-          apache::geode::client::GeodeTypeIds::CacheableStringHuge + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableBytes</c> class
-        /// </summary>
-        literal uint32_t CacheableBytes =
-          apache::geode::client::GeodeTypeIds::CacheableBytes + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableInt16Array</c> class
-        /// </summary>
-        literal uint32_t CacheableInt16Array =
-          apache::geode::client::GeodeTypeIds::CacheableInt16Array + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableInt32Array</c> class
-        /// </summary>
-        literal uint32_t CacheableInt32Array =
-          apache::geode::client::GeodeTypeIds::CacheableInt32Array + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableInt64Array</c> class
-        /// </summary>
-        literal uint32_t CacheableInt64Array =
-          apache::geode::client::GeodeTypeIds::CacheableInt64Array + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableFloatArray</c> class
-        /// </summary>
-        literal uint32_t CacheableFloatArray =
-          apache::geode::client::GeodeTypeIds::CacheableFloatArray + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableDoubleArray</c> class
-        /// </summary>
-        literal uint32_t CacheableDoubleArray =
-          apache::geode::client::GeodeTypeIds::CacheableDoubleArray + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableVector</c> class for object arrays
-        /// </summary>
-        literal uint32_t CacheableObjectArray =
-          apache::geode::client::GeodeTypeIds::CacheableObjectArray + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableBoolean</c> class
-        /// </summary>
-        literal uint32_t CacheableBoolean =
-          apache::geode::client::GeodeTypeIds::CacheableBoolean + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableInt16</c> class for wide-characters
-        /// </summary>
-        literal uint32_t CacheableCharacter =
-          apache::geode::client::GeodeTypeIds::CacheableWideChar + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableByte</c> class
-        /// </summary>
-        literal uint32_t CacheableByte =
-          apache::geode::client::GeodeTypeIds::CacheableByte + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableInt16</c> class
-        /// </summary>
-        literal uint32_t CacheableInt16 =
-          apache::geode::client::GeodeTypeIds::CacheableInt16 + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableInt32</c> class
-        /// </summary>
-        literal uint32_t CacheableInt32 =
-          apache::geode::client::GeodeTypeIds::CacheableInt32 + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableInt64</c> class
-        /// </summary>
-        literal uint32_t CacheableInt64 =
-          apache::geode::client::GeodeTypeIds::CacheableInt64 + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableFloat</c> class
-        /// </summary>
-        literal uint32_t CacheableFloat =
-          apache::geode::client::GeodeTypeIds::CacheableFloat + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableDouble</c> class
-        /// </summary>
-        literal uint32_t CacheableDouble =
-          apache::geode::client::GeodeTypeIds::CacheableDouble + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableDate</c> class
-        /// </summary>
-        literal uint32_t CacheableDate =
-          apache::geode::client::GeodeTypeIds::CacheableDate + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableFileName</c> class
-        /// </summary>
-        literal uint32_t CacheableFileName =
-          apache::geode::client::GeodeTypeIds::CacheableFileName + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableStringArray</c> class
-        /// </summary>
-        literal uint32_t CacheableStringArray =
-          apache::geode::client::GeodeTypeIds::CacheableStringArray + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableVector</c> class
-        /// </summary>
-        literal uint32_t CacheableVector =
-          apache::geode::client::GeodeTypeIds::CacheableVector + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableStack</c> class
-        /// </summary>
-        literal uint32_t CacheableStack =
-          apache::geode::client::GeodeTypeIds::CacheableStack + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableArrayList</c> class
-        /// </summary>
-        literal uint32_t CacheableArrayList =
-          apache::geode::client::GeodeTypeIds::CacheableArrayList + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableArrayList</c> class
-        /// </summary>
-        literal uint32_t CacheableLinkedList =
-          apache::geode::client::GeodeTypeIds::CacheableLinkedList + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableHashSet</c> class
-        /// </summary>
-        literal uint32_t CacheableHashSet =
-          apache::geode::client::GeodeTypeIds::CacheableHashSet + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableLinkedHashSet</c> class
-        /// </summary>
-        literal uint32_t CacheableLinkedHashSet =
-          apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableHashMap</c> class
-        /// </summary>
-        literal uint32_t CacheableHashMap =
-          apache::geode::client::GeodeTypeIds::CacheableHashMap + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableHashTable</c> class
-        /// </summary>
-        literal uint32_t CacheableHashTable =
-          apache::geode::client::GeodeTypeIds::CacheableHashTable + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableIdentityHashMap</c> class
-        /// </summary>
-        literal uint32_t CacheableIdentityHashMap =
-          apache::geode::client::GeodeTypeIds::CacheableIdentityHashMap + 0x80000000;
-
-        /// <summary>
-        /// Not used.
-        /// </summary>
-        literal uint32_t CacheableTimeUnit =
-          apache::geode::client::GeodeTypeIds::CacheableTimeUnit + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableString</c> class for null strings
-        /// </summary>
-        literal uint32_t CacheableNullString =
-          apache::geode::client::GeodeTypeIds::CacheableNullString + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableString</c> class for ASCII strings
-        /// </summary>
-        literal uint32_t CacheableASCIIString =
-          apache::geode::client::GeodeTypeIds::CacheableASCIIString + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableString</c> class for huge ASCII strings
-        /// </summary>
-        literal uint32_t CacheableASCIIStringHuge =
-          apache::geode::client::GeodeTypeIds::CacheableASCIIStringHuge + 0x80000000;
-
-
-        // Built-in managed types.
-
-        /// <summary>
-        /// ClassId of <c>CacheableObject</c> class
-        /// </summary>
-        literal uint32_t CacheableManagedObject = 7 + 0x80000000;
-
-        /// <summary>
-        /// ClassId of <c>CacheableObjectXml</c> class
-        /// </summary>
-        literal uint32_t CacheableManagedObjectXml = 8 + 0x80000000;
-				   internal:
-
-        literal uint32_t PdxType = apache::geode::client::GeodeTypeIds::PdxType + 0x80000000;
-
-        literal uint32_t DATA_SERIALIZABLE = 45;
-        literal uint32_t JAVA_CLASS = 43;
-
-        //internal gemfire typeids..
-      /*  literal Byte USERCLASS = 40;
-        literal Byte USERMAP = 94;
-        literal Byte USERCOLLECTION = 95;
-        literal Byte ARRAYOFBYTEARRAYS = 91;
-        literal Byte GEMFIREREGION =  98;
-
-        literal Byte BOOLEAN_TYPE = 17;
-        literal Byte CHARACTER_TYPE = 18;
-        literal Byte BYTE_TYPE = 19;
-        literal Byte SHORT_TYPE = 20;
-        literal Byte INTEGER_TYPE = 21;
-        literal Byte LONG_TYPE = 22;
-        literal Byte FLOAT_TYPE = 23;
-        literal Byte DOUBLE_TYPE = 24;
-        literal Byte VOID_TYPE = 25;   */  
-
-        literal Byte PDX = 93;
-        literal Byte PDX_ENUM = 94;
-
-        literal Byte BYTE_SIZE = 1;
-  
-        literal Byte BOOLEAN_SIZE = 1;
-  
-        literal Byte CHAR_SIZE = 2;
-
-        literal Byte SHORT_SIZE = 2;
-  
-        literal Byte INTEGER_SIZE = 4;
-  
-        literal Byte FLOAT_SIZE = 4;
-  
-        literal Byte LONG_SIZE = 8;
-  
-        literal Byte DOUBLE_SIZE = 8;
-  
-        literal Byte DATE_SIZE = 8;
-      };
-    }  // namespace Client
-  }  // namespace Geode
-}  // namespace Apache
-
-

http://git-wip-us.apache.org/repos/asf/geode/blob/fc9f1f6f/src/clicache/src/GeodeClassIds.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/GeodeClassIds.hpp b/src/clicache/src/GeodeClassIds.hpp
new file mode 100644
index 0000000..cd66d93
--- /dev/null
+++ b/src/clicache/src/GeodeClassIds.hpp
@@ -0,0 +1,369 @@
+/*
+ * 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 <gfcpp/GeodeTypeIds.hpp>
+
+
+namespace Apache
+{
+  namespace Geode
+  {
+    namespace Client
+    {
+
+      struct PdxTypes
+      {
+        enum PdxTypesInternal
+        {
+          BOOLEAN,
+          BYTE,
+          CHAR,
+          SHORT,
+          INT,
+          LONG,
+          FLOAT,
+          DOUBLE,
+          DATE,
+          STRING,
+          OBJECT,
+          BOOLEAN_ARRAY,
+          CHAR_ARRAY,
+          BYTE_ARRAY,
+          SHORT_ARRAY,
+          INT_ARRAY,
+          LONG_ARRAY,
+          FLOAT_ARRAY,
+          DOUBLE_ARRAY,
+          STRING_ARRAY,
+          OBJECT_ARRAY,
+          ARRAY_OF_BYTE_ARRAYS
+        };
+      };
+
+      /// <summary>
+      /// Static class containing the classIds of the built-in cacheable types.
+      /// </summary>
+      public ref class GeodeClassIds
+      {
+      public:
+
+        /// <summary>
+        /// ClassId of <c>Properties</c> class
+        /// </summary>
+        literal uint32_t Properties =
+          apache::geode::client::GeodeTypeIds::Properties + 0x80000000;
+
+        /// <summary>        
+        /// ClassId of <c>CharArray</c> class
+        /// </summary>
+        literal uint32_t CharArray =
+          apache::geode::client::GeodeTypeIds::CharArray + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>BooleanArray</c> class
+        /// </summary>
+        literal uint32_t BooleanArray =
+          apache::geode::client::GeodeTypeIds::BooleanArray + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>RegionAttributes</c> class
+        /// </summary>
+        literal uint32_t RegionAttributes =
+          apache::geode::client::GeodeTypeIds::RegionAttributes + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableUndefined</c> class
+        /// Implementation note: this has DSFID of FixedIDByte hence a
+        /// different increment.
+        /// </summary>
+        literal uint32_t CacheableUndefined =
+          apache::geode::client::GeodeTypeIds::CacheableUndefined + 0xa0000000;
+
+        literal uint32_t EnumInfo =
+          apache::geode::client::GeodeTypeIds::EnumInfo + 0xa0000000;
+
+        /// <summary>
+        /// ClassId of <c>Struct</c> class
+        /// </summary>
+        literal uint32_t Struct =
+          apache::geode::client::GeodeTypeIds::Struct + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableString</c> class
+        /// </summary>
+        literal uint32_t CacheableString =
+          apache::geode::client::GeodeTypeIds::CacheableString + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableString</c> class for huge strings
+        /// </summary>
+        literal uint32_t CacheableStringHuge =
+          apache::geode::client::GeodeTypeIds::CacheableStringHuge + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableBytes</c> class
+        /// </summary>
+        literal uint32_t CacheableBytes =
+          apache::geode::client::GeodeTypeIds::CacheableBytes + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableInt16Array</c> class
+        /// </summary>
+        literal uint32_t CacheableInt16Array =
+          apache::geode::client::GeodeTypeIds::CacheableInt16Array + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableInt32Array</c> class
+        /// </summary>
+        literal uint32_t CacheableInt32Array =
+          apache::geode::client::GeodeTypeIds::CacheableInt32Array + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableInt64Array</c> class
+        /// </summary>
+        literal uint32_t CacheableInt64Array =
+          apache::geode::client::GeodeTypeIds::CacheableInt64Array + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableFloatArray</c> class
+        /// </summary>
+        literal uint32_t CacheableFloatArray =
+          apache::geode::client::GeodeTypeIds::CacheableFloatArray + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableDoubleArray</c> class
+        /// </summary>
+        literal uint32_t CacheableDoubleArray =
+          apache::geode::client::GeodeTypeIds::CacheableDoubleArray + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableVector</c> class for object arrays
+        /// </summary>
+        literal uint32_t CacheableObjectArray =
+          apache::geode::client::GeodeTypeIds::CacheableObjectArray + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableBoolean</c> class
+        /// </summary>
+        literal uint32_t CacheableBoolean =
+          apache::geode::client::GeodeTypeIds::CacheableBoolean + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableInt16</c> class for wide-characters
+        /// </summary>
+        literal uint32_t CacheableCharacter =
+          apache::geode::client::GeodeTypeIds::CacheableWideChar + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableByte</c> class
+        /// </summary>
+        literal uint32_t CacheableByte =
+          apache::geode::client::GeodeTypeIds::CacheableByte + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableInt16</c> class
+        /// </summary>
+        literal uint32_t CacheableInt16 =
+          apache::geode::client::GeodeTypeIds::CacheableInt16 + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableInt32</c> class
+        /// </summary>
+        literal uint32_t CacheableInt32 =
+          apache::geode::client::GeodeTypeIds::CacheableInt32 + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableInt64</c> class
+        /// </summary>
+        literal uint32_t CacheableInt64 =
+          apache::geode::client::GeodeTypeIds::CacheableInt64 + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableFloat</c> class
+        /// </summary>
+        literal uint32_t CacheableFloat =
+          apache::geode::client::GeodeTypeIds::CacheableFloat + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableDouble</c> class
+        /// </summary>
+        literal uint32_t CacheableDouble =
+          apache::geode::client::GeodeTypeIds::CacheableDouble + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableDate</c> class
+        /// </summary>
+        literal uint32_t CacheableDate =
+          apache::geode::client::GeodeTypeIds::CacheableDate + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableFileName</c> class
+        /// </summary>
+        literal uint32_t CacheableFileName =
+          apache::geode::client::GeodeTypeIds::CacheableFileName + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableStringArray</c> class
+        /// </summary>
+        literal uint32_t CacheableStringArray =
+          apache::geode::client::GeodeTypeIds::CacheableStringArray + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableVector</c> class
+        /// </summary>
+        literal uint32_t CacheableVector =
+          apache::geode::client::GeodeTypeIds::CacheableVector + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableStack</c> class
+        /// </summary>
+        literal uint32_t CacheableStack =
+          apache::geode::client::GeodeTypeIds::CacheableStack + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableArrayList</c> class
+        /// </summary>
+        literal uint32_t CacheableArrayList =
+          apache::geode::client::GeodeTypeIds::CacheableArrayList + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableArrayList</c> class
+        /// </summary>
+        literal uint32_t CacheableLinkedList =
+          apache::geode::client::GeodeTypeIds::CacheableLinkedList + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableHashSet</c> class
+        /// </summary>
+        literal uint32_t CacheableHashSet =
+          apache::geode::client::GeodeTypeIds::CacheableHashSet + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableLinkedHashSet</c> class
+        /// </summary>
+        literal uint32_t CacheableLinkedHashSet =
+          apache::geode::client::GeodeTypeIds::CacheableLinkedHashSet + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableHashMap</c> class
+        /// </summary>
+        literal uint32_t CacheableHashMap =
+          apache::geode::client::GeodeTypeIds::CacheableHashMap + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableHashTable</c> class
+        /// </summary>
+        literal uint32_t CacheableHashTable =
+          apache::geode::client::GeodeTypeIds::CacheableHashTable + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableIdentityHashMap</c> class
+        /// </summary>
+        literal uint32_t CacheableIdentityHashMap =
+          apache::geode::client::GeodeTypeIds::CacheableIdentityHashMap + 0x80000000;
+
+        /// <summary>
+        /// Not used.
+        /// </summary>
+        literal uint32_t CacheableTimeUnit =
+          apache::geode::client::GeodeTypeIds::CacheableTimeUnit + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableString</c> class for null strings
+        /// </summary>
+        literal uint32_t CacheableNullString =
+          apache::geode::client::GeodeTypeIds::CacheableNullString + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableString</c> class for ASCII strings
+        /// </summary>
+        literal uint32_t CacheableASCIIString =
+          apache::geode::client::GeodeTypeIds::CacheableASCIIString + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableString</c> class for huge ASCII strings
+        /// </summary>
+        literal uint32_t CacheableASCIIStringHuge =
+          apache::geode::client::GeodeTypeIds::CacheableASCIIStringHuge + 0x80000000;
+
+
+        // Built-in managed types.
+
+        /// <summary>
+        /// ClassId of <c>CacheableObject</c> class
+        /// </summary>
+        literal uint32_t CacheableManagedObject = 7 + 0x80000000;
+
+        /// <summary>
+        /// ClassId of <c>CacheableObjectXml</c> class
+        /// </summary>
+        literal uint32_t CacheableManagedObjectXml = 8 + 0x80000000;
+      internal:
+
+        literal uint32_t PdxType = apache::geode::client::GeodeTypeIds::PdxType + 0x80000000;
+
+        literal uint32_t DATA_SERIALIZABLE = 45;
+        literal uint32_t JAVA_CLASS = 43;
+
+        //internal geode typeids..
+        /*  literal Byte USERCLASS = 40;
+          literal Byte USERMAP = 94;
+          literal Byte USERCOLLECTION = 95;
+          literal Byte ARRAYOFBYTEARRAYS = 91;
+          literal Byte GEMFIREREGION =  98;
+
+          literal Byte BOOLEAN_TYPE = 17;
+          literal Byte CHARACTER_TYPE = 18;
+          literal Byte BYTE_TYPE = 19;
+          literal Byte SHORT_TYPE = 20;
+          literal Byte INTEGER_TYPE = 21;
+          literal Byte LONG_TYPE = 22;
+          literal Byte FLOAT_TYPE = 23;
+          literal Byte DOUBLE_TYPE = 24;
+          literal Byte VOID_TYPE = 25;   */
+
+        literal Byte PDX = 93;
+        literal Byte PDX_ENUM = 94;
+
+        literal Byte BYTE_SIZE = 1;
+
+        literal Byte BOOLEAN_SIZE = 1;
+
+        literal Byte CHAR_SIZE = 2;
+
+        literal Byte SHORT_SIZE = 2;
+
+        literal Byte INTEGER_SIZE = 4;
+
+        literal Byte FLOAT_SIZE = 4;
+
+        literal Byte LONG_SIZE = 8;
+
+        literal Byte DOUBLE_SIZE = 8;
+
+        literal Byte DATE_SIZE = 8;
+      };
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+
+


Mime
View raw message