http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Serializable.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Serializable.cpp b/src/clicache/src/Serializable.cpp index 1ded8f3..ff46f25 100644 --- a/src/clicache/src/Serializable.cpp +++ b/src/clicache/src/Serializable.cpp @@ -58,16 +58,16 @@ using namespace System::Collections::Generic; using namespace Runtime::InteropServices; using namespace apache::geode::client; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { - void GemStone::GemFire::Cache::Generic::Serializable::ToData( - GemStone::GemFire::Cache::Generic::DataOutput^ output) + void Apache::Geode::Client::Generic::Serializable::ToData( + Apache::Geode::Client::Generic::DataOutput^ output) { if (output->IsManagedObject()) { output->WriteBytesToUMDataOutput(); @@ -79,9 +79,9 @@ namespace GemStone output->SetBuffer(); } } - GemStone::GemFire::Cache::Generic::IGFSerializable^ - GemStone::GemFire::Cache::Generic::Serializable::FromData( - GemStone::GemFire::Cache::Generic::DataInput^ input) + Apache::Geode::Client::Generic::IGFSerializable^ + Apache::Geode::Client::Generic::Serializable::FromData( + Apache::Geode::Client::Generic::DataInput^ input) { if(input->IsManagedObject()) { input->AdvanceUMCursor(); @@ -95,12 +95,12 @@ namespace GemStone return this; } - uint32_t GemStone::GemFire::Cache::Generic::Serializable::ObjectSize::get() + uint32_t Apache::Geode::Client::Generic::Serializable::ObjectSize::get() { return NativePtr->objectSize(); } - uint32_t GemStone::GemFire::Cache::Generic::Serializable::ClassId::get() + uint32_t Apache::Geode::Client::Generic::Serializable::ClassId::get() { int8_t typeId = NativePtr->typeId(); if (typeId == apache::geode::client::GemfireTypeIdsImpl::CacheableUserData || @@ -112,7 +112,7 @@ namespace GemStone } } - String^ GemStone::GemFire::Cache::Generic::Serializable::ToString() + String^ Apache::Geode::Client::Generic::Serializable::ToString() { apache::geode::client::CacheableStringPtr& cStr = NativePtr->toString(); if (cStr->isWideString()) { @@ -122,99 +122,99 @@ namespace GemStone } } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (Byte value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (Byte value) { - return (GemStone::GemFire::Cache::Generic::Serializable^) CacheableByte::Create(value); + return (Apache::Geode::Client::Generic::Serializable^) CacheableByte::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (bool value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (bool value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableBoolean::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableBoolean::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (array<bool>^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (array<bool>^ value) { - // return (GemStone::GemFire::Cache::Generic::Serializable^)GemStone::GemFire::Cache::Generic::CacheableBooleanArray::Create(value); + // return (Apache::Geode::Client::Generic::Serializable^)Apache::Geode::Client::Generic::CacheableBooleanArray::Create(value); //TODO:split return nullptr; } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (array<Byte>^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (array<Byte>^ value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableBytes::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableBytes::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (Char value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (Char value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableCharacter::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableCharacter::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (array<Char>^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (array<Char>^ value) { - //return (GemStone::GemFire::Cache::Generic::Serializable^)GemStone::GemFire::Cache::Generic::CacheableCharArray::Create(value); + //return (Apache::Geode::Client::Generic::Serializable^)Apache::Geode::Client::Generic::CacheableCharArray::Create(value); //TODO:split return nullptr; } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (Double value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (Double value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableDouble::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableDouble::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (array<Double>^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (array<Double>^ value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableDoubleArray::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableDoubleArray::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (Single value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (Single value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableFloat::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableFloat::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (array<Single>^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (array<Single>^ value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableFloatArray::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableFloatArray::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (int16_t value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (int16_t value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableInt16::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableInt16::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (array<int16_t>^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (array<int16_t>^ value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableInt16Array::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableInt16Array::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (int32_t value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (int32_t value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableInt32::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableInt32::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (array<int32_t>^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (array<int32_t>^ value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableInt32Array::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableInt32Array::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (int64_t value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (int64_t value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableInt64::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableInt64::Create(value); } - /*GemStone::GemFire::Cache::*/Serializable::operator /*GemStone::GemFire::Cache::*/Serializable^ (array<int64_t>^ value) + /*Apache::Geode::Client::*/Serializable::operator /*Apache::Geode::Client::*/Serializable^ (array<int64_t>^ value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)GemStone::GemFire::Cache::Generic::CacheableInt64Array::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)Apache::Geode::Client::Generic::CacheableInt64Array::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (String^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (String^ value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableString::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableString::Create(value); } - GemStone::GemFire::Cache::Generic::Serializable::operator GemStone::GemFire::Cache::Generic::Serializable^ (array<String^>^ value) + Apache::Geode::Client::Generic::Serializable::operator Apache::Geode::Client::Generic::Serializable^ (array<String^>^ value) { - return (GemStone::GemFire::Cache::Generic::Serializable^)CacheableStringArray::Create(value); + return (Apache::Geode::Client::Generic::Serializable^)CacheableStringArray::Create(value); } int32 Serializable::GetPDXIdForType(const char* poolName, IGFSerializable^ pdxType) @@ -485,7 +485,7 @@ namespace GemStone } } - void GemStone::GemFire::Cache::Generic::Serializable::RegisterTypeGeneric(TypeFactoryMethodGeneric^ creationMethod) + void Apache::Geode::Client::Generic::Serializable::RegisterTypeGeneric(TypeFactoryMethodGeneric^ creationMethod) { if (creationMethod == nullptr) { throw gcnew IllegalArgumentException("Serializable.RegisterType(): " @@ -522,7 +522,7 @@ namespace GemStone _GF_MG_EXCEPTION_CATCH_ALL2 } - void GemStone::GemFire::Cache::Generic::Serializable::RegisterTypeGeneric(Byte typeId, + void Apache::Geode::Client::Generic::Serializable::RegisterTypeGeneric(Byte typeId, TypeFactoryMethodGeneric^ creationMethod, Type^ type) { if (creationMethod == nullptr) { @@ -572,7 +572,7 @@ namespace GemStone } } - void GemStone::GemFire::Cache::Generic::Serializable::UnregisterTypeGeneric(Byte typeId) + void Apache::Geode::Client::Generic::Serializable::UnregisterTypeGeneric(Byte typeId) { BuiltInDelegatesGeneric->Remove(typeId); _GF_MG_EXCEPTION_TRY2 @@ -582,7 +582,7 @@ namespace GemStone _GF_MG_EXCEPTION_CATCH_ALL2 } - void GemStone::GemFire::Cache::Generic::Serializable::RegisterWrapperGeneric( + void Apache::Geode::Client::Generic::Serializable::RegisterWrapperGeneric( WrapperDelegateGeneric^ wrapperMethod, Byte typeId, System::Type^ type) { if (typeId < 0 || typeId > WrapperEndGeneric) @@ -594,7 +594,7 @@ namespace GemStone ManagedTypeMappingGeneric[type] = typeId; } - void GemStone::GemFire::Cache::Generic::Serializable::UnregisterNativesGeneric() + void Apache::Geode::Client::Generic::Serializable::UnregisterNativesGeneric() { BuiltInDelegatesGeneric->Clear(); for (Byte typeId = 0; typeId <= WrapperEndGeneric; ++typeId) { @@ -684,8 +684,8 @@ namespace GemStone case apache::geode::client::GemfireTypeIds::CacheableDate: { //TODO:: - GemStone::GemFire::Cache::Generic::CacheableDate^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableDate ^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableDate^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableDate^ ret = static_cast<Apache::Geode::Client::Generic::CacheableDate ^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableDate^>(val.ptr())); System::DateTime dt(ret->Value.Ticks); return safe_cast<TValue>(dt); @@ -714,50 +714,50 @@ namespace GemStone } case apache::geode::client::GemfireTypeIds::CacheableBytes: { - GemStone::GemFire::Cache::Generic::CacheableBytes^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableBytes ^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableBytes^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableBytes^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableBytes ^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableBytes^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableDoubleArray: { - GemStone::GemFire::Cache::Generic::CacheableDoubleArray^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableDoubleArray ^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableDoubleArray^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableDoubleArray^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableDoubleArray ^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableDoubleArray^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableFloatArray: { - GemStone::GemFire::Cache::Generic::CacheableFloatArray^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableFloatArray^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableFloatArray^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableFloatArray^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableFloatArray^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableFloatArray^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableInt16Array: { - GemStone::GemFire::Cache::Generic::CacheableInt16Array^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableInt16Array^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableInt16Array^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableInt16Array^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableInt16Array^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableInt16Array^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableInt32Array: { - GemStone::GemFire::Cache::Generic::CacheableInt32Array^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableInt32Array^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableInt32Array^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableInt32Array^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableInt32Array^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableInt32Array^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableInt64Array: { - GemStone::GemFire::Cache::Generic::CacheableInt64Array^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableInt64Array^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableInt64Array^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableInt64Array^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableInt64Array^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableInt64Array^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableStringArray: { - GemStone::GemFire::Cache::Generic::CacheableStringArray^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableStringArray^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableStringArray^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableStringArray^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableStringArray^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableStringArray^>(val.ptr())); /* array<String^>^ str = gcnew array<String^>(ret->GetValues()->Length); for(int i=0; i<ret->GetValues()->Length; i++ ) { @@ -768,123 +768,123 @@ namespace GemStone } case apache::geode::client::GemfireTypeIds::CacheableArrayList://Ilist generic { - GemStone::GemFire::Cache::Generic::CacheableArrayList^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableArrayList^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableArrayList^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableArrayList^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableArrayList^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableArrayList^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableLinkedList://LinkedList generic { - GemStone::GemFire::Cache::Generic::CacheableLinkedList^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableLinkedList^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableLinkedList^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableLinkedList^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableLinkedList^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableLinkedList^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableHashTable://collection::hashtable { - GemStone::GemFire::Cache::Generic::CacheableHashTable^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableHashTable^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableHashTable^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableHashTable^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableHashTable^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableHashTable^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableHashMap://generic dictionary { - GemStone::GemFire::Cache::Generic::CacheableHashMap^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CacheableHashMap^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableHashMap^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableHashMap^ ret = safe_cast<Apache::Geode::Client::Generic::CacheableHashMap^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableHashMap^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableIdentityHashMap: { - GemStone::GemFire::Cache::Generic::CacheableIdentityHashMap^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableIdentityHashMap^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableIdentityHashMap^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableIdentityHashMap^ ret = static_cast<Apache::Geode::Client::Generic::CacheableIdentityHashMap^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableIdentityHashMap^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableHashSet://no need of it, default case should work { - GemStone::GemFire::Cache::Generic::CacheableHashSet^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableHashSet^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableHashSet^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableHashSet^ ret = static_cast<Apache::Geode::Client::Generic::CacheableHashSet^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableHashSet^>(val.ptr())); return safe_cast<TValue>(ret); } case apache::geode::client::GemfireTypeIds::CacheableLinkedHashSet://no need of it, default case should work { - GemStone::GemFire::Cache::Generic::CacheableLinkedHashSet^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableLinkedHashSet^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableLinkedHashSet^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableLinkedHashSet^ ret = static_cast<Apache::Geode::Client::Generic::CacheableLinkedHashSet^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableLinkedHashSet^>(val.ptr())); return safe_cast<TValue>(ret); } case apache::geode::client::GemfireTypeIds::CacheableFileName: { - GemStone::GemFire::Cache::Generic::CacheableFileName^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableFileName^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableFileName^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableFileName^ ret = static_cast<Apache::Geode::Client::Generic::CacheableFileName^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableFileName^>(val.ptr())); return safe_cast<TValue>(ret); } case apache::geode::client::GemfireTypeIds::CacheableObjectArray: { - GemStone::GemFire::Cache::Generic::CacheableObjectArray^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableObjectArray^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableObjectArray^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableObjectArray^ ret = static_cast<Apache::Geode::Client::Generic::CacheableObjectArray^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableObjectArray^>(val.ptr())); return safe_cast<TValue>(ret); } case apache::geode::client::GemfireTypeIds::CacheableVector://collection::arraylist { - GemStone::GemFire::Cache::Generic::CacheableVector^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableVector^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableVector^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableVector^ ret = static_cast<Apache::Geode::Client::Generic::CacheableVector^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableVector^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CacheableUndefined: { - GemStone::GemFire::Cache::Generic::CacheableUndefined^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableUndefined^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableUndefined^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableUndefined^ ret = static_cast<Apache::Geode::Client::Generic::CacheableUndefined^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableUndefined^>(val.ptr())); return safe_cast<TValue>(ret); } case apache::geode::client::GemfireTypeIds::Struct: { - return safe_cast<TValue>(GemStone::GemFire::Cache::Generic::Struct::Create(val.ptr())); + return safe_cast<TValue>(Apache::Geode::Client::Generic::Struct::Create(val.ptr())); } case apache::geode::client::GemfireTypeIds::CacheableStack: { - GemStone::GemFire::Cache::Generic::CacheableStack^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableStack^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableStack^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableStack^ ret = static_cast<Apache::Geode::Client::Generic::CacheableStack^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableStack^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case 7: //GemFireClassIds::CacheableManagedObject { - GemStone::GemFire::Cache::Generic::CacheableObject^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableObject^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableObject^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableObject^ ret = static_cast<Apache::Geode::Client::Generic::CacheableObject^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableObject^>(val.ptr())); return safe_cast<TValue>(ret); } case 8://GemFireClassIds::CacheableManagedObjectXml { - GemStone::GemFire::Cache::Generic::CacheableObjectXml^ ret = static_cast<GemStone::GemFire::Cache::Generic::CacheableObjectXml^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CacheableObjectXml^>(val.ptr())); + Apache::Geode::Client::Generic::CacheableObjectXml^ ret = static_cast<Apache::Geode::Client::Generic::CacheableObjectXml^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CacheableObjectXml^>(val.ptr())); return safe_cast<TValue>(ret); } /* TODO: replace with IDictionary<K, V> case apache::geode::client::GemfireTypeIds::Properties: { - GemStone::GemFire::Cache::Generic::Properties^ ret = safe_cast<GemStone::GemFire::Cache::Generic::Properties^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::Properties^>(val.ptr())); + Apache::Geode::Client::Generic::Properties^ ret = safe_cast<Apache::Geode::Client::Generic::Properties^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::Properties^>(val.ptr())); return safe_cast<TValue>(ret); }*/ case apache::geode::client::GemfireTypeIds::BooleanArray: { - GemStone::GemFire::Cache::Generic::BooleanArray^ ret = safe_cast<GemStone::GemFire::Cache::Generic::BooleanArray^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::BooleanArray^>(val.ptr())); + Apache::Geode::Client::Generic::BooleanArray^ ret = safe_cast<Apache::Geode::Client::Generic::BooleanArray^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::BooleanArray^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case apache::geode::client::GemfireTypeIds::CharArray: { - GemStone::GemFire::Cache::Generic::CharArray^ ret = safe_cast<GemStone::GemFire::Cache::Generic::CharArray^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::CharArray^>(val.ptr())); + Apache::Geode::Client::Generic::CharArray^ ret = safe_cast<Apache::Geode::Client::Generic::CharArray^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::CharArray^>(val.ptr())); return safe_cast<TValue>(ret->Value); } case 0://UserFunctionExecutionException unregistered { - GemStone::GemFire::Cache::Generic::UserFunctionExecutionException^ ret = static_cast<GemStone::GemFire::Cache::Generic::UserFunctionExecutionException^> - ( SafeGenericUMSerializableConvert<GemStone::GemFire::Cache::Generic::UserFunctionExecutionException^>(val.ptr())); + Apache::Geode::Client::Generic::UserFunctionExecutionException^ ret = static_cast<Apache::Geode::Client::Generic::UserFunctionExecutionException^> + ( SafeGenericUMSerializableConvert<Apache::Geode::Client::Generic::UserFunctionExecutionException^>(val.ptr())); return safe_cast<TValue>(ret); } default: @@ -1042,7 +1042,7 @@ namespace GemStone apache::geode::client::CacheableKeyPtr Serializable::GetUnmanagedValueGeneric( Type^ managedType, TKey key, bool isAsciiChar) { - Byte typeId = GemStone::GemFire::Cache::Generic::Serializable::GetManagedTypeMappingGeneric(managedType); + Byte typeId = Apache::Geode::Client::Generic::Serializable::GetManagedTypeMappingGeneric(managedType); switch(typeId) { @@ -1106,84 +1106,84 @@ namespace GemStone } case apache::geode::client::GemfireTypeIds::CacheableBytes: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableBytes::Create((array<Byte>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableBytes::Create((array<Byte>^)key))); return kPtr; /*if( managedType == Type::GetType("System.Byte[]") ) { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableBytes::Create((array<Byte>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableBytes::Create((array<Byte>^)key))); return kPtr; } else { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableBytes::Create(getSByteArray((array<SByte>^)key)))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableBytes::Create(getSByteArray((array<SByte>^)key)))); return kPtr; }*/ } case apache::geode::client::GemfireTypeIds::CacheableDoubleArray: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableDoubleArray::Create((array<Double>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableDoubleArray::Create((array<Double>^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableFloatArray: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableFloatArray::Create((array<float>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableFloatArray::Create((array<float>^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableInt16Array: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt16Array::Create((array<Int16>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt16Array::Create((array<Int16>^)key))); return kPtr; /* if( managedType == Type::GetType("System.Int16[]") ) { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt16Array::Create((array<Int16>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt16Array::Create((array<Int16>^)key))); return kPtr; } else { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt16Array::Create(getInt16Array((array<uint16_t>^)key)))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt16Array::Create(getInt16Array((array<uint16_t>^)key)))); return kPtr; } */ } case apache::geode::client::GemfireTypeIds::CacheableInt32Array: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt32Array::Create((array<Int32>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt32Array::Create((array<Int32>^)key))); return kPtr; /* if( managedType == Type::GetType("System.Int32[]") ) { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt32Array::Create((array<Int32>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt32Array::Create((array<Int32>^)key))); return kPtr; } else { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt32Array::Create(getInt32Array((array<uint32_t>^)key)))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt32Array::Create(getInt32Array((array<uint32_t>^)key)))); return kPtr; } */ } case apache::geode::client::GemfireTypeIds::CacheableInt64Array: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt64Array::Create((array<Int64>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt64Array::Create((array<Int64>^)key))); return kPtr; /*if( managedType == Type::GetType("System.Int64[]") ) { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt64Array::Create((array<Int64>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt64Array::Create((array<Int64>^)key))); return kPtr; } else { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableInt64Array::Create(getInt64Array((array<uint64_t>^)key)))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableInt64Array::Create(getInt64Array((array<uint64_t>^)key)))); return kPtr; } */ } case apache::geode::client::GemfireTypeIds::CacheableStringArray: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableStringArray::Create((array<String^>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableStringArray::Create((array<String^>^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableFileName: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)(GemStone::GemFire::Cache::Generic::CacheableFileName^)key)); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)(Apache::Geode::Client::Generic::CacheableFileName^)key)); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableHashTable://collection::hashtable { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableHashTable::Create((System::Collections::Hashtable^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableHashTable::Create((System::Collections::Hashtable^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableHashMap://generic dictionary { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableHashMap::Create((System::Collections::IDictionary^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableHashMap::Create((System::Collections::IDictionary^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableVector://collection::arraylist @@ -1193,62 +1193,62 @@ namespace GemStone } case apache::geode::client::GemfireTypeIds::CacheableArrayList://generic ilist { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableArrayList::Create((System::Collections::IList^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableArrayList::Create((System::Collections::IList^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableLinkedList://generic linked list { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableLinkedList::Create((System::Collections::Generic::LinkedList<Object^>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableLinkedList::Create((System::Collections::Generic::LinkedList<Object^>^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableStack: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert(GemStone::GemFire::Cache::Generic::CacheableStack::Create((System::Collections::ICollection^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert(Apache::Geode::Client::Generic::CacheableStack::Create((System::Collections::ICollection^)key))); return kPtr; } case 7: //GemFireClassIds::CacheableManagedObject { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((GemStone::GemFire::Cache::Generic::CacheableObject^)key)); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((Apache::Geode::Client::Generic::CacheableObject^)key)); return kPtr; } case 8://GemFireClassIds::CacheableManagedObjectXml { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((GemStone::GemFire::Cache::Generic::CacheableObjectXml^)key)); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((Apache::Geode::Client::Generic::CacheableObjectXml^)key)); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableObjectArray: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((GemStone::GemFire::Cache::Generic::CacheableObjectArray^)key)); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((Apache::Geode::Client::Generic::CacheableObjectArray^)key)); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableIdentityHashMap: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert(GemStone::GemFire::Cache::Generic::CacheableIdentityHashMap::Create((System::Collections::IDictionary^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert(Apache::Geode::Client::Generic::CacheableIdentityHashMap::Create((System::Collections::IDictionary^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableHashSet://no need of it, default case should work { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((GemStone::GemFire::Cache::Generic::CacheableHashSet^)key)); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((Apache::Geode::Client::Generic::CacheableHashSet^)key)); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableLinkedHashSet://no need of it, default case should work { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((GemStone::GemFire::Cache::Generic::CacheableLinkedHashSet^)key)); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((Apache::Geode::Client::Generic::CacheableLinkedHashSet^)key)); return kPtr; } case apache::geode::client::GemfireTypeIds::CacheableDate: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CacheableDate::Create((System::DateTime)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CacheableDate::Create((System::DateTime)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::BooleanArray: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::BooleanArray::Create((array<bool>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::BooleanArray::Create((array<bool>^)key))); return kPtr; } case apache::geode::client::GemfireTypeIds::CharArray: { - apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)GemStone::GemFire::Cache::Generic::CharArray::Create((array<Char>^)key))); + apache::geode::client::CacheablePtr kPtr(SafeGenericMSerializableConvert((IGFSerializable^)Apache::Geode::Client::Generic::CharArray::Create((array<Char>^)key))); return kPtr; } default:
http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Serializable.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Serializable.hpp b/src/clicache/src/Serializable.hpp index 43e9ec9..503dba5 100644 --- a/src/clicache/src/Serializable.hpp +++ b/src/clicache/src/Serializable.hpp @@ -32,13 +32,13 @@ using namespace System::Reflection; using namespace System; using namespace System::Collections::Generic; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { interface class IPdxSerializable; interface class IPdxSerializer; @@ -61,7 +61,7 @@ namespace GemStone /// <c>DelegateWrapper.NativeDelegate</c> method by a call to /// <see cref="IGFSerializable.FromData" />. /// </summary> - public delegate GemStone::GemFire::Cache::Generic::IGFSerializable^ TypeFactoryMethodGeneric(); + public delegate Apache::Geode::Client::Generic::IGFSerializable^ TypeFactoryMethodGeneric(); /// <summary> /// Delegate to wrap a native <c>apache::geode::client::Serializable</c> type. /// </summary> @@ -69,7 +69,7 @@ namespace GemStone /// This delegate should return an object of type <c>IGFSerializable</c> /// given a native object. /// </remarks> - delegate GemStone::GemFire::Cache::Generic::IGFSerializable^ WrapperDelegateGeneric(apache::geode::client::Serializable* obj); + delegate Apache::Geode::Client::Generic::IGFSerializable^ WrapperDelegateGeneric(apache::geode::client::Serializable* obj); /// <summary> /// Signature of function delegates passed to @@ -78,15 +78,15 @@ namespace GemStone /// New instance will be created during de-serialization of Pdx Types /// <see cref="IPdxSerializable" />. /// </summary> - public delegate GemStone::GemFire::Cache::Generic::IPdxSerializable^ PdxTypeFactoryMethod(); + public delegate Apache::Geode::Client::Generic::IPdxSerializable^ PdxTypeFactoryMethod(); /// <summary> /// This class wraps the native C++ <c>apache::geode::client::Serializable</c> objects /// as managed <see cref="IGFSerializable" /> objects. /// </summary> public ref class Serializable - : public GemStone::GemFire::Cache::Generic::Internal::SBWrap<apache::geode::client::Serializable>, - public GemStone::GemFire::Cache::Generic::IGFSerializable + : public Apache::Geode::Client::Generic::Internal::SBWrap<apache::geode::client::Serializable>, + public Apache::Geode::Client::Generic::IGFSerializable { public: /// <summary> @@ -95,7 +95,7 @@ namespace GemStone /// <param name="output"> /// the DataOutput object to use for serializing the object /// </param> - virtual void ToData(GemStone::GemFire::Cache::Generic::DataOutput^ output); + virtual void ToData(Apache::Geode::Client::Generic::DataOutput^ output); /// <summary> /// Deserializes the native (C++) object -- returns an instance of the @@ -105,8 +105,8 @@ namespace GemStone /// the DataInput stream to use for reading the object data /// </param> /// <returns>the deserialized object</returns> - virtual GemStone::GemFire::Cache::Generic::IGFSerializable^ - FromData(GemStone::GemFire::Cache::Generic::DataInput^ input); + virtual Apache::Geode::Client::Generic::IGFSerializable^ + FromData(Apache::Geode::Client::Generic::DataInput^ input); /// <summary> /// return the size of this object in bytes @@ -141,109 +141,109 @@ namespace GemStone /// Implicit conversion operator from a boolean /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (bool value); + static operator Apache::Geode::Client::Generic::Serializable^ (bool value); /// <summary> /// Implicit conversion operator from a byte /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (Byte value); + static operator Apache::Geode::Client::Generic::Serializable^ (Byte value); /// <summary> /// Implicit conversion operator from an array of bytes /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<Byte>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<Byte>^ value); /// <summary> /// Implicit conversion operator from an boolean array /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<bool>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<bool>^ value); /// <summary> /// Implicit conversion operator from a double /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (Double value); + static operator Apache::Geode::Client::Generic::Serializable^ (Double value); /// <summary> /// Implicit conversion operator from a double array /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<Double>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<Double>^ value); /// <summary> /// Implicit conversion operator from a float /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (Single value); + static operator Apache::Geode::Client::Generic::Serializable^ (Single value); /// <summary> /// Implicit conversion operator from a float array /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<Single>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<Single>^ value); /// <summary> /// Implicit conversion operator from a 16-bit integer /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (int16_t value); + static operator Apache::Geode::Client::Generic::Serializable^ (int16_t value); /// <summary> /// Implicit conversion operator from a character /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (Char value); + static operator Apache::Geode::Client::Generic::Serializable^ (Char value); /// <summary> /// Implicit conversion operator from a character array /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<Char>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<Char>^ value); /// <summary> /// Implicit conversion operator from a 16-bit integer array /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<int16_t>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<int16_t>^ value); /// <summary> /// Implicit conversion operator from a 32-bit integer /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (int32_t value); + static operator Apache::Geode::Client::Generic::Serializable^ (int32_t value); /// <summary> /// Implicit conversion operator from a 32-bit integer array /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<int32_t>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<int32_t>^ value); /// <summary> /// Implicit conversion operator from a 64-bit integer /// to a <c>Serializable</c>. /// </summary> - static operator /*GemStone::GemFire::Cache::*/Serializable^ (int64_t value); + static operator /*Apache::Geode::Client::*/Serializable^ (int64_t value); /// <summary> /// Implicit conversion operator from a 64-bit integer array /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<int64_t>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<int64_t>^ value); /// <summary> /// Implicit conversion operator from a string /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (String^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (String^ value); /// <summary> /// Implicit conversion operator from a string array /// to a <c>Serializable</c>. /// </summary> - static operator GemStone::GemFire::Cache::Generic::Serializable^ (array<String^>^ value); + static operator Apache::Geode::Client::Generic::Serializable^ (array<String^>^ value); /// <summary> /// Register an instance factory method for a given type. @@ -415,14 +415,14 @@ namespace GemStone /// <summary> /// Default constructor. /// </summary> - inline GemStone::GemFire::Cache::Generic::Serializable() - : GemStone::GemFire::Cache::Generic::Internal::SBWrap<apache::geode::client::Serializable>() { } + inline Apache::Geode::Client::Generic::Serializable() + : Apache::Geode::Client::Generic::Internal::SBWrap<apache::geode::client::Serializable>() { } /// <summary> /// Internal constructor to wrap a native object pointer /// </summary> /// <param name="nativeptr">The native object pointer</param> - inline GemStone::GemFire::Cache::Generic::Serializable(apache::geode::client::Serializable* nativeptr) + inline Apache::Geode::Client::Generic::Serializable(apache::geode::client::Serializable* nativeptr) : Generic::Internal::SBWrap<apache::geode::client::Serializable>(nativeptr) { } /// <summary> @@ -574,8 +574,8 @@ namespace GemStone static array<Type^>^ singleIntTypeA = gcnew array<Type^>{ Int32::typeid }; - static Type^ createNewObjectDelegateType = Type::GetType("GemStone.GemFire.Cache.Generic.Serializable+CreateNewObjectDelegate"); - static Type^ createNewObjectArrayDelegateType = Type::GetType("GemStone.GemFire.Cache.Generic.Serializable+CreateNewObjectArrayDelegate"); + static Type^ createNewObjectDelegateType = Type::GetType("Apache.Geode.Client.Generic.Serializable+CreateNewObjectDelegate"); + static Type^ createNewObjectArrayDelegateType = Type::GetType("Apache.Geode.Client.Generic.Serializable+CreateNewObjectArrayDelegate"); static array<Type^>^ singleIntType = gcnew array<Type^>(1){Int32::typeid}; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/StatisticDescriptor.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/StatisticDescriptor.cpp b/src/clicache/src/StatisticDescriptor.cpp index e4e56b9..bd8da29 100644 --- a/src/clicache/src/StatisticDescriptor.cpp +++ b/src/clicache/src/StatisticDescriptor.cpp @@ -22,11 +22,13 @@ #include "impl/ManagedString.hpp" -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { int32_t StatisticDescriptor::ID::get( ) http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/StatisticDescriptor.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/StatisticDescriptor.hpp b/src/clicache/src/StatisticDescriptor.hpp index 8d6f71b..4603d24 100644 --- a/src/clicache/src/StatisticDescriptor.hpp +++ b/src/clicache/src/StatisticDescriptor.hpp @@ -23,11 +23,13 @@ #include "impl/NativeWrapper.hpp" #include <gfcpp/statistics/StatisticDescriptor.hpp> -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { /// <summary> /// A class that describes an individual statistic whose value is updated by an http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Statistics.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Statistics.cpp b/src/clicache/src/Statistics.cpp index 5ef971c..ed4ce34 100644 --- a/src/clicache/src/Statistics.cpp +++ b/src/clicache/src/Statistics.cpp @@ -27,11 +27,13 @@ #include "impl/SafeConvert.hpp" -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { void Statistics::Close() { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Statistics.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Statistics.hpp b/src/clicache/src/Statistics.hpp index d7d4a6e..17726df 100644 --- a/src/clicache/src/Statistics.hpp +++ b/src/clicache/src/Statistics.hpp @@ -25,11 +25,13 @@ #include <gfcpp/statistics/StatisticDescriptor.hpp> #include <gfcpp/statistics/StatisticsType.hpp> -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { ref class StatisticDescriptor; ref class StatisticsType; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/StatisticsFactory.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/StatisticsFactory.cpp b/src/clicache/src/StatisticsFactory.cpp index 1689a8b..47ddff6 100644 --- a/src/clicache/src/StatisticsFactory.cpp +++ b/src/clicache/src/StatisticsFactory.cpp @@ -28,11 +28,13 @@ #include "impl/SafeConvert.hpp" -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { StatisticsFactory^ StatisticsFactory::GetExistingInstance() { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/StatisticsFactory.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/StatisticsFactory.hpp b/src/clicache/src/StatisticsFactory.hpp index d49aaba..29ad272 100644 --- a/src/clicache/src/StatisticsFactory.hpp +++ b/src/clicache/src/StatisticsFactory.hpp @@ -26,11 +26,13 @@ #include <gfcpp/statistics/StatisticDescriptor.hpp> #include <gfcpp/statistics/Statistics.hpp> -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { ref class StatisticDescriptor; ref class StatisticsType; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/StatisticsType.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/StatisticsType.cpp b/src/clicache/src/StatisticsType.cpp index 880cdf4..76928cc 100644 --- a/src/clicache/src/StatisticsType.cpp +++ b/src/clicache/src/StatisticsType.cpp @@ -26,11 +26,13 @@ #include "impl/SafeConvert.hpp" -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { String^ StatisticsType::Name::get() { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/StatisticsType.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/StatisticsType.hpp b/src/clicache/src/StatisticsType.hpp index d18b315..aed23e0 100644 --- a/src/clicache/src/StatisticsType.hpp +++ b/src/clicache/src/StatisticsType.hpp @@ -24,11 +24,13 @@ #include <gfcpp/statistics/StatisticsType.hpp> #include <gfcpp/statistics/StatisticDescriptor.hpp> -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { ref class StatisticDescriptor; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Struct.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Struct.cpp b/src/clicache/src/Struct.cpp index 6475488..782521a 100644 --- a/src/clicache/src/Struct.cpp +++ b/src/clicache/src/Struct.cpp @@ -24,11 +24,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { Object^ Struct::default::get( size_t index ) { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Struct.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Struct.hpp b/src/clicache/src/Struct.hpp index 3a2614d..e86430c 100644 --- a/src/clicache/src/Struct.hpp +++ b/src/clicache/src/Struct.hpp @@ -24,12 +24,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - namespace Generic + namespace Client + { +namespace Generic { generic<class TResult> ref class StructSet; @@ -44,7 +45,7 @@ namespace GemStone /// </remarks> //generic<class TResult> public ref class Struct sealed - : public GemStone::GemFire::Cache::Generic::Serializable + : public Apache::Geode::Client::Generic::Serializable { public: @@ -54,9 +55,9 @@ namespace GemStone /// <returns> /// The value of the field or null if index is out of bounds. /// </returns> - property /*GemStone::GemFire::Cache::Generic::IGFSerializable^*//*TResult*/ Object^ GFINDEXER( size_t ) + property /*Apache::Geode::Client::Generic::IGFSerializable^*//*TResult*/ Object^ GFINDEXER( size_t ) { - /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/ /*TResult*/ Object^ get( size_t index ); + /*Apache::Geode::Client::Generic::IGFSerializable^*/ /*TResult*/ Object^ get( size_t index ); } /// <summary> @@ -66,9 +67,9 @@ namespace GemStone /// <exception cref="IllegalArgumentException"> /// if the field name is not found. /// </exception> - property /*GemStone::GemFire::Cache::Generic::IGFSerializable^*//*TResult*/Object^ GFINDEXER( String^ ) + property /*Apache::Geode::Client::Generic::IGFSerializable^*//*TResult*/Object^ GFINDEXER( String^ ) { - /*GemStone::GemFire::Cache::Generic::IGFSerializable^*//*TResult*/Object^ get( String^ fieldName ); + /*Apache::Geode::Client::Generic::IGFSerializable^*//*TResult*/Object^ get( String^ fieldName ); } /// <summary> @@ -77,9 +78,9 @@ namespace GemStone /// <returns> /// A reference to the parent <c>StructSet</c> of this <c>Struct</c>. /// </returns> - property GemStone::GemFire::Cache::Generic::StructSet</*TResult*/Object^>^ Set + property Apache::Geode::Client::Generic::StructSet</*TResult*/Object^>^ Set { - GemStone::GemFire::Cache::Generic::StructSet</*TResult*/Object^>^ get( ); + Apache::Geode::Client::Generic::StructSet</*TResult*/Object^>^ get( ); } /// <summary> @@ -105,7 +106,7 @@ namespace GemStone /// A reference to the next item in the <c>Struct</c> /// or null if no more available. /// </returns> - /*GemStone::GemFire::Cache::Generic::IGFSerializable^*//*TResult*/Object^ Next( ); + /*Apache::Geode::Client::Generic::IGFSerializable^*//*TResult*/Object^ Next( ); private: @@ -114,28 +115,28 @@ namespace GemStone /// Private constructor to wrap a native object pointer /// </summary> /// <param name="nativeptr">The native object pointer</param> - inline GemStone::GemFire::Cache::Generic::Struct/*<TResult>*/( ::apache::geode::client::Serializable* nativeptr ) - : GemStone::GemFire::Cache::Generic::Serializable( nativeptr ) { } + inline Apache::Geode::Client::Generic::Struct/*<TResult>*/( ::apache::geode::client::Serializable* nativeptr ) + : Apache::Geode::Client::Generic::Serializable( nativeptr ) { } - inline GemStone::GemFire::Cache::Generic::Struct/*<TResult>*/( ) - : GemStone::GemFire::Cache::Generic::Serializable( ::apache::geode::client::Struct::createDeserializable()) { } + inline Apache::Geode::Client::Generic::Struct/*<TResult>*/( ) + : Apache::Geode::Client::Generic::Serializable( ::apache::geode::client::Struct::createDeserializable()) { } internal: /// <summary> /// Factory function to register wrapper /// </summary> - inline static GemStone::GemFire::Cache::Generic::IGFSerializable^ /*Struct^*/ /*<TResult>*/ Create( ::apache::geode::client::Serializable* obj ) + inline static Apache::Geode::Client::Generic::IGFSerializable^ /*Struct^*/ /*<TResult>*/ Create( ::apache::geode::client::Serializable* obj ) { return ( obj != nullptr ? - gcnew GemStone::GemFire::Cache::Generic::Struct/*<TResult>*/( obj ) : nullptr ); + gcnew Apache::Geode::Client::Generic::Struct/*<TResult>*/( obj ) : nullptr ); /*return ( obj != nullptr ? gcnew Struct( obj ) : nullptr );*/ } - inline static GemStone::GemFire::Cache::Generic::IGFSerializable^ CreateDeserializable( ) + inline static Apache::Geode::Client::Generic::IGFSerializable^ CreateDeserializable( ) { - return gcnew GemStone::GemFire::Cache::Generic::Struct/*<TResult>*/( ) ; + return gcnew Apache::Geode::Client::Generic::Struct/*<TResult>*/( ) ; //return gcnew Struct( ) ; } }; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/StructSet.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/StructSet.cpp b/src/clicache/src/StructSet.cpp index d7145d9..a7b5e67 100644 --- a/src/clicache/src/StructSet.cpp +++ b/src/clicache/src/StructSet.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 TResult> @@ -43,7 +45,7 @@ namespace GemStone } generic<class TResult> - /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/ TResult StructSet<TResult>::default::get( size_t index ) + /*Apache::Geode::Client::Generic::IGFSerializable^*/ TResult StructSet<TResult>::default::get( size_t index ) { //return SafeUMSerializableConvertGeneric((NativePtr->operator[](static_cast<int32_t>(index))).ptr()); return Serializable::GetManagedValueGeneric<TResult>((NativePtr->operator[](static_cast<int32_t>(index)))); @@ -58,7 +60,7 @@ namespace GemStone } generic<class TResult> - System::Collections::Generic::IEnumerator</*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult>^ + System::Collections::Generic::IEnumerator</*Apache::Geode::Client::Generic::IGFSerializable^*/TResult>^ StructSet<TResult>::GetEnumerator( ) { return GetIterator( ); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/StructSet.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/StructSet.hpp b/src/clicache/src/StructSet.hpp index 940c5d5..18bb30f 100644 --- a/src/clicache/src/StructSet.hpp +++ b/src/clicache/src/StructSet.hpp @@ -25,12 +25,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { - namespace Generic + namespace Client + { +namespace Generic { interface class IGFSerializable; @@ -73,9 +74,9 @@ namespace GemStone /// if the index is out of bounds. /// </exception> /// <returns>Item at the given index.</returns> - virtual property /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult GFINDEXER( size_t ) + virtual property /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult GFINDEXER( size_t ) { - virtual /*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult get( size_t index ); + virtual /*Apache::Geode::Client::Generic::IGFSerializable^*/TResult get( size_t index ); } /// <summary> @@ -122,7 +123,7 @@ namespace GemStone /// A <c>System.Collections.Generic.IEnumerator</c> that /// can be used to iterate through the <c>StructSet</c>. /// </returns> - virtual System::Collections::Generic::IEnumerator</*GemStone::GemFire::Cache::Generic::IGFSerializable^*/TResult>^ + virtual System::Collections::Generic::IEnumerator</*Apache::Geode::Client::Generic::IGFSerializable^*/TResult>^ GetEnumerator( ); // End Region: IEnumerable<IGFSerializable^> Members http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/SystemProperties.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/SystemProperties.cpp b/src/clicache/src/SystemProperties.cpp index 3b961f4..dc9cd00 100644 --- a/src/clicache/src/SystemProperties.cpp +++ b/src/clicache/src/SystemProperties.cpp @@ -21,13 +21,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { SystemProperties::SystemProperties( Properties<String^, String^>^ properties ) { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/SystemProperties.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/SystemProperties.hpp b/src/clicache/src/SystemProperties.hpp index baa9ef6..9b61e0c 100644 --- a/src/clicache/src/SystemProperties.hpp +++ b/src/clicache/src/SystemProperties.hpp @@ -25,13 +25,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { /// <summary> /// A class for internal use, that encapsulates the properties that can be http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/TransactionEvent.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/TransactionEvent.cpp b/src/clicache/src/TransactionEvent.cpp index 473de93..0787fc4 100644 --- a/src/clicache/src/TransactionEvent.cpp +++ b/src/clicache/src/TransactionEvent.cpp @@ -26,14 +26,16 @@ 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 { generic<class TKey, class TValue> Cache^ TransactionEvent<TKey, TValue>::Cache::get( ) @@ -41,17 +43,17 @@ namespace GemStone apache::geode::client::CachePtr & nativeptr( NativePtr->getCache( ) ); - return GemStone::GemFire::Cache::Generic::Cache::Create( + return Apache::Geode::Client::Generic::Cache::Create( nativeptr.ptr( ) ); } generic<class TKey, class TValue> - GemStone::GemFire::Cache::Generic::TransactionId^ TransactionEvent<TKey, TValue>::TransactionId::get( ) + Apache::Geode::Client::Generic::TransactionId^ TransactionEvent<TKey, TValue>::TransactionId::get( ) { apache::geode::client::TransactionIdPtr & nativeptr( NativePtr->getTransactionId( ) ); - return GemStone::GemFire::Cache::Generic::TransactionId::Create( + return Apache::Geode::Client::Generic::TransactionId::Create( nativeptr.ptr( ) ); } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/TransactionEvent.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/TransactionEvent.hpp b/src/clicache/src/TransactionEvent.hpp index 7bdc977..4e38554 100644 --- a/src/clicache/src/TransactionEvent.hpp +++ b/src/clicache/src/TransactionEvent.hpp @@ -25,24 +25,14 @@ //#include "Cache.hpp" using namespace System; -//namespace GemStone -//{ -// namespace GemFire -// { -// namespace Cache -// { -// ref class Cache; -// } -// } -//} -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { ref class TransactionId; ref class Cache; @@ -61,9 +51,9 @@ namespace GemStone /// <summary> /// Gets the transaction id for this transaction. /// </summary> - property GemStone::GemFire::Cache::Generic::TransactionId^ TransactionId + property Apache::Geode::Client::Generic::TransactionId^ TransactionId { - GemStone::GemFire::Cache::Generic::TransactionId^ get( ); + Apache::Geode::Client::Generic::TransactionId^ get( ); } /// <summary> @@ -79,9 +69,9 @@ namespace GemStone /// <summary> /// Gets the Cache for this transaction event /// </summary> - property GemStone::GemFire::Cache::Generic::Cache^ Cache + property Apache::Geode::Client::Generic::Cache^ Cache { - GemStone::GemFire::Cache::Generic::Cache^ get( ); + Apache::Geode::Client::Generic::Cache^ get( ); } internal: http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/TransactionId.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/TransactionId.hpp b/src/clicache/src/TransactionId.hpp index bc9339f..4375f1b 100644 --- a/src/clicache/src/TransactionId.hpp +++ b/src/clicache/src/TransactionId.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> /// This class encapsulates Id of a transaction. http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/TransactionListenerAdapter.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/TransactionListenerAdapter.hpp b/src/clicache/src/TransactionListenerAdapter.hpp index 96679b3..f098a4b 100644 --- a/src/clicache/src/TransactionListenerAdapter.hpp +++ b/src/clicache/src/TransactionListenerAdapter.hpp @@ -21,11 +21,13 @@ #include "ITransactionListener.hpp" -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { /// <summary> @@ -35,18 +37,18 @@ namespace GemStone /// </summary> generic<class TKey, class TValue> public ref class TransactionListenerAdapter - : public GemStone::GemFire::Cache::Generic::ITransactionListener<TKey, TValue> + : public Apache::Geode::Client::Generic::ITransactionListener<TKey, TValue> { public: - virtual void AfterCommit(GemStone::GemFire::Cache::Generic::TransactionEvent<TKey, TValue>^ te) + virtual void AfterCommit(Apache::Geode::Client::Generic::TransactionEvent<TKey, TValue>^ te) { } - virtual void AfterFailedCommit(GemStone::GemFire::Cache::Generic::TransactionEvent<TKey, TValue>^ te) + virtual void AfterFailedCommit(Apache::Geode::Client::Generic::TransactionEvent<TKey, TValue>^ te) { } - virtual void AfterRollback(GemStone::GemFire::Cache::Generic::TransactionEvent<TKey, TValue>^ te) + virtual void AfterRollback(Apache::Geode::Client::Generic::TransactionEvent<TKey, TValue>^ te) { } http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/TransactionWriterAdapte.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/TransactionWriterAdapte.hpp b/src/clicache/src/TransactionWriterAdapte.hpp index 36f02fc..e3fcd66 100644 --- a/src/clicache/src/TransactionWriterAdapte.hpp +++ b/src/clicache/src/TransactionWriterAdapte.hpp @@ -21,11 +21,13 @@ #include "ITransactionWriter.hpp" -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache { namespace Generic + namespace Client + { +namespace Generic { /// <summary> @@ -34,7 +36,7 @@ namespace GemStone /// </summary> generic<class TKey, class TValue> public ref class TransactionWriterAdapter - : public GemStone::GemFire::Cache::Generic::ITransactionWriter<TKey, TValue> + : public Apache::Geode::Client::Generic::ITransactionWriter<TKey, TValue> { public: virtual void BeforeCommit(TransactionEvent<TKey, TValue>^ te) http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/UserFunctionExecutionException.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/UserFunctionExecutionException.cpp b/src/clicache/src/UserFunctionExecutionException.cpp index 27df568..33bf8a6 100644 --- a/src/clicache/src/UserFunctionExecutionException.cpp +++ b/src/clicache/src/UserFunctionExecutionException.cpp @@ -21,13 +21,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { // IGFSerializable methods http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/UserFunctionExecutionException.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/UserFunctionExecutionException.hpp b/src/clicache/src/UserFunctionExecutionException.hpp index 2178eae..69c35fd 100644 --- a/src/clicache/src/UserFunctionExecutionException.hpp +++ b/src/clicache/src/UserFunctionExecutionException.hpp @@ -26,13 +26,13 @@ using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { /// <summary> /// UserFunctionExecutionException class is used to encapsulate gemfire sendException in case of Function execution. http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/Utils.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/Utils.cpp b/src/clicache/src/Utils.cpp index 3f8cb33..abc6c8b 100644 --- a/src/clicache/src/Utils.cpp +++ b/src/clicache/src/Utils.cpp @@ -20,13 +20,13 @@ #include "gfcli/Utils.hpp" #include <Utils.hpp> -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache - { - namespace Generic + namespace Client + { +namespace Generic { MethodInfo^ Utils::LoadMethod( String^ assemblyName, http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/gf_defs.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/gf_defs.hpp b/src/clicache/src/gf_defs.hpp index 955cb24..7152952 100644 --- a/src/clicache/src/gf_defs.hpp +++ b/src/clicache/src/gf_defs.hpp @@ -35,19 +35,19 @@ // These provide Doxygen with namespace and file descriptions. -/// @namespace GemStone::GemFire +/// @namespace Apache::Geode /// This namespace contains all the GemFire .NET classes and utility classes. -/// @namespace GemStone::GemFire::Cache +/// @namespace Apache::Geode::Client /// This namespace contains all the GemFire .NET API classes and enumerations. -/// @namespace GemStone::GemFire::Cache::Generic +/// @namespace Apache::Geode::Client::Generic /// This namespace contains all the GemFire .NET Generics API classes and enumerations. -/// @namespace GemStone::GemFire::Cache::Internal +/// @namespace Apache::Geode::Client::Internal /// This namespace contains internal GemFire non-public .NET classes. -/// @namespace GemStone::GemFire::Cache::Template +/// @namespace Apache::Geode::Client::Template /// This namespace contains internal GemFire .NET template classes. /// @file gf_includes.hpp http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/gfclicache.rc ---------------------------------------------------------------------- diff --git a/src/clicache/src/gfclicache.rc b/src/clicache/src/gfclicache.rc index 21838dc..f8d4d4b 100644 --- a/src/clicache/src/gfclicache.rc +++ b/src/clicache/src/gfclicache.rc @@ -34,9 +34,9 @@ BEGIN VALUE "CompanyName", PRODUCT_VENDOR_NAME VALUE "FileDescription", PRODUCT_NAME " .NET Library" VALUE "FileVersion", PRODUCT_VERSION - VALUE "InternalName", "Gemstone.Gemfire.Cache" + VALUE "InternalName", "Apache.Geode.Client" VALUE "LegalCopyright", "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership." - VALUE "OriginalFilename", "Gemstone.Gemfire.Cache.dll" + VALUE "OriginalFilename", "Apache.Geode.Client.dll" VALUE "ProductName", PRODUCT_NAME VALUE "ProductVersion", PRODUCT_VERSION END http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/AppDomainContext.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/AppDomainContext.cpp b/src/clicache/src/impl/AppDomainContext.cpp index d3fd91e..85cedd1 100644 --- a/src/clicache/src/impl/AppDomainContext.cpp +++ b/src/clicache/src/impl/AppDomainContext.cpp @@ -17,9 +17,12 @@ #include "AppDomainContext.hpp" -namespace GemStone { -namespace GemFire { -namespace Cache { +namespace Apache +{ + namespace Geode + { + namespace Client + { namespace Generic { apache::geode::client::AppDomainContext* createAppDomainContext() { return new AppDomainContext(); http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/AppDomainContext.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/AppDomainContext.hpp b/src/clicache/src/impl/AppDomainContext.hpp index 9135e5b..9171ce4 100644 --- a/src/clicache/src/impl/AppDomainContext.hpp +++ b/src/clicache/src/impl/AppDomainContext.hpp @@ -21,9 +21,12 @@ #include <vcclr.h> #include <AppDomainContext.hpp> -namespace GemStone { -namespace GemFire { -namespace Cache { +namespace Apache +{ + namespace Geode + { + namespace Client + { namespace Generic { using namespace System; http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/AuthenticatedCache.cpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/AuthenticatedCache.cpp b/src/clicache/src/impl/AuthenticatedCache.cpp index 92edaba..c234b8d 100644 --- a/src/clicache/src/impl/AuthenticatedCache.cpp +++ b/src/clicache/src/impl/AuthenticatedCache.cpp @@ -27,13 +27,13 @@ #include "PdxInstanceFactoryImpl.hpp" using namespace System; -namespace GemStone +namespace Apache { - namespace GemFire + namespace Geode { - namespace Cache + namespace Client { - namespace Generic +namespace Generic { bool AuthenticatedCache::IsClosed::get( ) { http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/src/impl/AuthenticatedCache.hpp ---------------------------------------------------------------------- diff --git a/src/clicache/src/impl/AuthenticatedCache.hpp b/src/clicache/src/impl/AuthenticatedCache.hpp index c669106..9681474 100644 --- a/src/clicache/src/impl/AuthenticatedCache.hpp +++ b/src/clicache/src/impl/AuthenticatedCache.hpp @@ -28,13 +28,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 { //ref class DistributedSystem;
