http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/LocalRegion.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/LocalRegion.cpp b/src/clicache/src/LocalRegion.cpp index 686d09a..fc89957 100644 --- a/src/clicache/src/LocalRegion.cpp +++ b/src/clicache/src/LocalRegion.cpp @@ -28,11 +28,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TValue> TValue LocalRegion<TKey, TValue>::Get(TKey key, Object^ callbackArg) @@ -545,13 +547,13 @@ namespace GemStone } generic<class TKey, class TValue> - GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>^ LocalRegion<TKey, TValue>::Attributes::get() + Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ LocalRegion<TKey, TValue>::Attributes::get() { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ apache::geode::client::RegionAttributesPtr& nativeptr( NativePtr->getAttributes( ) ); - return GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr()); + return Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr()); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } @@ -564,18 +566,18 @@ namespace GemStone apache::geode::client::AttributesMutatorPtr& nativeptr( NativePtr->getAttributesMutator( ) ); - return GemStone::GemFire::Cache::Generic::AttributesMutator<TKey, TValue>::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::Generic::AttributesMutator<TKey, TValue>::Create( nativeptr.ptr( ) ); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } generic<class TKey, class TValue> - GemStone::GemFire::Cache::Generic::CacheStatistics^ LocalRegion<TKey, TValue>::Statistics::get() + Apache::Geode::Client::Generic::CacheStatistics^ LocalRegion<TKey, TValue>::Statistics::get() { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ apache::geode::client::CacheStatisticsPtr& nativeptr( NativePtr->getStatistics( ) ); - return GemStone::GemFire::Cache::Generic::CacheStatistics::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::Generic::CacheStatistics::Create( nativeptr.ptr( ) ); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } @@ -599,7 +601,7 @@ namespace GemStone generic<class TKey, class TValue> IRegion<TKey, TValue>^ LocalRegion<TKey, TValue>::CreateSubRegion( String^ subRegionName, - GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>^ attributes) + Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ attributes) { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ @@ -684,11 +686,11 @@ namespace GemStone if(realCache != NULL) { - return GemStone::GemFire::Cache::Generic::Cache::Create( ((apache::geode::client::CachePtr)nativeptr).ptr( ) ); + return Apache::Geode::Client::Generic::Cache::Create( ((apache::geode::client::CachePtr)nativeptr).ptr( ) ); } else { - return GemStone::GemFire::Cache::Generic::AuthenticatedCache::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::Generic::AuthenticatedCache::Create( nativeptr.ptr( ) ); } _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/LocalRegion.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/LocalRegion.hpp b/src/clicache/src/LocalRegion.hpp index c3b9ffc..e01308e 100644 --- a/src/clicache/src/LocalRegion.hpp +++ b/src/clicache/src/LocalRegion.hpp @@ -28,11 +28,13 @@ using namespace System; using namespace System::Collections::Generic; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TValue> ref class RegionEntry; @@ -164,12 +166,12 @@ namespace GemStone virtual property AttributesMutator<TKey, TValue>^ AttributesMutator { - GemStone::GemFire::Cache::Generic::AttributesMutator<TKey, TValue>^ get(); + Apache::Geode::Client::Generic::AttributesMutator<TKey, TValue>^ get(); } - virtual property GemStone::GemFire::Cache::Generic::CacheStatistics^ Statistics + virtual property Apache::Geode::Client::Generic::CacheStatistics^ Statistics { - GemStone::GemFire::Cache::Generic::CacheStatistics^ get(); + Apache::Geode::Client::Generic::CacheStatistics^ get(); } virtual IRegion<TKey, TValue>^ GetSubRegion( String^ path ); @@ -183,9 +185,9 @@ namespace GemStone virtual System::Collections::Generic::ICollection<RegionEntry<TKey,TValue>^>^ GetEntries(bool recursive); - virtual property GemStone::GemFire::Cache::Generic::IRegionService^ RegionService + virtual property Apache::Geode::Client::Generic::IRegionService^ RegionService { - GemStone::GemFire::Cache::Generic::IRegionService^ get( ); + Apache::Geode::Client::Generic::IRegionService^ get( ); } virtual bool ContainsValueForKey( TKey key ); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Log.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Log.cpp b/src/clicache/src/Log.cpp index bdd3843..683a9bd 100644 --- a/src/clicache/src/Log.cpp +++ b/src/clicache/src/Log.cpp @@ -24,13 +24,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { void Log::Init( LogLevel level, String^ logFileName ) { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Log.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Log.hpp b/src/clicache/src/Log.hpp index 217b819..7f2bc6e 100644 --- a/src/clicache/src/Log.hpp +++ b/src/clicache/src/Log.hpp @@ -23,13 +23,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { /// <summary> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/PdxIdentityFieldAttribute.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/PdxIdentityFieldAttribute.hpp b/src/clicache/src/PdxIdentityFieldAttribute.hpp index a69b44f..7f14810 100755 --- a/src/clicache/src/PdxIdentityFieldAttribute.hpp +++ b/src/clicache/src/PdxIdentityFieldAttribute.hpp @@ -22,13 +22,13 @@ using namespace System; using namespace System::Reflection; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { ///<summary> /// PdxIdentityField attribute one can specify on member fields. http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Pool.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Pool.cpp b/src/clicache/src/Pool.cpp index 4afcd55..8e0ef11 100644 --- a/src/clicache/src/Pool.cpp +++ b/src/clicache/src/Pool.cpp @@ -28,11 +28,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { //generic<class TKey, class TValue> String^ Pool/*<TKey, TValue>*/::Name::get( ) http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Pool.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Pool.hpp b/src/clicache/src/Pool.hpp index d43d049..2180319 100644 --- a/src/clicache/src/Pool.hpp +++ b/src/clicache/src/Pool.hpp @@ -24,13 +24,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - - namespace Generic + namespace Client + { +namespace Generic { //generic<class TKey, class TResult> //ref class Properties; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/PoolFactory.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/PoolFactory.cpp b/src/clicache/src/PoolFactory.cpp index e251de0..077b40a 100644 --- a/src/clicache/src/PoolFactory.cpp +++ b/src/clicache/src/PoolFactory.cpp @@ -26,11 +26,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { //generic<class TKey, class TValue> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/PoolFactory.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/PoolFactory.hpp b/src/clicache/src/PoolFactory.hpp index 8f3369c..c2f1a6c 100644 --- a/src/clicache/src/PoolFactory.hpp +++ b/src/clicache/src/PoolFactory.hpp @@ -23,11 +23,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { // generic<class TKey, class TValue> ref class Pool; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/PoolManager.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/PoolManager.cpp b/src/clicache/src/PoolManager.cpp index ffc1028..35b39d0 100644 --- a/src/clicache/src/PoolManager.cpp +++ b/src/clicache/src/PoolManager.cpp @@ -27,11 +27,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { //generic<class TKey, class TValue> PoolFactory/*<TKey, TValue>*/^ PoolManager/*<TKey, TValue>*/::CreateFactory() http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/PoolManager.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/PoolManager.hpp b/src/clicache/src/PoolManager.hpp index 175a272..608dcd9 100644 --- a/src/clicache/src/PoolManager.hpp +++ b/src/clicache/src/PoolManager.hpp @@ -23,11 +23,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { //generic<class TKey, class TValue> ref class Pool; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Properties.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Properties.cpp b/src/clicache/src/Properties.cpp index bd0865a..6eb4935 100644 --- a/src/clicache/src/Properties.cpp +++ b/src/clicache/src/Properties.cpp @@ -26,13 +26,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { // Visitor class to get string representations of a property object ref class PropertyToString @@ -46,7 +46,7 @@ namespace GemStone inline PropertyToString( ) : m_str( "{" ) { } - void Visit( GemStone::GemFire::Cache::Generic::ICacheableKey^ key, IGFSerializable^ value ) + void Visit( Apache::Geode::Client::Generic::ICacheableKey^ key, IGFSerializable^ value ) { if ( m_str->Length > 1 ) { m_str += ","; @@ -81,7 +81,7 @@ namespace GemStone // _GF_MG_EXCEPTION_CATCH_ALL2 } - /*IGFSerializable^ Properties::Find( GemStone::GemFire::Cache::Generic::ICacheableKey^ key) + /*IGFSerializable^ Properties::Find( Apache::Geode::Client::Generic::ICacheableKey^ key) { CacheableString^ cStr = dynamic_cast<CacheableString ^>(key); @@ -194,7 +194,7 @@ namespace GemStone _GF_MG_EXCEPTION_CATCH_ALL2 }*/ - /*void Properties::Insert( GemStone::GemFire::Cache::Generic::ICacheableKey^ key, IGFSerializable^ value) + /*void Properties::Insert( Apache::Geode::Client::Generic::ICacheableKey^ key, IGFSerializable^ value) { CacheableString^ cStr = dynamic_cast<CacheableString ^>(key); if (cStr != nullptr) { @@ -266,7 +266,7 @@ namespace GemStone } */ - /*void Properties::Insert( GemStone::GemFire::Cache::Generic::ICacheableKey^ key, Serializable^ value) + /*void Properties::Insert( Apache::Geode::Client::Generic::ICacheableKey^ key, Serializable^ value) { CacheableString^ cStr = dynamic_cast<CacheableString ^>(key); if (cStr != nullptr) { @@ -345,7 +345,7 @@ namespace GemStone _GF_MG_EXCEPTION_CATCH_ALL2 } - /*void Properties::Remove( GemStone::GemFire::Cache::Generic::ICacheableKey^ key) + /*void Properties::Remove( Apache::Geode::Client::Generic::ICacheableKey^ key) { CacheableString^ cStr = dynamic_cast<CacheableString ^>(key); if (cStr != nullptr) { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Properties.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Properties.hpp b/src/clicache/src/Properties.hpp index 4c7381f..aa38dcc 100644 --- a/src/clicache/src/Properties.hpp +++ b/src/clicache/src/Properties.hpp @@ -34,13 +34,13 @@ using namespace System; using namespace System::Runtime::Serialization; using namespace System::Collections::Generic; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - delegate void PropertyVisitor(GemStone::GemFire::Cache::Generic::ICacheableKey^ key, GemStone::GemFire::Cache::Generic::IGFSerializable^ value); +delegate void PropertyVisitor(Apache::Geode::Client::Generic::ICacheableKey^ key, Apache::Geode::Client::Generic::IGFSerializable^ value); generic <class TPropKey, class TPropValue> ref class PropertyVisitorProxy; @@ -292,25 +292,25 @@ namespace GemStone ref class PropertyVisitorProxy { public: - void Visit(GemStone::GemFire::Cache::Generic::ICacheableKey^ key, - GemStone::GemFire::Cache::Generic::IGFSerializable^ value) + void Visit(Apache::Geode::Client::Generic::ICacheableKey^ key, + Apache::Geode::Client::Generic::IGFSerializable^ value) { - TPropKey tpkey = GemStone::GemFire::Cache::Generic::Serializable:: + TPropKey tpkey = Apache::Geode::Client::Generic::Serializable:: GetManagedValueGeneric<TPropKey>(SerializablePtr(SafeMSerializableConvertGeneric(key))); - TPropValue tpvalue = GemStone::GemFire::Cache::Generic::Serializable:: + TPropValue tpvalue = Apache::Geode::Client::Generic::Serializable:: GetManagedValueGeneric<TPropValue>(SerializablePtr(SafeMSerializableConvertGeneric(value))); m_visitor->Invoke(tpkey, tpvalue); } void SetPropertyVisitorGeneric( - GemStone::GemFire::Cache::Generic::PropertyVisitorGeneric<TPropKey, TPropValue>^ visitor) + Apache::Geode::Client::Generic::PropertyVisitorGeneric<TPropKey, TPropValue>^ visitor) { m_visitor = visitor; } private: - GemStone::GemFire::Cache::Generic::PropertyVisitorGeneric<TPropKey, TPropValue>^ m_visitor; + Apache::Geode::Client::Generic::PropertyVisitorGeneric<TPropKey, TPropValue>^ m_visitor; }; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Query.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Query.cpp b/src/clicache/src/Query.cpp index b857d8c..47ed97e 100644 --- a/src/clicache/src/Query.cpp +++ b/src/clicache/src/Query.cpp @@ -26,11 +26,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TResult> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Query.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Query.hpp b/src/clicache/src/Query.hpp index e039d11..8789981 100644 --- a/src/clicache/src/Query.hpp +++ b/src/clicache/src/Query.hpp @@ -25,11 +25,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TResult> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/QueryService.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/QueryService.cpp b/src/clicache/src/QueryService.cpp index dbfcd69..b0b278d 100644 --- a/src/clicache/src/QueryService.cpp +++ b/src/clicache/src/QueryService.cpp @@ -28,11 +28,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TResult> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/QueryService.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/QueryService.hpp b/src/clicache/src/QueryService.hpp index e0169c3..0b96545 100644 --- a/src/clicache/src/QueryService.hpp +++ b/src/clicache/src/QueryService.hpp @@ -25,11 +25,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TResult> @@ -132,10 +134,10 @@ namespace GemStone /// <returns> /// The managed wrapper object; null if the native pointer is null. /// </returns> - inline static GemStone::GemFire::Cache::Generic::QueryService<TKey, TResult>^ Create( apache::geode::client::QueryService* nativeptr ) + inline static Apache::Geode::Client::Generic::QueryService<TKey, TResult>^ Create( apache::geode::client::QueryService* nativeptr ) { return ( nativeptr != nullptr ? - gcnew GemStone::GemFire::Cache::Generic::QueryService<TKey, TResult>( nativeptr ) : nullptr ); + gcnew Apache::Geode::Client::Generic::QueryService<TKey, TResult>( nativeptr ) : nullptr ); } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ReflectionBasedAutoSerializer.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ReflectionBasedAutoSerializer.cpp b/src/clicache/src/ReflectionBasedAutoSerializer.cpp index 997950d..16e46c8 100755 --- a/src/clicache/src/ReflectionBasedAutoSerializer.cpp +++ b/src/clicache/src/ReflectionBasedAutoSerializer.cpp @@ -21,13 +21,13 @@ #include <msclr/lock.h> #include "ExceptionTypes.hpp" #include "impl/DotNetTypes.hpp" -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { ref class FieldWrapper { @@ -38,8 +38,8 @@ namespace GemStone delegate void MySetter(Object^ t1, Object^ t2); delegate Object^ MyGetter(Object^ t1); - static Type^ setterDelegateType = Type::GetType("GemStone.GemFire.Cache.Generic.FieldWrapper+MySetter"); - static Type^ getterDelegateType = Type::GetType("GemStone.GemFire.Cache.Generic.FieldWrapper+MyGetter"); + static Type^ setterDelegateType = Type::GetType("Apache.Geode.Client.Generic.FieldWrapper+MySetter"); + static Type^ getterDelegateType = Type::GetType("Apache.Geode.Client.Generic.FieldWrapper+MyGetter"); FieldInfo^ m_fi; String^ m_fieldName; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ReflectionBasedAutoSerializer.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ReflectionBasedAutoSerializer.hpp b/src/clicache/src/ReflectionBasedAutoSerializer.hpp index 3a07cdb..a2ede24 100755 --- a/src/clicache/src/ReflectionBasedAutoSerializer.hpp +++ b/src/clicache/src/ReflectionBasedAutoSerializer.hpp @@ -24,13 +24,13 @@ using namespace System; using namespace System::Reflection; using namespace System::Reflection::Emit; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { /// <summary> /// Enumerated type for pdx FieldType http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Region.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Region.cpp b/src/clicache/src/Region.cpp index bd19cfd..6c16e4a 100644 --- a/src/clicache/src/Region.cpp +++ b/src/clicache/src/Region.cpp @@ -37,11 +37,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TValue> TValue Region<TKey, TValue>::Get(TKey key, Object^ callbackArg) @@ -79,7 +81,7 @@ namespace GemStone bool Region<TKey, TValue>::isPoolInMultiuserMode() { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ - GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>^ rAttributes = this->Attributes; + Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ rAttributes = this->Attributes; String^ poolName = rAttributes->PoolName; if (poolName != nullptr) { Pool/*<TKey, TValue>*/^ pool = PoolManager/*<TKey, TValue>*/::Find(poolName); @@ -682,13 +684,13 @@ namespace GemStone } generic<class TKey, class TValue> - GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>^ Region<TKey, TValue>::Attributes::get() + Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ Region<TKey, TValue>::Attributes::get() { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ apache::geode::client::RegionAttributesPtr& nativeptr( NativePtr->getAttributes( ) ); - return GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr()); + return Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>::Create(nativeptr.ptr()); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } @@ -701,18 +703,18 @@ namespace GemStone apache::geode::client::AttributesMutatorPtr& nativeptr( NativePtr->getAttributesMutator( ) ); - return GemStone::GemFire::Cache::Generic::AttributesMutator<TKey, TValue>::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::Generic::AttributesMutator<TKey, TValue>::Create( nativeptr.ptr( ) ); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } generic<class TKey, class TValue> - GemStone::GemFire::Cache::Generic::CacheStatistics^ Region<TKey, TValue>::Statistics::get() + Apache::Geode::Client::Generic::CacheStatistics^ Region<TKey, TValue>::Statistics::get() { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ apache::geode::client::CacheStatisticsPtr& nativeptr( NativePtr->getStatistics( ) ); - return GemStone::GemFire::Cache::Generic::CacheStatistics::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::Generic::CacheStatistics::Create( nativeptr.ptr( ) ); _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ } @@ -732,7 +734,7 @@ namespace GemStone generic<class TKey, class TValue> IRegion<TKey, TValue>^ Region<TKey, TValue>::CreateSubRegion( String^ subRegionName, - GemStone::GemFire::Cache::Generic::RegionAttributes<TKey, TValue>^ attributes) + Apache::Geode::Client::Generic::RegionAttributes<TKey, TValue>^ attributes) { _GF_MG_EXCEPTION_TRY2/* due to auto replace */ @@ -817,11 +819,11 @@ namespace GemStone if(realCache != NULL) { - return GemStone::GemFire::Cache::Generic::Cache::Create( ((apache::geode::client::CachePtr)nativeptr).ptr( ) ); + return Apache::Geode::Client::Generic::Cache::Create( ((apache::geode::client::CachePtr)nativeptr).ptr( ) ); } else { - return GemStone::GemFire::Cache::Generic::AuthenticatedCache::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::Generic::AuthenticatedCache::Create( nativeptr.ptr( ) ); } _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */ http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Region.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Region.hpp b/src/clicache/src/Region.hpp index 005abac..7569f86 100644 --- a/src/clicache/src/Region.hpp +++ b/src/clicache/src/Region.hpp @@ -29,12 +29,13 @@ using namespace System; //using namespace System::Collections; //using namespace System::Collections::Generic; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - namespace Generic + namespace Client + { +namespace Generic { //generic<class TKey, class TValue> // ref class AttributesMutator; @@ -165,12 +166,12 @@ namespace GemStone virtual property AttributesMutator<TKey, TValue>^ AttributesMutator { - GemStone::GemFire::Cache::Generic::AttributesMutator<TKey, TValue>^ get(); + Apache::Geode::Client::Generic::AttributesMutator<TKey, TValue>^ get(); } - virtual property GemStone::GemFire::Cache::Generic::CacheStatistics^ Statistics + virtual property Apache::Geode::Client::Generic::CacheStatistics^ Statistics { - GemStone::GemFire::Cache::Generic::CacheStatistics^ get(); + Apache::Geode::Client::Generic::CacheStatistics^ get(); } virtual IRegion<TKey, TValue>^ GetSubRegion( String^ path ); @@ -196,7 +197,7 @@ namespace GemStone { bool get(); } - virtual GemStone::GemFire::Cache::Generic::ISubscriptionService<TKey>^ GetSubscriptionService(); + virtual Apache::Geode::Client::Generic::ISubscriptionService<TKey>^ GetSubscriptionService(); virtual IRegion<TKey, TValue>^ GetLocalView(); @@ -270,7 +271,7 @@ namespace GemStone /// The managed wrapper object; null if the native pointer is null. /// </returns> //generic<class TKey, class TValue> - inline static GemStone::GemFire::Cache::Generic::IRegion<TKey, TValue>^ + inline static Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ Create( apache::geode::client::Region* nativeptr ) { return ( nativeptr != nullptr ? http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionAttributes.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionAttributes.cpp b/src/clicache/src/RegionAttributes.cpp index 78df6d2..53e4b86 100644 --- a/src/clicache/src/RegionAttributes.cpp +++ b/src/clicache/src/RegionAttributes.cpp @@ -38,21 +38,21 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - - namespace Generic + namespace Client + { +namespace Generic { generic <class TKey, class TValue> void Generic::RegionAttributes<TKey, TValue>::ToData( - GemStone::GemFire::Cache::Generic::DataOutput^ output ) + Apache::Geode::Client::Generic::DataOutput^ output ) { apache::geode::client::DataOutput* nativeOutput = - GemStone::GemFire::Cache::Generic::GetNativePtrFromUMWrapGeneric<apache::geode::client::DataOutput>( output ); + Apache::Geode::Client::Generic::GetNativePtrFromUMWrapGeneric<apache::geode::client::DataOutput>( output ); if (nativeOutput != nullptr) { NativePtr->toData( *nativeOutput ); @@ -60,11 +60,11 @@ namespace GemStone } generic <class TKey, class TValue> - GemStone::GemFire::Cache::Generic::IGFSerializable^ Generic::RegionAttributes<TKey, TValue>::FromData( - GemStone::GemFire::Cache::Generic::DataInput^ input ) + Apache::Geode::Client::Generic::IGFSerializable^ Generic::RegionAttributes<TKey, TValue>::FromData( + Apache::Geode::Client::Generic::DataInput^ input ) { apache::geode::client::DataInput* nativeInput = - GemStone::GemFire::Cache::Generic::GetNativePtrFromUMWrapGeneric<apache::geode::client::DataInput>( input ); + Apache::Geode::Client::Generic::GetNativePtrFromUMWrapGeneric<apache::geode::client::DataInput>( input ); if (nativeInput != nullptr) { AssignPtr( static_cast<apache::geode::client::RegionAttributes*>( http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionAttributes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionAttributes.hpp b/src/clicache/src/RegionAttributes.hpp index adf8f5b..743c521 100644 --- a/src/clicache/src/RegionAttributes.hpp +++ b/src/clicache/src/RegionAttributes.hpp @@ -33,14 +33,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - - - namespace Generic + namespace Client + { +namespace Generic { //interface class ICacheLoader; //interface class ICacheWriter; @@ -80,9 +79,9 @@ namespace GemStone /// <returns> /// region's <c>ICacheLoader</c> or null if none /// </returns> - property GemStone::GemFire::Cache::Generic::ICacheLoader<TKey, TValue>^ CacheLoader + property Apache::Geode::Client::Generic::ICacheLoader<TKey, TValue>^ CacheLoader { - GemStone::GemFire::Cache::Generic::ICacheLoader<TKey, TValue>^ get( ); + Apache::Geode::Client::Generic::ICacheLoader<TKey, TValue>^ get( ); } /// <summary> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionEntry.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionEntry.cpp b/src/clicache/src/RegionEntry.cpp index 3ed1d4d..d35544f 100644 --- a/src/clicache/src/RegionEntry.cpp +++ b/src/clicache/src/RegionEntry.cpp @@ -23,11 +23,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TValue> @@ -52,16 +54,16 @@ namespace GemStone apache::geode::client::RegionPtr rptr; NativePtr->getRegion( rptr ); - return GemStone::GemFire::Cache::Generic::Region<TKey, TValue>::Create( rptr.ptr( ) ); + return Apache::Geode::Client::Generic::Region<TKey, TValue>::Create( rptr.ptr( ) ); } generic<class TKey, class TValue> - GemStone::GemFire::Cache::Generic::CacheStatistics^ RegionEntry<TKey, TValue>::Statistics::get( ) + Apache::Geode::Client::Generic::CacheStatistics^ RegionEntry<TKey, TValue>::Statistics::get( ) { apache::geode::client::CacheStatisticsPtr nativeptr; NativePtr->getStatistics( nativeptr ); - return GemStone::GemFire::Cache::Generic::CacheStatistics::Create( nativeptr.ptr( ) ); + return Apache::Geode::Client::Generic::CacheStatistics::Create( nativeptr.ptr( ) ); } generic<class TKey, class TValue> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionEntry.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionEntry.hpp b/src/clicache/src/RegionEntry.hpp index 7c16dc0..90565bf 100644 --- a/src/clicache/src/RegionEntry.hpp +++ b/src/clicache/src/RegionEntry.hpp @@ -25,12 +25,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - namespace Generic + namespace Client + { +namespace Generic { //ref class Region; @@ -111,9 +112,9 @@ namespace GemStone /// <exception cref="StatisticsDisabledException"> /// if statistics have been disabled for this region /// </exception> - property GemStone::GemFire::Cache::Generic::CacheStatistics^ Statistics + property Apache::Geode::Client::Generic::CacheStatistics^ Statistics { - GemStone::GemFire::Cache::Generic::CacheStatistics^ get( ); + Apache::Geode::Client::Generic::CacheStatistics^ get( ); } ///// <summary> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionEvent.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionEvent.cpp b/src/clicache/src/RegionEvent.cpp index 42f54c2..93df084 100644 --- a/src/clicache/src/RegionEvent.cpp +++ b/src/clicache/src/RegionEvent.cpp @@ -22,11 +22,13 @@ #include "impl/SafeConvert.hpp" using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TValue> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionEvent.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionEvent.hpp b/src/clicache/src/RegionEvent.hpp index b13a30a..a801787 100644 --- a/src/clicache/src/RegionEvent.hpp +++ b/src/clicache/src/RegionEvent.hpp @@ -26,11 +26,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { //ref class Region; @@ -86,8 +88,8 @@ namespace GemStone /// Internal constructor to wrap a native object pointer /// </summary> /// <param name="nativeptr">The native object pointer</param> - inline GemStone::GemFire::Cache::Generic::RegionEvent<TKey, TValue>( const apache::geode::client::RegionEvent* nativeptr ) - : GemStone::GemFire::Cache::Generic::Internal::UMWrap<apache::geode::client::RegionEvent>( + inline Apache::Geode::Client::Generic::RegionEvent<TKey, TValue>( const apache::geode::client::RegionEvent* nativeptr ) + : Apache::Geode::Client::Generic::Internal::UMWrap<apache::geode::client::RegionEvent>( const_cast<apache::geode::client::RegionEvent*>( nativeptr ), false ) { } }; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionFactory.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionFactory.cpp b/src/clicache/src/RegionFactory.cpp index a12af6a..a96dfdc 100644 --- a/src/clicache/src/RegionFactory.cpp +++ b/src/clicache/src/RegionFactory.cpp @@ -43,13 +43,13 @@ using namespace System; using namespace System::Collections::Generic; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { RegionFactory^ RegionFactory::SetCacheLoader( String^ libPath, String^ factoryFunctionName ) { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionFactory.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionFactory.hpp b/src/clicache/src/RegionFactory.hpp index 47fd3e5..dae21d4 100644 --- a/src/clicache/src/RegionFactory.hpp +++ b/src/clicache/src/RegionFactory.hpp @@ -40,13 +40,13 @@ using namespace System; using namespace System::Collections::Generic; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { /// <summary> /// This interface provides for the configuration and creation of instances of Region. http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/RegionShortcut.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/RegionShortcut.hpp b/src/clicache/src/RegionShortcut.hpp index 0e8edf9..cea88f0 100644 --- a/src/clicache/src/RegionShortcut.hpp +++ b/src/clicache/src/RegionShortcut.hpp @@ -22,11 +22,13 @@ using namespace System; //using namespace System::Runtime::InteropServices; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { /// <summary> /// Each enum represents a predefined <see cref="RegionAttributes" /> in a <see cref="Cache" />. http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ResultCollector.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ResultCollector.cpp b/src/clicache/src/ResultCollector.cpp index eb51a1d..661dc05 100644 --- a/src/clicache/src/ResultCollector.cpp +++ b/src/clicache/src/ResultCollector.cpp @@ -24,11 +24,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TResult> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ResultCollector.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ResultCollector.hpp b/src/clicache/src/ResultCollector.hpp index e00983f..0664450 100644 --- a/src/clicache/src/ResultCollector.hpp +++ b/src/clicache/src/ResultCollector.hpp @@ -27,11 +27,13 @@ using namespace System; using namespace System::Collections::Generic; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TResult> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ResultSet.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ResultSet.cpp b/src/clicache/src/ResultSet.cpp index 74da11a..ac9329b 100644 --- a/src/clicache/src/ResultSet.cpp +++ b/src/clicache/src/ResultSet.cpp @@ -24,11 +24,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TResult> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/ResultSet.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/ResultSet.hpp b/src/clicache/src/ResultSet.hpp index d099577..a810e53 100644 --- a/src/clicache/src/ResultSet.hpp +++ b/src/clicache/src/ResultSet.hpp @@ -25,13 +25,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - - namespace Generic + namespace Client + { +namespace Generic { interface class IGFSerializable; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/SelectResultsIterator.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/SelectResultsIterator.cpp b/src/clicache/src/SelectResultsIterator.cpp index 34ff22f..12f9d9a 100644 --- a/src/clicache/src/SelectResultsIterator.cpp +++ b/src/clicache/src/SelectResultsIterator.cpp @@ -21,15 +21,17 @@ #include "impl/SafeConvert.hpp" using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TResult> - /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult SelectResultsIterator<TResult>::Current::get( ) + /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult SelectResultsIterator<TResult>::Current::get( ) { //return SafeUMSerializableConvertGeneric( NativePtr->current( ).ptr( ) ); return Serializable::GetManagedValueGeneric<TResult>(NativePtr->current( )); @@ -48,7 +50,7 @@ namespace GemStone } generic<class TResult> - /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult SelectResultsIterator<TResult>::Next( ) + /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult SelectResultsIterator<TResult>::Next( ) { //return SafeUMSerializableConvertGeneric( NativePtr->next( ).ptr( ) ); return Serializable::GetManagedValueGeneric<TResult>(NativePtr->next( )); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/SelectResultsIterator.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/SelectResultsIterator.hpp b/src/clicache/src/SelectResultsIterator.hpp index 312fa04..a6ac90d 100644 --- a/src/clicache/src/SelectResultsIterator.hpp +++ b/src/clicache/src/SelectResultsIterator.hpp @@ -24,12 +24,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - namespace Generic + namespace Client + { +namespace Generic { interface class IGFSerializable; @@ -39,7 +40,7 @@ namespace GemStone generic<class TResult> public ref class SelectResultsIterator sealed : public Internal::UMWrap<apache::geode::client::SelectResultsIterator>, - public System::Collections::Generic::IEnumerator</*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult> + public System::Collections::Generic::IEnumerator</*Apache::Geode::Client::Generic::IGFSerializable^*/TResult> { public: @@ -51,9 +52,9 @@ namespace GemStone /// The element in the collection at the current position /// of the enumerator. /// </returns> - virtual property /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult Current + virtual property /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult Current { - virtual /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult get( ); + virtual /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult get( ); } /// <summary> @@ -75,7 +76,7 @@ namespace GemStone /// <summary> /// Get the current element and move to the next one. /// </summary> - /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult Next( ); + /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult Next( ); /// <summary> /// Check if there is a next element. @@ -96,11 +97,11 @@ namespace GemStone /// <returns> /// The managed wrapper object; null if the native pointer is null. /// </returns> - inline static GemStone::GemFire::Cache::Generic::SelectResultsIterator<TResult>^ Create( + inline static Apache::Geode::Client::Generic::SelectResultsIterator<TResult>^ Create( apache::geode::client::SelectResultsIterator* nativeptr ) { return ( nativeptr != nullptr ? - gcnew GemStone::GemFire::Cache::Generic::SelectResultsIterator<TResult>( nativeptr ) : nullptr ); + gcnew Apache::Geode::Client::Generic::SelectResultsIterator<TResult>( nativeptr ) : nullptr ); }
