http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/CacheListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CacheListener.hpp b/src/clicache/src/impl/CacheListener.hpp index e778672..9c8a802 100644 --- a/src/clicache/src/impl/CacheListener.hpp +++ b/src/clicache/src/impl/CacheListener.hpp @@ -24,13 +24,15 @@ using namespace System; -using namespace GemStone::GemFire::Cache; +using namespace Apache::Geode::Client; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TValue> @@ -47,63 +49,63 @@ namespace GemStone m_listener = listener; } - virtual void AfterUpdate(GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^>^ event) override + virtual void AfterUpdate(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ event) override { EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(event)); m_listener->AfterUpdate(%gevent); } - virtual void AfterCreate(GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^>^ event) override + virtual void AfterCreate(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ event) override { EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(event)); m_listener->AfterCreate(%gevent); } - virtual void AfterInvalidate(GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^>^ event) override + virtual void AfterInvalidate(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ event) override { EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(event)); m_listener->AfterInvalidate(%gevent); } - virtual void AfterDestroy(GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^>^ event) override + virtual void AfterDestroy(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ event) override { EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(event)); m_listener->AfterDestroy(%gevent); } - virtual void AfterRegionLive(GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^>^ event) override + virtual void AfterRegionLive(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ event) override { RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(event)); m_listener->AfterRegionLive(%gevent); } - virtual void AfterRegionClear(GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^>^ event) override + virtual void AfterRegionClear(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ event) override { RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(event)); m_listener->AfterRegionClear(%gevent); } - virtual void AfterRegionDestroy(GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^>^ event) override + virtual void AfterRegionDestroy(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ event) override { RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(event)); m_listener->AfterRegionDestroy(%gevent); } - virtual void AfterRegionInvalidate(GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^>^ event) override + virtual void AfterRegionInvalidate(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ event) override { RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(event)); m_listener->AfterRegionInvalidate(%gevent); } - virtual void AfterRegionDisconnected(GemStone::GemFire::Cache::Generic::IRegion<Object^, Object^>^ event) override + virtual void AfterRegionDisconnected(Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ event) override { - GemStone::GemFire::Cache::Generic::IRegion<TKey, TValue>^ gevent = GemStone::GemFire::Cache::Generic::Region<TKey, TValue>::Create(GemStone::GemFire::Cache::Generic::GetNativePtr<apache::geode::client::Region>(reinterpret_cast<GemStone::GemFire::Cache::Generic::Region<Object^, Object^>^>(event))); + Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ gevent = Apache::Geode::Client::Generic::Region<TKey, TValue>::Create(Apache::Geode::Client::Generic::GetNativePtr<apache::geode::client::Region>(reinterpret_cast<Apache::Geode::Client::Generic::Region<Object^, Object^>^>(event))); m_listener->AfterRegionDisconnected(gevent); } - virtual void Close(GemStone::GemFire::Cache::Generic::IRegion<Object^, Object^>^ event) override + virtual void Close(Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ event) override { - GemStone::GemFire::Cache::Generic::IRegion<TKey, TValue>^ gevent = GemStone::GemFire::Cache::Generic::Region<TKey, TValue>::Create(GemStone::GemFire::Cache::Generic::GetNativePtr<apache::geode::client::Region>(reinterpret_cast<GemStone::GemFire::Cache::Generic::Region<Object^, Object^>^>(event))); + Apache::Geode::Client::Generic::IRegion<TKey, TValue>^ gevent = Apache::Geode::Client::Generic::Region<TKey, TValue>::Create(Apache::Geode::Client::Generic::GetNativePtr<apache::geode::client::Region>(reinterpret_cast<Apache::Geode::Client::Generic::Region<Object^, Object^>^>(event))); m_listener->Close(gevent); } };
http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/CacheLoader.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CacheLoader.hpp b/src/clicache/src/impl/CacheLoader.hpp index 1fe796a..4f8c23a 100644 --- a/src/clicache/src/impl/CacheLoader.hpp +++ b/src/clicache/src/impl/CacheLoader.hpp @@ -28,13 +28,15 @@ using namespace System; -//using namespace GemStone::GemFire::Cache::Generic; +//using namespace Apache::Geode::Client::Generic; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { public interface class ICacheLoaderProxy @@ -47,7 +49,7 @@ namespace GemStone }; generic<class TKey, class TValue> - public ref class CacheLoaderGeneric : ICacheLoaderProxy // : GemStone::GemFire::Cache::ICacheLoader /*<Object^, Object^>*/ + public ref class CacheLoaderGeneric : ICacheLoaderProxy // : Apache::Geode::Client::ICacheLoader /*<Object^, Object^>*/ { private: http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/CacheWriter.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CacheWriter.hpp b/src/clicache/src/impl/CacheWriter.hpp index 7c7dc6f..2e088fb 100644 --- a/src/clicache/src/impl/CacheWriter.hpp +++ b/src/clicache/src/impl/CacheWriter.hpp @@ -24,17 +24,19 @@ using namespace System; -using namespace GemStone::GemFire::Cache; +using namespace Apache::Geode::Client; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TValue> - public ref class CacheWriterGeneric : GemStone::GemFire::Cache::Generic::CacheWriterAdapter<Object^, Object^> + public ref class CacheWriterGeneric : Apache::Geode::Client::Generic::CacheWriterAdapter<Object^, Object^> { private: @@ -47,39 +49,39 @@ namespace GemStone m_writer = writer; } - virtual bool BeforeUpdate( GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^>^ ev ) override + virtual bool BeforeUpdate( Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ ev ) override { EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(ev)); return m_writer->BeforeUpdate(%gevent); } - virtual bool BeforeCreate(GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^>^ ev) override + virtual bool BeforeCreate(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ ev) override { EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(ev)); return m_writer->BeforeCreate(%gevent); } - virtual bool BeforeDestroy(GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^>^ ev) override + virtual bool BeforeDestroy(Apache::Geode::Client::Generic::EntryEvent<Object^, Object^>^ ev) override { EntryEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::EntryEvent>(ev)); return m_writer->BeforeDestroy(%gevent); } - virtual bool BeforeRegionClear( GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^>^ ev ) override + virtual bool BeforeRegionClear( Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ ev ) override { RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(ev)); return m_writer->BeforeRegionClear(%gevent); } - virtual bool BeforeRegionDestroy(GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^>^ ev) override + virtual bool BeforeRegionDestroy(Apache::Geode::Client::Generic::RegionEvent<Object^, Object^>^ ev) override { RegionEvent<TKey, TValue> gevent(Generic::GetNativePtr<apache::geode::client::RegionEvent>(ev)); return m_writer->BeforeRegionDestroy(%gevent); } - virtual void Close(GemStone::GemFire::Cache::Generic::Region<Object^, Object^>^ region) override + virtual void Close(Apache::Geode::Client::Generic::Region<Object^, Object^>^ region) override { - IRegion<TKey, TValue>^ gregion = GemStone::GemFire::Cache::Generic::Region<TKey, TValue>::Create(Generic::GetNativePtr<apache::geode::client::Region>(region)); + IRegion<TKey, TValue>^ gregion = Apache::Geode::Client::Generic::Region<TKey, TValue>::Create(Generic::GetNativePtr<apache::geode::client::Region>(region)); m_writer->Close(gregion); } }; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/CliCallbackDelgate.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CliCallbackDelgate.hpp b/src/clicache/src/impl/CliCallbackDelgate.hpp index af607a8..7cea76c 100755 --- a/src/clicache/src/impl/CliCallbackDelgate.hpp +++ b/src/clicache/src/impl/CliCallbackDelgate.hpp @@ -26,11 +26,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { /// <summary> @@ -46,8 +48,8 @@ namespace GemStone void Callback( ) { - GemStone::GemFire::Cache::Generic::Log::Fine("CliCallbackDelgate::Callback( ) "); - GemStone::GemFire::Cache::Generic::Internal::PdxTypeRegistry::clear(); + Apache::Geode::Client::Generic::Log::Fine("CliCallbackDelgate::Callback( ) "); + Apache::Geode::Client::Generic::Internal::PdxTypeRegistry::clear(); } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/CqListenerProxy.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CqListenerProxy.hpp b/src/clicache/src/impl/CqListenerProxy.hpp index 5ff3793..8c7b1d7 100644 --- a/src/clicache/src/impl/CqListenerProxy.hpp +++ b/src/clicache/src/impl/CqListenerProxy.hpp @@ -21,17 +21,19 @@ #include "SafeConvert.hpp" using namespace System; -//using namespace GemStone::GemFire::Cache; +//using namespace Apache::Geode::Client; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { generic<class TKey, class TResult> - public ref class CqListenerGeneric : GemStone::GemFire::Cache::Generic::ICqListener<Object^, Object^> + public ref class CqListenerGeneric : Apache::Geode::Client::Generic::ICqListener<Object^, Object^> { private: @@ -44,14 +46,14 @@ namespace GemStone m_listener = listener; } - virtual void OnEvent( GemStone::GemFire::Cache::Generic::CqEvent<Object^, Object^>^ ev) + virtual void OnEvent( Apache::Geode::Client::Generic::CqEvent<Object^, Object^>^ ev) { //TODO:split---Done CqEvent<TKey, TResult> gevent(GetNativePtr<apache::geode::client::CqEvent>(ev)); m_listener->OnEvent(%gevent); } - virtual void OnError(GemStone::GemFire::Cache::Generic::CqEvent<Object^, Object^>^ ev) + virtual void OnError(Apache::Geode::Client::Generic::CqEvent<Object^, Object^>^ ev) { //TODO::split--Done CqEvent<TKey, TResult> gevent(GetNativePtr<apache::geode::client::CqEvent>(ev)); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/CqStatusListenerProxy.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/CqStatusListenerProxy.hpp b/src/clicache/src/impl/CqStatusListenerProxy.hpp index 05f33e4..960bf9f 100644 --- a/src/clicache/src/impl/CqStatusListenerProxy.hpp +++ b/src/clicache/src/impl/CqStatusListenerProxy.hpp @@ -20,16 +20,16 @@ #include "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 TResult> - public ref class CqStatusListenerGeneric : GemStone::GemFire::Cache::Generic::ICqStatusListener<Object^, Object^> + public ref class CqStatusListenerGeneric : Apache::Geode::Client::Generic::ICqStatusListener<Object^, Object^> { private: @@ -42,14 +42,14 @@ namespace GemStone m_listener = dynamic_cast<ICqStatusListener<TKey, TResult>^>(listener); } - virtual void OnEvent(GemStone::GemFire::Cache::Generic::CqEvent<Object^, Object^>^ ev) + virtual void OnEvent(Apache::Geode::Client::Generic::CqEvent<Object^, Object^>^ ev) { //TODO:split---Done CqEvent<TKey, TResult> gevent(GetNativePtr<apache::geode::client::CqEvent>(ev)); m_listener->OnEvent(%gevent); } - virtual void OnError( GemStone::GemFire::Cache::Generic::CqEvent<Object^, Object^>^ ev) + virtual void OnError( Apache::Geode::Client::Generic::CqEvent<Object^, Object^>^ ev) { //TODO::split--Done CqEvent<TKey, TResult> gevent(GetNativePtr<apache::geode::client::CqEvent>(ev)); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/DelegateWrapper.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/DelegateWrapper.hpp b/src/clicache/src/impl/DelegateWrapper.hpp index 136afd5..a0e804f 100644 --- a/src/clicache/src/impl/DelegateWrapper.hpp +++ b/src/clicache/src/impl/DelegateWrapper.hpp @@ -25,11 +25,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { /// <summary> http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/DotNetTypes.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/DotNetTypes.hpp b/src/clicache/src/impl/DotNetTypes.hpp index 0b0659b..2b9b021 100755 --- a/src/clicache/src/impl/DotNetTypes.hpp +++ b/src/clicache/src/impl/DotNetTypes.hpp @@ -17,13 +17,13 @@ #pragma once -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { namespace Internal { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/EnumInfo.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/EnumInfo.cpp b/src/clicache/src/impl/EnumInfo.cpp index 91d8315..7f209bd 100755 --- a/src/clicache/src/impl/EnumInfo.cpp +++ b/src/clicache/src/impl/EnumInfo.cpp @@ -22,13 +22,13 @@ #include "../DataInput.hpp" using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { namespace Internal { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/EnumInfo.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/EnumInfo.hpp b/src/clicache/src/impl/EnumInfo.hpp index bb72e32..c8bb812 100755 --- a/src/clicache/src/impl/EnumInfo.hpp +++ b/src/clicache/src/impl/EnumInfo.hpp @@ -21,13 +21,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 { namespace Internal { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/FixedPartitionResolver.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/FixedPartitionResolver.hpp b/src/clicache/src/impl/FixedPartitionResolver.hpp index a5e19e3..a51c833 100644 --- a/src/clicache/src/impl/FixedPartitionResolver.hpp +++ b/src/clicache/src/impl/FixedPartitionResolver.hpp @@ -24,11 +24,13 @@ using namespace System; using namespace System::Collections::Generic; using namespace System::Threading; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { public interface class IFixedPartitionResolverProxy http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/GFDataInputStream.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/GFDataInputStream.hpp b/src/clicache/src/impl/GFDataInputStream.hpp index 6571c8c..91cf62f 100644 --- a/src/clicache/src/impl/GFDataInputStream.hpp +++ b/src/clicache/src/impl/GFDataInputStream.hpp @@ -24,11 +24,13 @@ using namespace System; using namespace System::IO; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { ref class GFDataInputStream : public Stream { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/GFDataOutputStream.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/GFDataOutputStream.hpp b/src/clicache/src/impl/GFDataOutputStream.hpp index 44b226b..56a3242 100644 --- a/src/clicache/src/impl/GFDataOutputStream.hpp +++ b/src/clicache/src/impl/GFDataOutputStream.hpp @@ -24,11 +24,13 @@ using namespace System; using namespace System::IO; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { ref class GFDataOutputStream : public Stream { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/GFNullStream.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/GFNullStream.hpp b/src/clicache/src/impl/GFNullStream.hpp index 9fe46e6..c45f752 100644 --- a/src/clicache/src/impl/GFNullStream.hpp +++ b/src/clicache/src/impl/GFNullStream.hpp @@ -22,11 +22,13 @@ using namespace System; using namespace System::IO; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { ref class GFNullStream : public Stream { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedAuthInitialize.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedAuthInitialize.cpp b/src/clicache/src/impl/ManagedAuthInitialize.cpp index 731eec7..d0028f0 100644 --- a/src/clicache/src/impl/ManagedAuthInitialize.cpp +++ b/src/clicache/src/impl/ManagedAuthInitialize.cpp @@ -40,9 +40,9 @@ namespace apache try { String^ mg_assemblyPath = - GemStone::GemFire::Cache::Generic::ManagedString::Get(assemblyPath); + Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath); String^ mg_factoryFunctionName = - GemStone::GemFire::Cache::Generic::ManagedString::Get(factoryFunctionName); + Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName); String^ mg_typeName = nullptr; int32_t dotIndx = -1; @@ -102,7 +102,7 @@ namespace apache */ //typeInst = typeInst->GetType()->MakeGenericType(types); - GemStone::GemFire::Cache::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); + Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); /* MethodInfo^ mInfo = typeInst->GetMethod( mg_factoryFunctionName, @@ -132,7 +132,7 @@ namespace apache ex_str += assemblyPath; throw AuthenticationRequiredException(ex_str.c_str()); } - ManagedAuthInitializeGeneric * maig = new ManagedAuthInitializeGeneric(safe_cast<GemStone::GemFire::Cache::Generic::IAuthInitialize^>(userptr)); + ManagedAuthInitializeGeneric * maig = new ManagedAuthInitializeGeneric(safe_cast<Apache::Geode::Client::Generic::IAuthInitialize^>(userptr)); return maig; } else @@ -147,7 +147,7 @@ namespace apache } else { - GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName); + Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName); std::string ex_str = "ManagedAuthInitializeGeneric: Could not load type ["; ex_str += typeName.CharPtr; ex_str += "] in assembly: "; @@ -170,7 +170,7 @@ namespace apache } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString()); + Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString()); std::string ex_str = "ManagedAuthInitializeGeneric: Got an exception while " "loading managed library: "; ex_str += mg_exStr.CharPtr; @@ -183,17 +183,17 @@ namespace apache securityprops, const char* server) { try { - GemStone::GemFire::Cache::Generic::Properties<String^, String^>^ mprops = - GemStone::GemFire::Cache::Generic::Properties<String^, String^>::Create<String^, String^>(securityprops.ptr()); - String^ mg_server = GemStone::GemFire::Cache::Generic::ManagedString::Get(server); + Apache::Geode::Client::Generic::Properties<String^, String^>^ mprops = + Apache::Geode::Client::Generic::Properties<String^, String^>::Create<String^, String^>(securityprops.ptr()); + String^ mg_server = Apache::Geode::Client::Generic::ManagedString::Get(server); return PropertiesPtr(m_managedptr->GetCredentials(mprops, mg_server)->NativePtr()); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return NULLPTR; } @@ -203,11 +203,11 @@ namespace apache try { m_managedptr->Close(); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedAuthInitialize.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedAuthInitialize.hpp b/src/clicache/src/impl/ManagedAuthInitialize.hpp index 93df540..6ef656f 100644 --- a/src/clicache/src/impl/ManagedAuthInitialize.hpp +++ b/src/clicache/src/impl/ManagedAuthInitialize.hpp @@ -32,7 +32,7 @@ namespace apache { /// <summary> - /// Wraps the managed <see cref="GemStone.GemFire.Cache.Generic.IAuthInitialize" /> + /// Wraps the managed <see cref="Apache.Geode.Client.Generic.IAuthInitialize" /> /// object and implements the native <c>apache::geode::client::AuthInitialize</c> interface. /// </summary> class ManagedAuthInitializeGeneric @@ -46,7 +46,7 @@ namespace apache /// <param name="managedptr"> /// The managed object. /// </param> - inline ManagedAuthInitializeGeneric(GemStone::GemFire::Cache::Generic::IAuthInitialize^ managedptr) + inline ManagedAuthInitializeGeneric(Apache::Geode::Client::Generic::IAuthInitialize^ managedptr) : m_managedptr(managedptr) { } /// <summary> @@ -81,7 +81,7 @@ namespace apache /// callback instance, so implementations must be tolerant of this. /// </para> /// </remarks> - /// <seealso cref="GemStone.GemFire.Cache.Cache.Close" /> + /// <seealso cref="Apache.Geode.Client.Cache.Close" /> virtual void close(); /// <summary> @@ -100,7 +100,7 @@ namespace apache /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline GemStone::GemFire::Cache::Generic::IAuthInitialize^ ptr() const + inline Apache::Geode::Client::Generic::IAuthInitialize^ ptr() const { return m_managedptr; } @@ -113,7 +113,7 @@ namespace apache /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<GemStone::GemFire::Cache::Generic::IAuthInitialize^> m_managedptr; + gcroot<Apache::Geode::Client::Generic::IAuthInitialize^> m_managedptr; // Disable the copy and assignment constructors ManagedAuthInitializeGeneric(const ManagedAuthInitializeGeneric&); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheListener.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheListener.cpp b/src/clicache/src/impl/ManagedCacheListener.cpp index fc678fb..8752067 100644 --- a/src/clicache/src/impl/ManagedCacheListener.cpp +++ b/src/clicache/src/impl/ManagedCacheListener.cpp @@ -44,9 +44,9 @@ namespace apache try { String^ mg_assemblyPath = - GemStone::GemFire::Cache::Generic::ManagedString::Get(assemblyPath); + Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath); String^ mg_factoryFunctionName = - GemStone::GemFire::Cache::Generic::ManagedString::Get(factoryFunctionName); + Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName); String^ mg_typeName = nullptr; String^ mg_genericKey = nullptr; @@ -100,7 +100,7 @@ namespace apache mg_genericVal = mg_genericVal->Trim(); mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1); - GemStone::GemFire::Cache::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", + Apache::Geode::Client::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName); typeBuilder->Append("`2"); @@ -122,7 +122,7 @@ namespace apache throw apache::geode::client::IllegalArgumentException(ex_str.c_str()); } - GemStone::GemFire::Cache::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); + Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); Type^ typeInst = assmb->GetType(mg_typeName, false, true); @@ -139,7 +139,7 @@ namespace apache } typeInst = typeInst->MakeGenericType(types); - GemStone::GemFire::Cache::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); + Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); MethodInfo^ mInfo = typeInst->GetMethod(mg_factoryFunctionName, BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase); @@ -153,7 +153,7 @@ namespace apache } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); + Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); userptr = nullptr; } if (userptr == nullptr) @@ -168,7 +168,7 @@ namespace apache ManagedCacheListenerGeneric * mgcl = new ManagedCacheListenerGeneric(userptr); - Type^ clgType = Type::GetType("GemStone.GemFire.Cache.Generic.CacheListenerGeneric`2"); + Type^ clgType = Type::GetType("Apache.Geode.Client.Generic.CacheListenerGeneric`2"); clgType = clgType->MakeGenericType(types); Object^ clg = Activator::CreateInstance(clgType); @@ -177,7 +177,7 @@ namespace apache params[0] = userptr; mInfo->Invoke(clg, params); - mgcl->setptr((GemStone::GemFire::Cache::Generic::ICacheListener<Object^, Object^>^)clg); + mgcl->setptr((Apache::Geode::Client::Generic::ICacheListener<Object^, Object^>^)clg); return mgcl; } @@ -193,7 +193,7 @@ namespace apache } else { - GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName); + Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName); std::string ex_str = "ManagedCacheListenerGeneric: Could not load type ["; ex_str += typeName.CharPtr; ex_str += "] in assembly: "; @@ -207,7 +207,7 @@ namespace apache } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString()); + Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString()); std::string ex_str = "ManagedCacheListenerGeneric: Got an exception while " "loading managed library: "; ex_str += mg_exStr.CharPtr; @@ -219,141 +219,141 @@ namespace apache void ManagedCacheListenerGeneric::afterCreate(const apache::geode::client::EntryEvent& ev) { try { - GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterCreate(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterUpdate(const apache::geode::client::EntryEvent& ev) { try { - GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterUpdate(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterInvalidate(const apache::geode::client::EntryEvent& ev) { try { - GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterInvalidate(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterDestroy(const apache::geode::client::EntryEvent& ev) { try { - GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterDestroy(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionClear(const apache::geode::client::RegionEvent& ev) { try { - GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterRegionClear(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionInvalidate(const apache::geode::client::RegionEvent& ev) { try { - GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterRegionInvalidate(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionDestroy(const apache::geode::client::RegionEvent& ev) { try { - GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterRegionDestroy(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionLive(const apache::geode::client::RegionEvent& ev) { try { - GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); m_managedptr->AfterRegionLive(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::close(const apache::geode::client::RegionPtr& region) { try { - GemStone::GemFire::Cache::Generic::IRegion<Object^, Object^>^ mregion = - GemStone::GemFire::Cache::Generic::Region<Object^, Object^>::Create(region.ptr()); + Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ mregion = + Apache::Geode::Client::Generic::Region<Object^, Object^>::Create(region.ptr()); m_managedptr->Close(mregion); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheListenerGeneric::afterRegionDisconnected(const apache::geode::client::RegionPtr& region) { try { - GemStone::GemFire::Cache::Generic::IRegion<Object^, Object^>^ mregion = - GemStone::GemFire::Cache::Generic::Region<Object^, Object^>::Create(region.ptr()); + Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ mregion = + Apache::Geode::Client::Generic::Region<Object^, Object^>::Create(region.ptr()); m_managedptr->AfterRegionDisconnected(mregion); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheListener.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheListener.hpp b/src/clicache/src/impl/ManagedCacheListener.hpp index 470bc3c..97a2a83 100644 --- a/src/clicache/src/impl/ManagedCacheListener.hpp +++ b/src/clicache/src/impl/ManagedCacheListener.hpp @@ -22,13 +22,13 @@ #include <gfcpp/CacheListener.hpp> #include "../ICacheListener.hpp" -namespace GemStone { - - namespace GemFire { - - namespace Cache { - - interface class ICacheListener; +namespace Apache +{ + namespace Geode + { + namespace Client + { +interface class ICacheListener; } } } @@ -38,7 +38,7 @@ namespace apache { namespace client { /// <summary> - /// Wraps the managed <see cref="GemStone.GemFire.Cache.ICacheListener" /> + /// Wraps the managed <see cref="Apache.Geode.Client.ICacheListener" /> /// object and implements the native <c>apache::geode::client::CacheListener</c> interface. /// </summary> class ManagedCacheListenerGeneric @@ -53,7 +53,7 @@ namespace apache { /// The managed object. /// </param> inline ManagedCacheListenerGeneric( - /*GemStone::GemFire::Cache::ICacheListener^ managedptr,*/ Object^ userptr) + /*Apache::Geode::Client::ICacheListener^ managedptr,*/ Object^ userptr) : /*m_managedptr( managedptr ),*/ m_userptr(userptr) { } /// <summary> @@ -94,9 +94,9 @@ namespace apache { /// <param name="ev"> /// Denotes the event object associated with the entry creation. /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.Create" /> - /// <seealso cref="GemStone.GemFire.Cache.Region.Put" /> - /// <seealso cref="GemStone.GemFire.Cache.Region.Get" /> + /// <seealso cref="Apache.Geode.Client.Region.Create" /> + /// <seealso cref="Apache.Geode.Client.Region.Put" /> + /// <seealso cref="Apache.Geode.Client.Region.Get" /> virtual void afterCreate(const apache::geode::client::EntryEvent& ev); /// <summary> @@ -109,7 +109,7 @@ namespace apache { /// <param name="ev"> /// EntryEvent denotes the event object associated with updating the entry. /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.Put" /> + /// <seealso cref="Apache.Geode.Client.Region.Put" /> virtual void afterUpdate(const apache::geode::client::EntryEvent& ev); /// <summary> @@ -126,7 +126,7 @@ namespace apache { /// <param name="ev"> /// EntryEvent denotes the event object associated with the entry destruction. /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.Destroy" /> + /// <seealso cref="Apache.Geode.Client.Region.Destroy" /> virtual void afterDestroy(const apache::geode::client::EntryEvent& ev); /// <summary> @@ -145,7 +145,7 @@ namespace apache { /// <param name="ev"> /// RegionEvent denotes the event object associated with the region invalidation. /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.InvalidateRegion" /> + /// <seealso cref="Apache.Geode.Client.Region.InvalidateRegion" /> virtual void afterRegionInvalidate(const apache::geode::client::RegionEvent& ev); /// <summary> @@ -159,7 +159,7 @@ namespace apache { /// <param name="ev"> /// RegionEvent denotes the event object associated with the region destruction. /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.DestroyRegion" /> + /// <seealso cref="Apache.Geode.Client.Region.DestroyRegion" /> virtual void afterRegionDestroy(const apache::geode::client::RegionEvent& ev); /// <summary> @@ -171,7 +171,7 @@ namespace apache { /// <param name="ev"> /// RegionEvent denotes the event object associated with the region going live. /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Cache.ReadyForEvents" /> + /// <seealso cref="Apache.Geode.Client.Cache.ReadyForEvents" /> virtual void afterRegionLive(const apache::geode::client::RegionEvent& ev); /// <summary> @@ -187,8 +187,8 @@ namespace apache { /// callback instance, so implementations must be tolerant of this. /// </para> /// </remarks> - /// <seealso cref="GemStone.GemFire.Cache.Cache.Close" /> - /// <seealso cref="GemStone.GemFire.Cache.Region.DestroyRegion" /> + /// <seealso cref="Apache.Geode.Client.Cache.Close" /> + /// <seealso cref="Apache.Geode.Client.Region.DestroyRegion" /> virtual void close(const apache::geode::client::RegionPtr& region); ///<summary> @@ -207,12 +207,12 @@ namespace apache { /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline GemStone::GemFire::Cache::Generic::ICacheListener<Object^, Object^>^ ptr() const + inline Apache::Geode::Client::Generic::ICacheListener<Object^, Object^>^ ptr() const { return m_managedptr; } - inline void setptr(GemStone::GemFire::Cache::Generic::ICacheListener<Object^, Object^>^ managedptr) + inline void setptr(Apache::Geode::Client::Generic::ICacheListener<Object^, Object^>^ managedptr) { m_managedptr = managedptr; } @@ -230,7 +230,7 @@ namespace apache { /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<GemStone::GemFire::Cache::Generic::ICacheListener<Object^, Object^>^> m_managedptr; + gcroot<Apache::Geode::Client::Generic::ICacheListener<Object^, Object^>^> m_managedptr; gcroot<Object^> m_userptr; }; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheLoader.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheLoader.cpp b/src/clicache/src/impl/ManagedCacheLoader.cpp index 5d1a6cc..4492a02 100644 --- a/src/clicache/src/impl/ManagedCacheLoader.cpp +++ b/src/clicache/src/impl/ManagedCacheLoader.cpp @@ -42,9 +42,9 @@ namespace apache try { String^ mg_assemblyPath = - GemStone::GemFire::Cache::Generic::ManagedString::Get(assemblyPath); + Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath); String^ mg_factoryFunctionName = - GemStone::GemFire::Cache::Generic::ManagedString::Get(factoryFunctionName); + Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName); String^ mg_typeName = nullptr; String^ mg_genericKey = nullptr; @@ -98,7 +98,7 @@ namespace apache mg_genericVal = mg_genericVal->Trim(); mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1); - GemStone::GemFire::Cache::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", + Apache::Geode::Client::Generic::Log::Fine("Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName); typeBuilder->Append("`2"); @@ -120,7 +120,7 @@ namespace apache throw IllegalArgumentException(ex_str.c_str()); } - GemStone::GemFire::Cache::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); + Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); Type^ typeInst = assmb->GetType(mg_typeName, false, true); @@ -137,7 +137,7 @@ namespace apache } typeInst = typeInst->MakeGenericType(types); - GemStone::GemFire::Cache::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); + Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); MethodInfo^ mInfo = typeInst->GetMethod(mg_factoryFunctionName, BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase); @@ -151,7 +151,7 @@ namespace apache } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); + Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); managedptr = nullptr; } if (managedptr == nullptr) @@ -166,7 +166,7 @@ namespace apache ManagedCacheLoaderGeneric* mgcl = new ManagedCacheLoaderGeneric(managedptr); - Type^ clgType = Type::GetType("GemStone.GemFire.Cache.Generic.CacheLoaderGeneric`2"); + Type^ clgType = Type::GetType("Apache.Geode.Client.Generic.CacheLoaderGeneric`2"); clgType = clgType->MakeGenericType(types); Object^ clg = Activator::CreateInstance(clgType); @@ -175,7 +175,7 @@ namespace apache params[0] = managedptr; mInfo->Invoke(clg, params); - mgcl->setptr((GemStone::GemFire::Cache::Generic::ICacheLoaderProxy^)clg); + mgcl->setptr((Apache::Geode::Client::Generic::ICacheLoaderProxy^)clg); return mgcl; } @@ -191,7 +191,7 @@ namespace apache } else { - GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName); + Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName); std::string ex_str = "ManagedCacheLoaderGeneric: Could not load type ["; ex_str += typeName.CharPtr; ex_str += "] in assembly: "; @@ -205,7 +205,7 @@ namespace apache } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString()); + Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString()); std::string ex_str = "ManagedCacheLoaderGeneric: Got an exception while " "loading managed library: "; ex_str += mg_exStr.CharPtr; @@ -233,11 +233,11 @@ namespace apache */ return m_managedptr->load(region, key, aCallbackArgument); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return NULLPTR; } @@ -246,17 +246,17 @@ namespace apache { try { /* - GemStone::GemFire::Cache::Region^ mregion = - GemStone::GemFire::Cache::Region::Create( region.ptr( ) ); + Apache::Geode::Client::Region^ mregion = + Apache::Geode::Client::Region::Create( region.ptr( ) ); */ m_managedptr->close(region); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheLoader.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheLoader.hpp b/src/clicache/src/impl/ManagedCacheLoader.hpp index b15cdb3..3586b89 100644 --- a/src/clicache/src/impl/ManagedCacheLoader.hpp +++ b/src/clicache/src/impl/ManagedCacheLoader.hpp @@ -32,7 +32,7 @@ namespace apache { /// <summary> - /// Wraps the managed <see cref="GemStone.GemFire.Cache.ICacheLoader" /> + /// Wraps the managed <see cref="Apache.Geode.Client.ICacheLoader" /> /// object and implements the native <c>apache::geode::client::CacheLoader</c> interface. /// </summary> class ManagedCacheLoaderGeneric @@ -80,7 +80,7 @@ namespace apache /// This method is called by the caching service when the requested /// value is not in the cache. Any exception thrown by this method /// is propagated back to and thrown by the invocation of - /// <see cref="GemStone.GemFire.Cache.Region.Get" /> that triggered this load. + /// <see cref="Apache.Geode.Client.Region.Get" /> that triggered this load. /// </remarks> /// <param name="region">a Region Pointer for which this is called.</param> /// <param name="key">the key for the cacheable</param> @@ -89,10 +89,10 @@ namespace apache /// the value supplied for this key, or null if no value can be /// supplied. /// If every available loader returns - /// a null value, <see cref="GemStone.GemFire.Cache.Region.Get" /> + /// a null value, <see cref="Apache.Geode.Client.Region.Get" /> /// will return null. /// </returns> - /// <seealso cref="GemStone.GemFire.Cache.Region.Get" /> + /// <seealso cref="Apache.Geode.Client.Region.Get" /> virtual CacheablePtr load(const RegionPtr& region, const CacheableKeyPtr& key, const UserDataPtr& aCallbackArgument); @@ -110,21 +110,21 @@ namespace apache /// </para> /// </remarks> /// <param name="region">the region pointer</param> - /// <seealso cref="GemStone.GemFire.Cache.Cache.Close" /> - /// <seealso cref="GemStone.GemFire.Cache.Region.DestroyRegion" /> + /// <seealso cref="Apache.Geode.Client.Cache.Close" /> + /// <seealso cref="Apache.Geode.Client.Region.DestroyRegion" /> virtual void close(const RegionPtr& region); /* /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline GemStone::GemFire::Cache::ICacheLoader^ ptr( ) const + inline Apache::Geode::Client::ICacheLoader^ ptr( ) const { return m_managedptr; } */ - inline void setptr(GemStone::GemFire::Cache::Generic::ICacheLoaderProxy^ managedptr) + inline void setptr(Apache::Geode::Client::Generic::ICacheLoaderProxy^ managedptr) { m_managedptr = managedptr; } @@ -143,7 +143,7 @@ namespace apache /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<GemStone::GemFire::Cache::Generic::ICacheLoaderProxy^> m_managedptr; + gcroot<Apache::Geode::Client::Generic::ICacheLoaderProxy^> m_managedptr; gcroot<Object^> m_userptr; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheWriter.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheWriter.cpp b/src/clicache/src/impl/ManagedCacheWriter.cpp index 6583ead..8c09e27 100644 --- a/src/clicache/src/impl/ManagedCacheWriter.cpp +++ b/src/clicache/src/impl/ManagedCacheWriter.cpp @@ -44,9 +44,9 @@ namespace apache try { String^ mg_assemblyPath = - GemStone::GemFire::Cache::Generic::ManagedString::Get(assemblyPath); + Apache::Geode::Client::Generic::ManagedString::Get(assemblyPath); String^ mg_factoryFunctionName = - GemStone::GemFire::Cache::Generic::ManagedString::Get(factoryFunctionName); + Apache::Geode::Client::Generic::ManagedString::Get(factoryFunctionName); String^ mg_typeName = nullptr; String^ mg_genericKey = nullptr; @@ -100,7 +100,7 @@ namespace apache mg_genericVal = mg_genericVal->Trim(); mg_factoryFunctionName = mg_factoryFunctionName->Substring(dotIndx + 1); - GemStone::GemFire::Cache::Generic::Log::Fine( + Apache::Geode::Client::Generic::Log::Fine( "Attempting to instantiate a [{0}<{1}, {2}>] via the [{3}] factory method.", mg_typeName, mg_genericKey, mg_genericVal, mg_factoryFunctionName); @@ -123,7 +123,7 @@ namespace apache throw IllegalArgumentException(ex_str.c_str()); } - GemStone::GemFire::Cache::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); + Apache::Geode::Client::Generic::Log::Debug("Loading type: [{0}]", mg_typeName); Type^ typeInst = assmb->GetType(mg_typeName, false, true); @@ -140,7 +140,7 @@ namespace apache } typeInst = typeInst->MakeGenericType(types); - GemStone::GemFire::Cache::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); + Apache::Geode::Client::Generic::Log::Info("Loading function: [{0}]", mg_factoryFunctionName); MethodInfo^ mInfo = typeInst->GetMethod(mg_factoryFunctionName, BindingFlags::Public | BindingFlags::Static | BindingFlags::IgnoreCase); @@ -153,7 +153,7 @@ namespace apache } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); + Apache::Geode::Client::Generic::Log::Debug("{0}: {1}", ex->GetType()->Name, ex->Message); managedptr = nullptr; } if (managedptr == nullptr) @@ -167,7 +167,7 @@ namespace apache } ManagedCacheWriterGeneric* mgcw = new ManagedCacheWriterGeneric(managedptr); - Type^ cwgType = Type::GetType("GemStone.GemFire.Cache.Generic.CacheWriterGeneric`2"); + Type^ cwgType = Type::GetType("Apache.Geode.Client.Generic.CacheWriterGeneric`2"); cwgType = cwgType->MakeGenericType(types); Object^ cwg = Activator::CreateInstance(cwgType); @@ -176,7 +176,7 @@ namespace apache params[0] = managedptr; mInfo->Invoke(cwg, params); - mgcw->setptr((GemStone::GemFire::Cache::Generic::ICacheWriter<Object^, Object^>^)cwg); + mgcw->setptr((Apache::Geode::Client::Generic::ICacheWriter<Object^, Object^>^)cwg); return mgcw; } @@ -192,7 +192,7 @@ namespace apache } else { - GemStone::GemFire::Cache::Generic::ManagedString typeName(mg_typeName); + Apache::Geode::Client::Generic::ManagedString typeName(mg_typeName); std::string ex_str = "ManagedCacheWriterGeneric: Could not load type ["; ex_str += typeName.CharPtr; ex_str += "] in assembly: "; @@ -206,7 +206,7 @@ namespace apache } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::ManagedString mg_exStr(ex->ToString()); + Apache::Geode::Client::Generic::ManagedString mg_exStr(ex->ToString()); std::string ex_str = "ManagedCacheWriterGeneric: Got an exception while " "loading managed library: "; ex_str += mg_exStr.CharPtr; @@ -218,15 +218,15 @@ namespace apache bool ManagedCacheWriterGeneric::beforeUpdate(const EntryEvent& ev) { try { - GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeUpdate(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return false; } @@ -234,15 +234,15 @@ namespace apache bool ManagedCacheWriterGeneric::beforeCreate(const EntryEvent& ev) { try { - GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeCreate(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return false; } @@ -250,30 +250,30 @@ namespace apache bool ManagedCacheWriterGeneric::beforeDestroy(const EntryEvent& ev) { try { - GemStone::GemFire::Cache::Generic::EntryEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::EntryEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeDestroy(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return false; } bool ManagedCacheWriterGeneric::beforeRegionClear(const RegionEvent& ev) { try { - GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeRegionClear(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return false; } @@ -281,15 +281,15 @@ namespace apache bool ManagedCacheWriterGeneric::beforeRegionDestroy(const RegionEvent& ev) { try { - GemStone::GemFire::Cache::Generic::RegionEvent<Object^, Object^> mevent(&ev); + Apache::Geode::Client::Generic::RegionEvent<Object^, Object^> mevent(&ev); return m_managedptr->BeforeRegionDestroy(%mevent); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return false; } @@ -297,16 +297,16 @@ namespace apache void ManagedCacheWriterGeneric::close(const RegionPtr& rp) { try { - GemStone::GemFire::Cache::Generic::IRegion<Object^, Object^>^ mregion = - GemStone::GemFire::Cache::Generic::Region<Object^, Object^>::Create(rp.ptr()); + Apache::Geode::Client::Generic::IRegion<Object^, Object^>^ mregion = + Apache::Geode::Client::Generic::Region<Object^, Object^>::Create(rp.ptr()); - m_managedptr->Close(reinterpret_cast<GemStone::GemFire::Cache::Generic::Region<Object^, Object^>^>(mregion)); + m_managedptr->Close(reinterpret_cast<Apache::Geode::Client::Generic::Region<Object^, Object^>^>(mregion)); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheWriter.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheWriter.hpp b/src/clicache/src/impl/ManagedCacheWriter.hpp index f27c5bf..23713d3 100644 --- a/src/clicache/src/impl/ManagedCacheWriter.hpp +++ b/src/clicache/src/impl/ManagedCacheWriter.hpp @@ -24,13 +24,13 @@ using namespace System; //using namespace apache::geode::client; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - interface class ICacheWriter; +interface class ICacheWriter; } } } @@ -43,7 +43,7 @@ namespace apache { /// <summary> - /// Wraps the managed <see cref="GemStone.GemFire.Cache.ICacheWriter" /> + /// Wraps the managed <see cref="Apache.Geode.Client.ICacheWriter" /> /// object and implements the native <c>apache::geode::client::CacheWriter</c> interface. /// </summary> class ManagedCacheWriterGeneric @@ -94,8 +94,8 @@ namespace apache /// <param name="ev"> /// EntryEvent denotes the event object associated with updating the entry /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.Put" /> - /// <seealso cref="GemStone.GemFire.Cache.Region.Get" /> + /// <seealso cref="Apache.Geode.Client.Region.Put" /> + /// <seealso cref="Apache.Geode.Client.Region.Get" /> bool beforeUpdate(const EntryEvent& ev); /// <summary> @@ -111,9 +111,9 @@ namespace apache /// <param name="ev"> /// EntryEvent denotes the event object associated with creating the entry /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.Create" /> - /// <seealso cref="GemStone.GemFire.Cache.Region.Put" /> - /// <seealso cref="GemStone.GemFire.Cache.Region.Get" /> + /// <seealso cref="Apache.Geode.Client.Region.Create" /> + /// <seealso cref="Apache.Geode.Client.Region.Put" /> + /// <seealso cref="Apache.Geode.Client.Region.Get" /> bool beforeCreate(const EntryEvent& ev); /// <summary> @@ -123,12 +123,12 @@ namespace apache /// The entry being destroyed may or may /// not exist in the local cache where the CacheWriter is installed. This method /// is <em>not</em> called as a result of expiration or - /// <see cref="GemStone.GemFire.Cache.Region.LocalDestroyRegion" />. + /// <see cref="Apache.Geode.Client.Region.LocalDestroyRegion" />. /// </remarks> /// <param name="ev"> /// EntryEvent denotes the event object associated with destroying the entry /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.Destroy" /> + /// <seealso cref="Apache.Geode.Client.Region.Destroy" /> bool beforeDestroy(const EntryEvent& ev); /// <summary> @@ -142,7 +142,7 @@ namespace apache /// <param name="ev"> /// RegionEvent denotes the event object associated with destroying the region /// </param> - /// <seealso cref="GemStone.GemFire.Cache.Region.DestroyRegion" /> + /// <seealso cref="Apache.Geode.Client.Region.DestroyRegion" /> bool beforeRegionDestroy(const RegionEvent& ev); /// <summary> @@ -158,19 +158,19 @@ namespace apache /// callback instance, so implementations must be tolerant of this. /// </para> /// </remarks> - /// <seealso cref="GemStone.GemFire.Cache.Cache.Close" /> - /// <seealso cref="GemStone.GemFire.Cache.Region.DestroyRegion" /> + /// <seealso cref="Apache.Geode.Client.Cache.Close" /> + /// <seealso cref="Apache.Geode.Client.Region.DestroyRegion" /> void close(const RegionPtr& rp); /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline GemStone::GemFire::Cache::Generic::ICacheWriter<Object^, Object^>^ ptr() const + inline Apache::Geode::Client::Generic::ICacheWriter<Object^, Object^>^ ptr() const { return m_managedptr; } - inline void setptr(GemStone::GemFire::Cache::Generic::ICacheWriter<Object^, Object^>^ managedptr) + inline void setptr(Apache::Geode::Client::Generic::ICacheWriter<Object^, Object^>^ managedptr) { m_managedptr = managedptr; } @@ -189,7 +189,7 @@ namespace apache /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<GemStone::GemFire::Cache::Generic::ICacheWriter<Object^, Object^>^> m_managedptr; + gcroot<Apache::Geode::Client::Generic::ICacheWriter<Object^, Object^>^> m_managedptr; gcroot<Object^> m_userptr; }; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheableDelta.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDelta.cpp b/src/clicache/src/impl/ManagedCacheableDelta.cpp index 228cdac..f27d876 100644 --- a/src/clicache/src/impl/ManagedCacheableDelta.cpp +++ b/src/clicache/src/impl/ManagedCacheableDelta.cpp @@ -38,18 +38,18 @@ namespace apache { try { uint32 pos = (int)output.getBufferLength(); - GemStone::GemFire::Cache::Generic::DataOutput mg_output(&output, true); + Apache::Geode::Client::Generic::DataOutput mg_output(&output, true); m_managedSerializableptr->ToData(%mg_output); //this will move the cursor in c++ layer mg_output.WriteBytesToUMDataOutput(); ManagedCacheableDeltaGeneric* tmp = const_cast<ManagedCacheableDeltaGeneric*>(this); tmp->m_objectSize = (int)(output.getBufferLength() - pos); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } @@ -57,7 +57,7 @@ namespace apache { try { int pos = input.getBytesRead(); - GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true); + Apache::Geode::Client::Generic::DataInput mg_input(&input, true); m_managedSerializableptr->FromData(%mg_input); //this will move the cursor in c++ layer @@ -69,11 +69,11 @@ namespace apache m_hashcode = m_managedptr->GetHashCode(); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return this; } @@ -87,11 +87,11 @@ namespace apache else return m_objectSize; } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return 0; } @@ -102,11 +102,11 @@ namespace apache try { classId = m_managedSerializableptr->ClassId; } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return (classId >= 0x80000000 ? 0 : classId); } @@ -128,11 +128,11 @@ namespace apache return (int8_t)GemfireTypeIdsImpl::CacheableUserData4; } } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return 0; } @@ -160,23 +160,23 @@ namespace apache void ManagedCacheableDeltaGeneric::toDelta(DataOutput& output) const { try { - GemStone::GemFire::Cache::Generic::DataOutput mg_output(&output, true); + Apache::Geode::Client::Generic::DataOutput mg_output(&output, true); m_managedptr->ToDelta(%mg_output); //this will move the cursor in c++ layer mg_output.WriteBytesToUMDataOutput(); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } void ManagedCacheableDeltaGeneric::fromDelta(DataInput& input) { try { - GemStone::GemFire::Cache::Generic::DataInput mg_input(&input, true); + Apache::Geode::Client::Generic::DataInput mg_input(&input, true); m_managedptr->FromDelta(%mg_input); //this will move the cursor in c++ layer @@ -184,11 +184,11 @@ namespace apache m_hashcode = m_managedptr->GetHashCode(); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } } @@ -196,10 +196,10 @@ namespace apache { try { ICloneable^ cloneable = dynamic_cast<ICloneable^>(( - GemStone::GemFire::Cache::Generic::IGFDelta^) m_managedptr); + Apache::Geode::Client::Generic::IGFDelta^) m_managedptr); if (cloneable) { - GemStone::GemFire::Cache::Generic::IGFSerializable^ Mclone = - dynamic_cast<GemStone::GemFire::Cache::Generic::IGFSerializable^>(cloneable->Clone()); + Apache::Geode::Client::Generic::IGFSerializable^ Mclone = + dynamic_cast<Apache::Geode::Client::Generic::IGFSerializable^>(cloneable->Clone()); return DeltaPtr(static_cast<ManagedCacheableDeltaGeneric*>( SafeMSerializableConvertGeneric(Mclone))); } @@ -207,11 +207,11 @@ namespace apache return Delta::clone(); } } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return NULLPTR; } @@ -228,11 +228,11 @@ namespace apache } return false; } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return false; } @@ -242,11 +242,11 @@ namespace apache try { return m_managedptr->Equals(other.ptr()); } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return false; @@ -263,15 +263,15 @@ namespace apache if (maxLength > 0) { String^ logstr = m_managedptr->GetType()->Name + '(' + m_managedptr->ToString() + ')'; - GemStone::GemFire::Cache::Generic::ManagedString mg_str(logstr); + Apache::Geode::Client::Generic::ManagedString mg_str(logstr); return snprintf(buffer, maxLength, "%s", mg_str.CharPtr); } } - catch (GemStone::GemFire::Cache::Generic::GemFireException^ ex) { + catch (Apache::Geode::Client::Generic::GemFireException^ ex) { ex->ThrowNative(); } catch (System::Exception^ ex) { - GemStone::GemFire::Cache::Generic::GemFireException::ThrowNative(ex); + Apache::Geode::Client::Generic::GemFireException::ThrowNative(ex); } return 0; } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/ManagedCacheableDelta.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/ManagedCacheableDelta.hpp b/src/clicache/src/impl/ManagedCacheableDelta.hpp index 58da1e4..0823ba1 100644 --- a/src/clicache/src/impl/ManagedCacheableDelta.hpp +++ b/src/clicache/src/impl/ManagedCacheableDelta.hpp @@ -27,11 +27,13 @@ using namespace System; //using namespace apache::geode::client; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { interface class IGFSerializable; interface class IGFDelta; @@ -48,7 +50,7 @@ namespace apache { /// <summary> - /// Wraps the managed <see cref="GemStone.GemFire.Cache.IGFDelta" /> + /// Wraps the managed <see cref="Apache.Geode.Client.IGFDelta" /> /// object and implements the native <c>apache::geode::client::CacheableKey</c> interface. /// </summary> class ManagedCacheableDeltaGeneric @@ -67,20 +69,20 @@ namespace apache /// The managed object. /// </param> inline ManagedCacheableDeltaGeneric( - GemStone::GemFire::Cache::Generic::IGFDelta^ managedptr) + Apache::Geode::Client::Generic::IGFDelta^ managedptr) : m_managedptr(managedptr) { - m_managedSerializableptr = dynamic_cast <GemStone::GemFire::Cache::Generic::IGFSerializable^> (managedptr); + m_managedSerializableptr = dynamic_cast <Apache::Geode::Client::Generic::IGFSerializable^> (managedptr); m_classId = m_managedSerializableptr->ClassId; m_objectSize = 0; } inline ManagedCacheableDeltaGeneric( - GemStone::GemFire::Cache::Generic::IGFDelta^ managedptr, int hashcode, int classId) + Apache::Geode::Client::Generic::IGFDelta^ managedptr, int hashcode, int classId) : m_managedptr(managedptr) { m_hashcode = hashcode; m_classId = classId; - m_managedSerializableptr = dynamic_cast <GemStone::GemFire::Cache::Generic::IGFSerializable^> (managedptr); + m_managedSerializableptr = dynamic_cast <Apache::Geode::Client::Generic::IGFSerializable^> (managedptr); m_objectSize = 0; } @@ -159,7 +161,7 @@ namespace apache /// <summary> /// Returns the wrapped managed object reference. /// </summary> - inline GemStone::GemFire::Cache::Generic::IGFDelta^ ptr() const + inline Apache::Geode::Client::Generic::IGFDelta^ ptr() const { return m_managedptr; } @@ -173,8 +175,8 @@ namespace apache /// to be called which is not what is desired when this object is destroyed. Normally this /// managed object may be created by the user and will be handled automatically by the GC. /// </summary> - gcroot<GemStone::GemFire::Cache::Generic::IGFDelta^> m_managedptr; - gcroot<GemStone::GemFire::Cache::Generic::IGFSerializable^> m_managedSerializableptr; + gcroot<Apache::Geode::Client::Generic::IGFDelta^> m_managedptr; + gcroot<Apache::Geode::Client::Generic::IGFSerializable^> m_managedSerializableptr; // Disable the copy and assignment constructors ManagedCacheableDeltaGeneric(const ManagedCacheableDeltaGeneric&); ManagedCacheableDeltaGeneric& operator = (const ManagedCacheableDeltaGeneric&);
