You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/02/22 18:55:59 UTC
[8/8] geode-native git commit: GEODE-2478: Replace gf with geode.
GEODE-2478: Replace gf with geode.
- Rename directories and files with gf into their name to
instead use geode and update all references thereto.
- Ensure formatting style guide compliance.
- Elide duplicate GEODE_ from include guards.
This closes #23.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/46f71fde
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/46f71fde
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/46f71fde
Branch: refs/heads/develop
Commit: 46f71fde815fdfbfc6b7c16534eb91e275cbbcc0
Parents: fd58b10
Author: Sarge <md...@pivotal.io>
Authored: Tue Feb 21 19:41:10 2017 -0800
Committer: Jacob Barrett <jb...@pivotal.io>
Committed: Wed Feb 22 10:49:56 2017 -0800
----------------------------------------------------------------------
src/clicache/include/gfcli/Utils.hpp | 4 +-
.../integration-test/CacheableWrapper.cs | 8 +-
.../integration-test/DefaultCacheableN.cs | 10 +-
src/clicache/integration-test/DupListenerN.cs | 2 +-
.../integration-test/ExpirationTestsN.cs | 2 +-
src/clicache/integration-test/NetTests.cs | 6 +-
src/clicache/integration-test/OverflowTestsN.cs | 4 +-
.../integration-test/PutGetPerfTests.cs | 2 +-
.../integration-test/RegionEntryTests.cs | 2 +-
.../integration-test/SerializationTestsN.cs | 80 +-
src/clicache/integration-test/TallyListener.cs | 16 +-
src/clicache/integration-test/TallyListenerN.cs | 4 +-
src/clicache/integration-test/TallyWriter.cs | 16 +-
src/clicache/integration-test/TallyWriterN.cs | 4 +-
.../integration-test/ThinClientCqTestsN.cs | 2 +-
.../integration-test/ThinClientDeltaTestN.cs | 8 +-
.../integration-test/ThinClientPdxTests.cs | 20 +-
.../integration-test/ThinClientQueryTestsN.cs | 4 +-
.../integration-test/ThinClientRegionTestsN.cs | 6 +-
.../ThinClientStringArrayTestsN.cs | 2 +-
src/clicache/src/AttributesFactory.cpp | 2 +-
src/clicache/src/AttributesFactory.hpp | 2 +-
src/clicache/src/AttributesMutator.cpp | 2 +-
src/clicache/src/AttributesMutator.hpp | 2 +-
src/clicache/src/Cache.cpp | 2 +-
src/clicache/src/Cache.hpp | 2 +-
src/clicache/src/CacheFactory.cpp | 2 +-
src/clicache/src/CacheFactory.hpp | 2 +-
src/clicache/src/CacheListenerAdapter.hpp | 2 +-
src/clicache/src/CacheStatistics.cpp | 2 +-
src/clicache/src/CacheStatistics.hpp | 2 +-
src/clicache/src/CacheTransactionManager.cpp | 2 +-
src/clicache/src/CacheTransactionManager.hpp | 2 +-
src/clicache/src/CacheWriterAdapter.hpp | 2 +-
src/clicache/src/CacheableArrayList.hpp | 10 +-
src/clicache/src/CacheableBuiltins.hpp | 12 +-
src/clicache/src/CacheableDate.cpp | 4 +-
src/clicache/src/CacheableDate.hpp | 10 +-
src/clicache/src/CacheableFileName.cpp | 4 +-
src/clicache/src/CacheableFileName.hpp | 10 +-
src/clicache/src/CacheableHashMap.cpp | 6 +-
src/clicache/src/CacheableHashMap.hpp | 16 +-
src/clicache/src/CacheableHashSet.hpp | 10 +-
src/clicache/src/CacheableHashTable.hpp | 14 +-
src/clicache/src/CacheableIdentityHashMap.hpp | 10 +-
src/clicache/src/CacheableKey.cpp | 2 +-
src/clicache/src/CacheableKey.hpp | 4 +-
src/clicache/src/CacheableLinkedList.hpp | 18 +-
src/clicache/src/CacheableObject.cpp | 16 +-
src/clicache/src/CacheableObject.hpp | 12 +-
src/clicache/src/CacheableObjectArray.cpp | 10 +-
src/clicache/src/CacheableObjectArray.hpp | 16 +-
src/clicache/src/CacheableObjectXml.cpp | 16 +-
src/clicache/src/CacheableObjectXml.hpp | 12 +-
src/clicache/src/CacheableStack.cpp | 8 +-
src/clicache/src/CacheableStack.hpp | 16 +-
src/clicache/src/CacheableString.cpp | 4 +-
src/clicache/src/CacheableString.hpp | 16 +-
src/clicache/src/CacheableStringArray.cpp | 2 +-
src/clicache/src/CacheableStringArray.hpp | 10 +-
src/clicache/src/CacheableUndefined.cpp | 6 +-
src/clicache/src/CacheableUndefined.hpp | 14 +-
src/clicache/src/CacheableVector.cpp | 8 +-
src/clicache/src/CacheableVector.hpp | 16 +-
src/clicache/src/CqAttributes.cpp | 2 +-
src/clicache/src/CqAttributes.hpp | 2 +-
src/clicache/src/CqAttributesFactory.cpp | 2 +-
src/clicache/src/CqAttributesFactory.hpp | 2 +-
src/clicache/src/CqAttributesMutator.cpp | 2 +-
src/clicache/src/CqAttributesMutator.hpp | 2 +-
src/clicache/src/CqEvent.cpp | 2 +-
src/clicache/src/CqEvent.hpp | 4 +-
src/clicache/src/CqListener.hpp | 4 +-
src/clicache/src/CqOperation.hpp | 2 +-
src/clicache/src/CqQuery.cpp | 2 +-
src/clicache/src/CqQuery.hpp | 2 +-
src/clicache/src/CqServiceStatistics.cpp | 2 +-
src/clicache/src/CqServiceStatistics.hpp | 2 +-
src/clicache/src/CqState.cpp | 2 +-
src/clicache/src/CqState.hpp | 2 +-
src/clicache/src/CqStatistics.cpp | 2 +-
src/clicache/src/CqStatistics.hpp | 2 +-
src/clicache/src/DataInput.cpp | 6 +-
src/clicache/src/DataInput.hpp | 6 +-
src/clicache/src/DataOutput.cpp | 12 +-
src/clicache/src/DataOutput.hpp | 14 +-
src/clicache/src/DiskPolicyType.hpp | 2 +-
src/clicache/src/DistributedSystem.cpp | 2 +-
src/clicache/src/DistributedSystem.hpp | 2 +-
src/clicache/src/EntryEvent.cpp | 2 +-
src/clicache/src/EntryEvent.hpp | 4 +-
src/clicache/src/ExceptionTypes.cpp | 2 +-
src/clicache/src/ExceptionTypes.hpp | 2 +-
src/clicache/src/Execution.cpp | 2 +-
src/clicache/src/Execution.hpp | 2 +-
src/clicache/src/ExpirationAction.hpp | 2 +-
src/clicache/src/FunctionService.cpp | 2 +-
src/clicache/src/FunctionService.hpp | 2 +-
src/clicache/src/GeodeClassIds.hpp | 2 +-
src/clicache/src/IAuthInitialize.hpp | 2 +-
src/clicache/src/ICacheListener.hpp | 2 +-
src/clicache/src/ICacheLoader.hpp | 2 +-
src/clicache/src/ICacheWriter.hpp | 2 +-
src/clicache/src/ICacheableKey.hpp | 6 +-
src/clicache/src/ICqAttributes.hpp | 2 +-
src/clicache/src/ICqEvent.hpp | 4 +-
src/clicache/src/ICqListener.hpp | 2 +-
src/clicache/src/ICqResults.hpp | 2 +-
src/clicache/src/ICqStatusListener.hpp | 2 +-
src/clicache/src/IFixedPartitionResolver.hpp | 4 +-
src/clicache/src/IGFDelta.hpp | 78 --
src/clicache/src/IGFSerializable.hpp | 103 --
src/clicache/src/IGeodeCache.hpp | 2 +-
src/clicache/src/IGeodeDelta.hpp | 78 ++
src/clicache/src/IGeodeSerializable.hpp | 103 ++
src/clicache/src/IPartitionResolver.hpp | 4 +-
src/clicache/src/IPdxReader.hpp | 2 +-
src/clicache/src/IPdxSerializable.hpp | 2 +-
src/clicache/src/IPdxSerializer.hpp | 2 +-
src/clicache/src/IPdxWriter.hpp | 2 +-
src/clicache/src/IPersistenceManager.hpp | 2 +-
src/clicache/src/IRegion.hpp | 6 +-
src/clicache/src/IRegionService.hpp | 4 +-
src/clicache/src/IResultCollector.hpp | 4 +-
src/clicache/src/ISelectResults.hpp | 10 +-
src/clicache/src/ISubscriptionService.hpp | 2 +-
src/clicache/src/ITransactionListener.hpp | 4 +-
src/clicache/src/ITransactionWriter.hpp | 2 +-
src/clicache/src/LocalRegion.cpp | 2 +-
src/clicache/src/LocalRegion.hpp | 2 +-
src/clicache/src/Log.cpp | 2 +-
src/clicache/src/Log.hpp | 2 +-
src/clicache/src/PdxIdentityFieldAttribute.hpp | 2 +-
src/clicache/src/Pool.cpp | 2 +-
src/clicache/src/Pool.hpp | 2 +-
src/clicache/src/PoolFactory.cpp | 2 +-
src/clicache/src/PoolFactory.hpp | 2 +-
src/clicache/src/PoolManager.cpp | 2 +-
src/clicache/src/PoolManager.hpp | 2 +-
src/clicache/src/Properties.cpp | 20 +-
src/clicache/src/Properties.hpp | 24 +-
src/clicache/src/Query.cpp | 2 +-
src/clicache/src/Query.hpp | 4 +-
src/clicache/src/QueryService.cpp | 2 +-
src/clicache/src/QueryService.hpp | 2 +-
.../src/ReflectionBasedAutoSerializer.hpp | 2 +-
src/clicache/src/Region.cpp | 4 +-
src/clicache/src/Region.hpp | 2 +-
src/clicache/src/RegionAttributes.cpp | 4 +-
src/clicache/src/RegionAttributes.hpp | 10 +-
src/clicache/src/RegionEntry.cpp | 2 +-
src/clicache/src/RegionEntry.hpp | 2 +-
src/clicache/src/RegionEvent.cpp | 4 +-
src/clicache/src/RegionEvent.hpp | 4 +-
src/clicache/src/RegionFactory.cpp | 2 +-
src/clicache/src/RegionFactory.hpp | 2 +-
src/clicache/src/RegionShortcut.hpp | 2 +-
src/clicache/src/ResultCollector.cpp | 4 +-
src/clicache/src/ResultCollector.hpp | 2 +-
src/clicache/src/ResultSet.cpp | 6 +-
src/clicache/src/ResultSet.hpp | 10 +-
src/clicache/src/SelectResultsIterator.cpp | 6 +-
src/clicache/src/SelectResultsIterator.hpp | 12 +-
src/clicache/src/Serializable.cpp | 64 +-
src/clicache/src/Serializable.hpp | 28 +-
src/clicache/src/StatisticDescriptor.cpp | 2 +-
src/clicache/src/StatisticDescriptor.hpp | 2 +-
src/clicache/src/Statistics.cpp | 2 +-
src/clicache/src/Statistics.hpp | 2 +-
src/clicache/src/StatisticsFactory.cpp | 2 +-
src/clicache/src/StatisticsFactory.hpp | 2 +-
src/clicache/src/StatisticsType.cpp | 2 +-
src/clicache/src/StatisticsType.hpp | 2 +-
src/clicache/src/Struct.cpp | 2 +-
src/clicache/src/Struct.hpp | 16 +-
src/clicache/src/StructSet.cpp | 6 +-
src/clicache/src/StructSet.hpp | 14 +-
src/clicache/src/SystemProperties.cpp | 2 +-
src/clicache/src/SystemProperties.hpp | 2 +-
src/clicache/src/TransactionEvent.cpp | 4 +-
src/clicache/src/TransactionEvent.hpp | 4 +-
src/clicache/src/TransactionId.hpp | 2 +-
src/clicache/src/TransactionListenerAdapter.hpp | 4 +-
src/clicache/src/TransactionWriterAdapte.hpp | 4 +-
.../src/UserFunctionExecutionException.cpp | 4 +-
.../src/UserFunctionExecutionException.hpp | 14 +-
src/clicache/src/Utils.cpp | 2 +-
src/clicache/src/geode_defs.hpp | 275 +++++
src/clicache/src/geode_includes.hpp | 26 +
src/clicache/src/geodeclicache.vcxproj.filters | 1075 ++++++++++++++++++
src/clicache/src/gf_defs.hpp | 275 -----
src/clicache/src/gf_includes.hpp | 26 -
src/clicache/src/gfclicache.vcxproj.filters | 1075 ------------------
src/clicache/src/impl/AuthenticatedCache.cpp | 2 +-
src/clicache/src/impl/AuthenticatedCache.hpp | 4 +-
src/clicache/src/impl/CacheListener.hpp | 2 +-
src/clicache/src/impl/CacheLoader.hpp | 2 +-
src/clicache/src/impl/CacheWriter.hpp | 2 +-
src/clicache/src/impl/CliCallbackDelgate.hpp | 2 +-
src/clicache/src/impl/CqListenerProxy.hpp | 2 +-
src/clicache/src/impl/DelegateWrapper.hpp | 10 +-
src/clicache/src/impl/EnumInfo.cpp | 4 +-
src/clicache/src/impl/EnumInfo.hpp | 10 +-
src/clicache/src/impl/GFDataInputStream.hpp | 136 ---
src/clicache/src/impl/GFDataOutputStream.hpp | 118 --
src/clicache/src/impl/GFNullStream.hpp | 119 --
src/clicache/src/impl/GeodeDataInputStream.hpp | 136 +++
src/clicache/src/impl/GeodeDataOutputStream.hpp | 118 ++
src/clicache/src/impl/GeodeNullStream.hpp | 119 ++
src/clicache/src/impl/ManagedAuthInitialize.cpp | 2 +-
src/clicache/src/impl/ManagedAuthInitialize.hpp | 2 +-
src/clicache/src/impl/ManagedCacheListener.cpp | 2 +-
src/clicache/src/impl/ManagedCacheListener.hpp | 2 +-
src/clicache/src/impl/ManagedCacheLoader.cpp | 2 +-
src/clicache/src/impl/ManagedCacheLoader.hpp | 2 +-
src/clicache/src/impl/ManagedCacheWriter.cpp | 2 +-
src/clicache/src/impl/ManagedCacheWriter.hpp | 2 +-
src/clicache/src/impl/ManagedCacheableDelta.cpp | 8 +-
src/clicache/src/impl/ManagedCacheableDelta.hpp | 28 +-
.../src/impl/ManagedCacheableDeltaBytes.cpp | 36 +-
.../src/impl/ManagedCacheableDeltaBytes.hpp | 28 +-
src/clicache/src/impl/ManagedCacheableKey.cpp | 8 +-
src/clicache/src/impl/ManagedCacheableKey.hpp | 16 +-
.../src/impl/ManagedCacheableKeyBytes.cpp | 16 +-
.../src/impl/ManagedCacheableKeyBytes.hpp | 16 +-
src/clicache/src/impl/ManagedCqListener.cpp | 2 +-
src/clicache/src/impl/ManagedCqListener.hpp | 2 +-
.../src/impl/ManagedCqStatusListener.hpp | 2 +-
.../src/impl/ManagedFixedPartitionResolver.hpp | 2 +-
.../src/impl/ManagedPartitionResolver.cpp | 2 +-
.../src/impl/ManagedPartitionResolver.hpp | 2 +-
.../src/impl/ManagedPersistenceManager.hpp | 2 +-
.../src/impl/ManagedResultCollector.cpp | 14 +-
.../src/impl/ManagedResultCollector.hpp | 2 +-
src/clicache/src/impl/ManagedString.hpp | 2 +-
.../src/impl/ManagedTransactionListener.cpp | 4 +-
.../src/impl/ManagedTransactionListener.hpp | 4 +-
.../src/impl/ManagedTransactionWriter.cpp | 4 +-
.../src/impl/ManagedTransactionWriter.hpp | 4 +-
src/clicache/src/impl/ManagedVisitor.cpp | 6 +-
src/clicache/src/impl/ManagedVisitor.hpp | 2 +-
src/clicache/src/impl/MemoryPressureHandler.cpp | 2 +-
src/clicache/src/impl/NativeWrapper.hpp | 2 +-
src/clicache/src/impl/PartitionResolver.hpp | 2 +-
src/clicache/src/impl/PdxFieldType.cpp | 2 +-
src/clicache/src/impl/PdxFieldType.hpp | 6 +-
src/clicache/src/impl/PdxLocalReader.hpp | 4 +-
src/clicache/src/impl/PdxLocalWriter.hpp | 4 +-
.../src/impl/PdxManagedCacheableKey.cpp | 4 +-
.../src/impl/PdxManagedCacheableKey.hpp | 12 +-
.../src/impl/PdxManagedCacheableKeyBytes.cpp | 20 +-
.../src/impl/PdxManagedCacheableKeyBytes.hpp | 10 +-
.../src/impl/PdxReaderWithTypeCollector.hpp | 4 +-
src/clicache/src/impl/PdxRemoteReader.hpp | 4 +-
src/clicache/src/impl/PdxRemoteWriter.hpp | 4 +-
src/clicache/src/impl/PdxType.cpp | 2 +-
src/clicache/src/impl/PdxType.hpp | 6 +-
.../src/impl/PdxWriterWithTypeCollector.hpp | 4 +-
src/clicache/src/impl/RegionImpl.cpp | 2 +-
src/clicache/src/impl/RegionImpl.hpp | 2 +-
src/clicache/src/impl/ResultCollectorProxy.hpp | 2 +-
src/clicache/src/impl/SafeConvert.hpp | 32 +-
src/clicache/src/impl/TransactionListener.hpp | 4 +-
src/clicache/src/impl/TransactionWriter.hpp | 4 +-
.../include/geode/AttributesFactory.hpp | 2 +-
.../include/geode/AttributesMutator.hpp | 2 +-
src/cppcache/include/geode/AuthInitialize.hpp | 2 +-
src/cppcache/include/geode/Cache.hpp | 4 +-
src/cppcache/include/geode/CacheAttributes.hpp | 2 +-
src/cppcache/include/geode/CacheFactory.hpp | 2 +-
src/cppcache/include/geode/CacheListener.hpp | 2 +-
src/cppcache/include/geode/CacheLoader.hpp | 2 +-
src/cppcache/include/geode/CacheStatistics.hpp | 2 +-
.../include/geode/CacheTransactionManager.hpp | 2 +-
src/cppcache/include/geode/CacheWriter.hpp | 2 +-
src/cppcache/include/geode/CacheableDate.hpp | 2 +-
.../include/geode/CacheableFileName.hpp | 2 +-
src/cppcache/include/geode/CacheableKey.hpp | 2 +-
.../include/geode/CacheableObjectArray.hpp | 2 +-
src/cppcache/include/geode/CacheableString.hpp | 2 +-
.../include/geode/CacheableUndefined.hpp | 2 +-
src/cppcache/include/geode/CqAttributes.hpp | 2 +-
.../include/geode/CqAttributesFactory.hpp | 2 +-
.../include/geode/CqAttributesMutator.hpp | 2 +-
src/cppcache/include/geode/CqEvent.hpp | 2 +-
src/cppcache/include/geode/CqListener.hpp | 2 +-
src/cppcache/include/geode/CqQuery.hpp | 2 +-
src/cppcache/include/geode/CqResults.hpp | 2 +-
.../include/geode/CqServiceStatistics.hpp | 2 +-
src/cppcache/include/geode/CqState.hpp | 2 +-
src/cppcache/include/geode/CqStatistics.hpp | 2 +-
src/cppcache/include/geode/DataInput.hpp | 2 +-
.../include/geode/DistributedSystem.hpp | 2 +-
src/cppcache/include/geode/EntryEvent.hpp | 2 +-
src/cppcache/include/geode/Exception.hpp | 2 +-
src/cppcache/include/geode/Execution.hpp | 2 +-
src/cppcache/include/geode/FunctionService.hpp | 2 +-
src/cppcache/include/geode/GeodeCache.hpp | 2 +-
.../include/geode/PdxInstanceFactory.hpp | 2 +-
src/cppcache/include/geode/PdxUnreadFields.hpp | 2 +-
src/cppcache/include/geode/PdxWriter.hpp | 2 +-
.../include/geode/PersistenceManager.hpp | 2 +-
src/cppcache/include/geode/Pool.hpp | 2 +-
src/cppcache/include/geode/PoolFactory.hpp | 2 +-
src/cppcache/include/geode/PoolManager.hpp | 2 +-
src/cppcache/include/geode/Properties.hpp | 2 +-
src/cppcache/include/geode/Query.hpp | 2 +-
src/cppcache/include/geode/QueryService.hpp | 2 +-
src/cppcache/include/geode/Region.hpp | 2 +-
src/cppcache/include/geode/RegionAttributes.hpp | 2 +-
src/cppcache/include/geode/RegionEntry.hpp | 2 +-
src/cppcache/include/geode/RegionEvent.hpp | 2 +-
src/cppcache/include/geode/RegionFactory.hpp | 2 +-
src/cppcache/include/geode/RegionService.hpp | 2 +-
src/cppcache/include/geode/ResultCollector.hpp | 2 +-
src/cppcache/include/geode/ResultSet.hpp | 2 +-
src/cppcache/include/geode/SelectResults.hpp | 2 +-
.../include/geode/SelectResultsIterator.hpp | 2 +-
src/cppcache/include/geode/Serializable.hpp | 2 +-
src/cppcache/include/geode/Struct.hpp | 2 +-
src/cppcache/include/geode/StructSet.hpp | 2 +-
src/cppcache/include/geode/geode_base.hpp | 358 ++++++
src/cppcache/include/geode/geode_globals.hpp | 2 +-
src/cppcache/include/geode/geode_types.hpp | 111 ++
src/cppcache/include/geode/gf_base.hpp | 358 ------
src/cppcache/include/geode/gf_types.hpp | 111 --
.../testEntriesMapForVersioning.cpp | 2 +-
.../integration-test/testSerialization.cpp | 2 +-
.../integration-test/testThinClientBigValue.cpp | 2 +-
.../integration-test/testThinClientPdxTests.cpp | 31 +-
.../testThinClientPdxTestsWithAuto.cpp | 35 +-
src/cppcache/src/AdminRegion.hpp | 2 +-
.../src/CacheTransactionManagerImpl.cpp | 2 +-
src/cppcache/src/CacheableObjectPartList.hpp | 2 +-
src/cppcache/src/ClientHealthStats.hpp | 2 +-
src/cppcache/src/CqAttributesMutatorImpl.hpp | 2 +-
src/cppcache/src/CqEventImpl.hpp | 2 +-
src/cppcache/src/CqQueryImpl.hpp | 2 +-
src/cppcache/src/CqService.hpp | 2 +-
src/cppcache/src/DistributedSystemImpl.hpp | 2 +-
src/cppcache/src/EventId.hpp | 2 +-
src/cppcache/src/ExecutionImpl.cpp | 2 +-
src/cppcache/src/ExecutionImpl.hpp | 2 +-
src/cppcache/src/FarSideEntryOp.hpp | 2 +-
src/cppcache/src/FunctionServiceImpl.hpp | 2 +-
src/cppcache/src/GF_TASK_T.hpp | 86 --
.../InternalCacheTransactionManager2PCImpl.cpp | 2 +-
src/cppcache/src/NoResult.hpp | 2 +-
src/cppcache/src/PoolAttributes.hpp | 2 +-
src/cppcache/src/ProxyCache.hpp | 2 +-
src/cppcache/src/ProxyRegion.hpp | 2 +-
src/cppcache/src/RegionCommit.hpp | 2 +-
src/cppcache/src/RemoteQuery.hpp | 2 +-
src/cppcache/src/ResultSetImpl.hpp | 2 +-
src/cppcache/src/StackFrame.cpp | 2 +-
src/cppcache/src/StructSetImpl.hpp | 2 +-
src/cppcache/src/TXCommitMessage.hpp | 2 +-
src/cppcache/src/TXEntryState.hpp | 2 +-
src/cppcache/src/TXId.hpp | 2 +-
src/cppcache/src/TXRegionState.hpp | 2 +-
src/cppcache/src/Task.hpp | 86 ++
src/cppcache/src/TcpSslConn.cpp | 8 +-
src/cppcache/src/TcpSslConn.hpp | 8 +-
src/cppcache/src/TcrChunkedContext.hpp | 2 +-
src/cppcache/src/TcrConnectionManager.cpp | 10 +-
src/cppcache/src/TcrConnectionManager.hpp | 12 +-
src/cppcache/src/TcrEndpoint.cpp | 6 +-
src/cppcache/src/TcrEndpoint.hpp | 8 +-
src/cppcache/src/TcrHADistributionManager.hpp | 2 +-
src/cppcache/src/TcrPoolEndPoint.cpp | 2 +-
src/cppcache/src/ThinClientBaseDM.cpp | 2 +-
src/cppcache/src/ThinClientBaseDM.hpp | 2 +-
src/cppcache/src/ThinClientPoolDM.cpp | 12 +-
src/cppcache/src/ThinClientPoolDM.hpp | 12 +-
src/cppcache/src/ThinClientPoolHADM.cpp | 2 +-
src/cppcache/src/ThinClientPoolHADM.hpp | 2 +-
.../src/ThinClientRedundancyManager.cpp | 2 +-
.../src/ThinClientRedundancyManager.hpp | 2 +-
src/cppcache/src/TransactionalOperation.hpp | 2 +-
src/cppcache/src/Utils.hpp | 2 +-
.../src/VersionedCacheableObjectPartList.hpp | 2 +-
src/cryptoimpl/DHImpl.hpp | 2 +-
src/cryptoimpl/GFSsl.hpp | 44 -
src/cryptoimpl/SSLImpl.hpp | 6 +-
src/cryptoimpl/Ssl.hpp | 50 +
src/dhimpl/DHImpl.hpp | 2 +-
src/pdxautoserializer/ASCLIBuiltins.hpp | 2 +-
src/quickstart/csharp/DeltaExample.cs | 6 +-
src/quickstart/csharp/PortfolioN.cs | 10 +-
src/quickstart/csharp/PortfolioPdx.cs | 2 +-
src/quickstart/csharp/PositionN.cs | 10 +-
src/quickstart/csharp/PositionPdx.cs | 2 +-
src/tests/cli/NewFwkLib/CacheHelper.cs | 2 +-
src/tests/cli/NewFwkLib/CacheServer.cs | 2 +-
.../cli/NewFwkLib/EventTest/ETCacheLoader.cs | 2 +-
src/tests/cli/NewFwkLib/EventTest/EventTests.cs | 16 +-
.../FunctionExecution/FunctionExecution.cs | 10 +-
src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs | 2 +-
.../cli/NewFwkLib/SecurityTest/Security.cs | 12 +-
src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs | 2 +-
src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs | 4 +-
src/tests/cli/NewTestObject/BatchObject.cs | 4 +-
src/tests/cli/NewTestObject/DeltaEx.cs | 6 +-
.../cli/NewTestObject/DeltaFastAssetAccount.cs | 6 +-
src/tests/cli/NewTestObject/DeltaPSTObject.cs | 6 +-
src/tests/cli/NewTestObject/DeltaTestImpl.cs | 6 +-
src/tests/cli/NewTestObject/EqStruct.cs | 6 +-
src/tests/cli/NewTestObject/FastAsset.cs | 4 +-
src/tests/cli/NewTestObject/FastAssetAccount.cs | 4 +-
src/tests/cli/NewTestObject/PSTObject.cs | 4 +-
src/tests/cli/NewTestObject/Portfolio.cs | 12 +-
src/tests/cli/NewTestObject/PortfolioPdx.cs | 2 +-
src/tests/cli/NewTestObject/Position.cs | 10 +-
src/tests/cli/NewTestObject/PositionPdx.cs | 2 +-
src/tests/cli/NewTestObject/TestObject1.cs | 6 +-
src/tests/cli/NewTestObject/TimeStampdObject.cs | 4 +-
src/tests/cli/PdxClassLibrary/PortfolioPdx.cs | 2 +-
src/tests/cli/PdxClassLibrary/PositionPdx.cs | 2 +-
.../cli/PdxClassLibrary/VariousPdxTypes.cs | 12 +-
src/tests/cli/QueryHelper/QueryHelperN.cs | 2 +-
src/tests/cpp/fwklib/FwkBB.hpp | 2 +-
src/tests/cpp/fwklib/FwkLog.hpp | 2 +-
src/tests/cpp/fwklib/GsRandom.hpp | 2 +-
src/tests/cpp/fwklib/IpcHandler.hpp | 2 +-
src/tests/cpp/fwklib/MersenneTwister.hpp | 2 +-
src/tests/cpp/fwklib/PerfFwk.hpp | 2 +-
src/tests/cpp/fwklib/Service.hpp | 2 +-
src/tests/cpp/fwklib/TcpIpc.hpp | 2 +-
src/tests/cpp/fwklib/Timer.hpp | 2 +-
src/tests/cpp/testobject/VariousPdxTypes.cpp | 21 +-
src/tests/cpp/testobject/VariousPdxTypes.hpp | 14 +-
.../cpp/testobject/VariousPdxTypesWithAuto.cpp | 21 +-
.../cpp/testobject/VariousPdxTypesWithAuto.hpp | 14 +-
433 files changed, 3589 insertions(+), 3579 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/include/gfcli/Utils.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/include/gfcli/Utils.hpp b/src/clicache/include/gfcli/Utils.hpp
index 516b26d..221fef7 100644
--- a/src/clicache/include/gfcli/Utils.hpp
+++ b/src/clicache/include/gfcli/Utils.hpp
@@ -19,8 +19,8 @@
#pragma once
-#include <geode/gf_base.hpp>
-#include "gf_defs.hpp"
+#include <geode/geode_base.hpp>
+#include "geode_defs.hpp"
//#include "SystemProperties.hpp"
//#include "../../impl/NativeWrapper.hpp"
//#include "../../Log.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/CacheableWrapper.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheableWrapper.cs b/src/clicache/integration-test/CacheableWrapper.cs
index a77bd69..f8acd21 100644
--- a/src/clicache/integration-test/CacheableWrapper.cs
+++ b/src/clicache/integration-test/CacheableWrapper.cs
@@ -35,12 +35,12 @@ namespace Apache.Geode.Client.UnitTests
{
#region Protected members
- protected IGFSerializable m_cacheableObject = null;
+ protected IGeodeSerializable m_cacheableObject = null;
protected uint m_typeId;
#endregion
- public virtual IGFSerializable Cacheable
+ public virtual IGeodeSerializable Cacheable
{
get
{
@@ -62,7 +62,7 @@ namespace Apache.Geode.Client.UnitTests
public abstract void InitRandomValue(int maxSize);
- public abstract uint GetChecksum(IGFSerializable cacheableObject);
+ public abstract uint GetChecksum(IGeodeSerializable cacheableObject);
public virtual uint GetChecksum()
{
@@ -79,7 +79,7 @@ namespace Apache.Geode.Client.UnitTests
/// </remarks>
public abstract class CacheableKeyWrapper : CacheableWrapper
{
- public override IGFSerializable Cacheable
+ public override IGeodeSerializable Cacheable
{
get
{
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/DefaultCacheableN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DefaultCacheableN.cs b/src/clicache/integration-test/DefaultCacheableN.cs
index 183e9cf..d8ed3b9 100644
--- a/src/clicache/integration-test/DefaultCacheableN.cs
+++ b/src/clicache/integration-test/DefaultCacheableN.cs
@@ -36,8 +36,8 @@ namespace Apache.Geode.Client.UnitTests
}
}
- // VJR: TODO: IGFSerializable should be replaced by IPdxSerializable when ready
- class DefaultType : IGFSerializable
+ // VJR: TODO: IGeodeSerializable should be replaced by IPdxSerializable when ready
+ class DefaultType : IGeodeSerializable
{
bool m_cacheableBoolean;
int m_cacheableInt32;
@@ -155,14 +155,14 @@ namespace Apache.Geode.Client.UnitTests
get { return m_cacheableObject; }
}
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
public uint ClassId
{
get { return 0x04; }
}
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
if (!m_initialized)
{
@@ -253,7 +253,7 @@ namespace Apache.Geode.Client.UnitTests
#endregion
- public static IGFSerializable CreateDeserializable()
+ public static IGeodeSerializable CreateDeserializable()
{
return new DefaultType();
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/DupListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DupListenerN.cs b/src/clicache/integration-test/DupListenerN.cs
index faedeed..74eab9a 100644
--- a/src/clicache/integration-test/DupListenerN.cs
+++ b/src/clicache/integration-test/DupListenerN.cs
@@ -32,7 +32,7 @@ namespace Apache.Geode.Client.UnitTests
private int m_ops = 0;
private Dictionary<object, object> m_map = new Dictionary<object, object>();
- //ICacheableKey, IGFSerializable
+ //ICacheableKey, IGeodeSerializable
#endregion
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/ExpirationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ExpirationTestsN.cs b/src/clicache/integration-test/ExpirationTestsN.cs
index 7e24e1d..419a43e 100644
--- a/src/clicache/integration-test/ExpirationTestsN.cs
+++ b/src/clicache/integration-test/ExpirationTestsN.cs
@@ -185,7 +185,7 @@ namespace Apache.Geode.Client.UnitTests
m_regionName = "RT1";
SetupRegion(0, 0, 0, 0);
PutKeyTouch(5);
- IGFSerializable val = m_region.Get(m_key);
+ IGeodeSerializable val = m_region.Get(m_key);
m_region.Destroy(m_key);
val = m_region.Get(m_key);
CheckRegion(false, 0);
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/NetTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/NetTests.cs b/src/clicache/integration-test/NetTests.cs
index 434caf5..e31d9b4 100644
--- a/src/clicache/integration-test/NetTests.cs
+++ b/src/clicache/integration-test/NetTests.cs
@@ -73,7 +73,7 @@ namespace Apache.Geode.Client.UnitTests
CacheHelper.CreateDistribRegion(TestRegion, false, true);
m_region = CacheHelper.GetVerifyRegion(TestRegion);
DoGets(m_region, num);
- IGFSerializable[] arr = m_region.GetKeys();
+ IGeodeSerializable[] arr = m_region.GetKeys();
Assert.AreEqual(num, arr.Length);
}
@@ -83,7 +83,7 @@ namespace Apache.Geode.Client.UnitTests
Util.Log("Calling doGets for verify");
//Thread.Sleep(2000);
//doGets(m_region, load);
- IGFSerializable[] arr = m_region.GetKeys();
+ IGeodeSerializable[] arr = m_region.GetKeys();
Assert.AreEqual(num, arr.Length);
}
@@ -97,7 +97,7 @@ namespace Apache.Geode.Client.UnitTests
Thread.Sleep(100);
DoGets(m_region, num);
Assert.AreEqual(num, m_ldr.Loads);
- IGFSerializable[] arr = m_region.GetKeys();
+ IGeodeSerializable[] arr = m_region.GetKeys();
Assert.AreEqual(num, arr.Length);
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/OverflowTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/OverflowTestsN.cs b/src/clicache/integration-test/OverflowTestsN.cs
index ba10e17..8980ab6 100644
--- a/src/clicache/integration-test/OverflowTestsN.cs
+++ b/src/clicache/integration-test/OverflowTestsN.cs
@@ -169,7 +169,7 @@ namespace Apache.Geode.Client.UnitTests
}
}
- private bool IsOverflowed(/*IGFSerializable*/ object cVal)
+ private bool IsOverflowed(/*IGeodeSerializable*/ object cVal)
{
//Util.Log("IsOverflowed:: value is: {0}; type is: {1}", cVal.ToString(), cVal.GetType());
return cVal.ToString() == "CacheableToken::OVERFLOWED";
@@ -177,7 +177,7 @@ namespace Apache.Geode.Client.UnitTests
private void CheckOverflowToken(IRegion<object, object> region, int num, int lruLimit)
{
- //IGFSerializable cVal;
+ //IGeodeSerializable cVal;
//ICacheableKey[] cKeys = region.GetKeys();
object cVal;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/PutGetPerfTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/PutGetPerfTests.cs b/src/clicache/integration-test/PutGetPerfTests.cs
index 1e37210..8268742 100644
--- a/src/clicache/integration-test/PutGetPerfTests.cs
+++ b/src/clicache/integration-test/PutGetPerfTests.cs
@@ -174,7 +174,7 @@ namespace Apache.Geode.Client.UnitTests
{
int numKeys = 0;
string message;
- IGFSerializable[] keys = CacheHelper.CurrentRegion.GetKeys();
+ IGeodeSerializable[] keys = CacheHelper.CurrentRegion.GetKeys();
if (keys != null)
{
numKeys = keys.Length;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/RegionEntryTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionEntryTests.cs b/src/clicache/integration-test/RegionEntryTests.cs
index 2cdc335..ba76dae 100644
--- a/src/clicache/integration-test/RegionEntryTests.cs
+++ b/src/clicache/integration-test/RegionEntryTests.cs
@@ -66,7 +66,7 @@ namespace Apache.Geode.Client.UnitTests
regionName + ": value of " + i.ToString());
}
ICacheableKey[] cKeys = region.GetKeys();
- IGFSerializable[] cValues = region.GetValues();
+ IGeodeSerializable[] cValues = region.GetValues();
Assert.AreEqual(num, cKeys.Length, "Number of keys in region is incorrect.");
Assert.AreEqual(num, cValues.Length, "Number of values in region is incorrect.");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/SerializationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SerializationTestsN.cs b/src/clicache/integration-test/SerializationTestsN.cs
index 5b4268a..8a3648e 100644
--- a/src/clicache/integration-test/SerializationTestsN.cs
+++ b/src/clicache/integration-test/SerializationTestsN.cs
@@ -70,9 +70,9 @@ namespace Apache.Geode.Client.UnitTests
base.EndTest();
}
- private IGFSerializable CreateOtherType(int i, int otherType)
+ private IGeodeSerializable CreateOtherType(int i, int otherType)
{
- IGFSerializable ot;
+ IGeodeSerializable ot;
switch (otherType)
{
case OTHER_TYPE1: ot = new OtherType(i, i + 20000); break;
@@ -147,7 +147,7 @@ namespace Apache.Geode.Client.UnitTests
IRegion<object, object> region = CacheHelper.GetVerifyRegion<object, object>(RegionNames[0]);
for (int i = 0; i < n; i++)
{
- IGFSerializable ot = CreateOtherType(i, otherType);
+ IGeodeSerializable ot = CreateOtherType(i, otherType);
region[i + 10] = ot;
}
}
@@ -158,7 +158,7 @@ namespace Apache.Geode.Client.UnitTests
for (int i = 0; i < n; i++)
{
object val = region[i + 10];
- IGFSerializable ot = CreateOtherType(i, otherType);
+ IGeodeSerializable ot = CreateOtherType(i, otherType);
Assert.IsTrue(ot.Equals(val), "Found unexpected value");
}
}
@@ -385,7 +385,7 @@ namespace Apache.Geode.Client.UnitTests
};
- public class OtherType : IGFSerializable
+ public class OtherType : IGeodeSerializable
{
private CData m_struct;
private ExceptionType m_exType;
@@ -427,19 +427,19 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public static IGFSerializable Duplicate(IGFSerializable orig)
+ public static IGeodeSerializable Duplicate(IGeodeSerializable orig)
{
DataOutput dout = new DataOutput();
orig.ToData(dout);
DataInput din = new DataInput(dout.GetBuffer());
- IGFSerializable dup = (IGFSerializable)din.ReadObject();
+ IGeodeSerializable dup = (IGeodeSerializable)din.ReadObject();
return dup;
}
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
m_struct.First = input.ReadInt32();
m_struct.Second = input.ReadInt64();
@@ -512,7 +512,7 @@ namespace Apache.Geode.Client.UnitTests
#endregion
- public static IGFSerializable CreateDeserializable()
+ public static IGeodeSerializable CreateDeserializable()
{
return new OtherType();
}
@@ -533,7 +533,7 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public class OtherType2 : IGFSerializable
+ public class OtherType2 : IGeodeSerializable
{
private CData m_struct;
private ExceptionType m_exType;
@@ -575,19 +575,19 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public static IGFSerializable Duplicate(IGFSerializable orig)
+ public static IGeodeSerializable Duplicate(IGeodeSerializable orig)
{
DataOutput dout = new DataOutput();
orig.ToData(dout);
DataInput din = new DataInput(dout.GetBuffer());
- IGFSerializable dup = (IGFSerializable)din.ReadObject();
+ IGeodeSerializable dup = (IGeodeSerializable)din.ReadObject();
return dup;
}
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
m_struct.First = input.ReadInt32();
m_struct.Second = input.ReadInt64();
@@ -660,7 +660,7 @@ namespace Apache.Geode.Client.UnitTests
#endregion
- public static IGFSerializable CreateDeserializable()
+ public static IGeodeSerializable CreateDeserializable()
{
return new OtherType2();
}
@@ -682,7 +682,7 @@ namespace Apache.Geode.Client.UnitTests
}
- public class OtherType22 : IGFSerializable
+ public class OtherType22 : IGeodeSerializable
{
private CData m_struct;
private ExceptionType m_exType;
@@ -724,19 +724,19 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public static IGFSerializable Duplicate(IGFSerializable orig)
+ public static IGeodeSerializable Duplicate(IGeodeSerializable orig)
{
DataOutput dout = new DataOutput();
orig.ToData(dout);
DataInput din = new DataInput(dout.GetBuffer());
- IGFSerializable dup = (IGFSerializable)din.ReadObject();
+ IGeodeSerializable dup = (IGeodeSerializable)din.ReadObject();
return dup;
}
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
m_struct.First = input.ReadInt32();
m_struct.Second = input.ReadInt64();
@@ -809,7 +809,7 @@ namespace Apache.Geode.Client.UnitTests
#endregion
- public static IGFSerializable CreateDeserializable()
+ public static IGeodeSerializable CreateDeserializable()
{
return new OtherType22();
}
@@ -830,7 +830,7 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public class OtherType4 : IGFSerializable
+ public class OtherType4 : IGeodeSerializable
{
private CData m_struct;
private ExceptionType m_exType;
@@ -872,19 +872,19 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public static IGFSerializable Duplicate(IGFSerializable orig)
+ public static IGeodeSerializable Duplicate(IGeodeSerializable orig)
{
DataOutput dout = new DataOutput();
orig.ToData(dout);
DataInput din = new DataInput(dout.GetBuffer());
- IGFSerializable dup = (IGFSerializable)din.ReadObject();
+ IGeodeSerializable dup = (IGeodeSerializable)din.ReadObject();
return dup;
}
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
m_struct.First = input.ReadInt32();
m_struct.Second = input.ReadInt64();
@@ -957,7 +957,7 @@ namespace Apache.Geode.Client.UnitTests
#endregion
- public static IGFSerializable CreateDeserializable()
+ public static IGeodeSerializable CreateDeserializable()
{
return new OtherType4();
}
@@ -979,7 +979,7 @@ namespace Apache.Geode.Client.UnitTests
}
- public class OtherType42 : IGFSerializable
+ public class OtherType42 : IGeodeSerializable
{
private CData m_struct;
private ExceptionType m_exType;
@@ -1021,19 +1021,19 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public static IGFSerializable Duplicate(IGFSerializable orig)
+ public static IGeodeSerializable Duplicate(IGeodeSerializable orig)
{
DataOutput dout = new DataOutput();
orig.ToData(dout);
DataInput din = new DataInput(dout.GetBuffer());
- IGFSerializable dup = (IGFSerializable)din.ReadObject();
+ IGeodeSerializable dup = (IGeodeSerializable)din.ReadObject();
return dup;
}
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
m_struct.First = input.ReadInt32();
m_struct.Second = input.ReadInt64();
@@ -1106,7 +1106,7 @@ namespace Apache.Geode.Client.UnitTests
#endregion
- public static IGFSerializable CreateDeserializable()
+ public static IGeodeSerializable CreateDeserializable()
{
return new OtherType42();
}
@@ -1128,7 +1128,7 @@ namespace Apache.Geode.Client.UnitTests
}
- public class OtherType43 : IGFSerializable
+ public class OtherType43 : IGeodeSerializable
{
private CData m_struct;
private ExceptionType m_exType;
@@ -1170,19 +1170,19 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public static IGFSerializable Duplicate(IGFSerializable orig)
+ public static IGeodeSerializable Duplicate(IGeodeSerializable orig)
{
DataOutput dout = new DataOutput();
orig.ToData(dout);
DataInput din = new DataInput(dout.GetBuffer());
- IGFSerializable dup = (IGFSerializable)din.ReadObject();
+ IGeodeSerializable dup = (IGeodeSerializable)din.ReadObject();
return dup;
}
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
m_struct.First = input.ReadInt32();
m_struct.Second = input.ReadInt64();
@@ -1255,7 +1255,7 @@ namespace Apache.Geode.Client.UnitTests
#endregion
- public static IGFSerializable CreateDeserializable()
+ public static IGeodeSerializable CreateDeserializable()
{
return new OtherType43();
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/TallyListener.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyListener.cs b/src/clicache/integration-test/TallyListener.cs
index 8e6df7a..62a6df0 100644
--- a/src/clicache/integration-test/TallyListener.cs
+++ b/src/clicache/integration-test/TallyListener.cs
@@ -32,8 +32,8 @@ namespace Apache.Geode.Client.UnitTests
private int m_destroys = 0;
private int m_clears = 0;
private Apache.Geode.Client.ICacheableKey m_lastKey = null;
- private Apache.Geode.Client.IGFSerializable m_lastValue = null;
- private Apache.Geode.Client.IGFSerializable m_callbackArg = null;
+ private Apache.Geode.Client.IGeodeSerializable m_lastValue = null;
+ private Apache.Geode.Client.IGeodeSerializable m_callbackArg = null;
private bool m_ignoreTimeout = false;
private bool m_quiet = false;
private bool isListenerInvoke = false;
@@ -83,7 +83,7 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public Apache.Geode.Client.IGFSerializable LastKey
+ public Apache.Geode.Client.IGeodeSerializable LastKey
{
get
{
@@ -107,7 +107,7 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public Apache.Geode.Client.IGFSerializable LastValue
+ public Apache.Geode.Client.IGeodeSerializable LastValue
{
get
{
@@ -131,7 +131,7 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public void SetCallBackArg(Apache.Geode.Client.IGFSerializable callbackArg)
+ public void SetCallBackArg(Apache.Geode.Client.IGeodeSerializable callbackArg)
{
m_callbackArg = callbackArg;
}
@@ -145,7 +145,7 @@ namespace Apache.Geode.Client.UnitTests
isListenerInvoke = true;
if (m_callbackArg != null)
{
- Apache.Geode.Client.IGFSerializable callbkArg = (Apache.Geode.Client.IGFSerializable)ev.CallbackArgument;
+ Apache.Geode.Client.IGeodeSerializable callbkArg = (Apache.Geode.Client.IGeodeSerializable)ev.CallbackArgument;
if (m_callbackArg.Equals(callbkArg))
isCallbackCalled = true;
}
@@ -238,7 +238,7 @@ namespace Apache.Geode.Client.UnitTests
{
m_creates++;
m_lastKey = (Apache.Geode.Client.ICacheableKey)ev.Key;
- m_lastValue = (Apache.Geode.Client.IGFSerializable)ev.NewValue;
+ m_lastValue = (Apache.Geode.Client.IGeodeSerializable)ev.NewValue;
CheckcallbackArg(ev);
string keyString = m_lastKey.ToString();
@@ -257,7 +257,7 @@ namespace Apache.Geode.Client.UnitTests
{
m_updates++;
m_lastKey = (Apache.Geode.Client.ICacheableKey)ev.Key;
- m_lastValue = (Apache.Geode.Client.IGFSerializable)ev.NewValue;
+ m_lastValue = (Apache.Geode.Client.IGeodeSerializable)ev.NewValue;
CheckcallbackArg(ev);
string keyString = m_lastKey.ToString();
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/TallyListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyListenerN.cs b/src/clicache/integration-test/TallyListenerN.cs
index 4110b76..3bad24e 100644
--- a/src/clicache/integration-test/TallyListenerN.cs
+++ b/src/clicache/integration-test/TallyListenerN.cs
@@ -152,8 +152,8 @@ namespace Apache.Geode.Client.UnitTests
/*
if (m_callbackArg != null)
{
- IGFSerializable callbkArg1 = ev.CallbackArgument as IGFSerializable;
- IGFSerializable callbkArg2 = m_callbackArg as IGFSerializable;
+ IGeodeSerializable callbkArg1 = ev.CallbackArgument as IGeodeSerializable;
+ IGeodeSerializable callbkArg2 = m_callbackArg as IGeodeSerializable;
if (callbkArg2 != null && callbkArg2.Equals(callbkArg1))
{
isCallbackCalled = true;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/TallyWriter.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyWriter.cs b/src/clicache/integration-test/TallyWriter.cs
index 5e5d407..8ef6db0 100644
--- a/src/clicache/integration-test/TallyWriter.cs
+++ b/src/clicache/integration-test/TallyWriter.cs
@@ -30,10 +30,10 @@ namespace Apache.Geode.Client.UnitTests
private int m_updates = 0;
private int m_invalidates = 0;
private int m_destroys = 0;
- private Apache.Geode.Client.IGFSerializable m_callbackArg = null;
+ private Apache.Geode.Client.IGeodeSerializable m_callbackArg = null;
private int m_clears = 0;
- private Apache.Geode.Client.IGFSerializable m_lastKey = null;
- private Apache.Geode.Client.IGFSerializable m_lastValue = null;
+ private Apache.Geode.Client.IGeodeSerializable m_lastKey = null;
+ private Apache.Geode.Client.IGeodeSerializable m_lastValue = null;
private bool isWriterFailed = false;
private bool isWriterInvoke = false;
private bool isCallbackCalled = false;
@@ -82,7 +82,7 @@ namespace Apache.Geode.Client.UnitTests
}
- public Apache.Geode.Client.IGFSerializable LastKey
+ public Apache.Geode.Client.IGeodeSerializable LastKey
{
get
{
@@ -90,7 +90,7 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public Apache.Geode.Client.IGFSerializable CallbackArgument
+ public Apache.Geode.Client.IGeodeSerializable CallbackArgument
{
get
{
@@ -99,7 +99,7 @@ namespace Apache.Geode.Client.UnitTests
}
- public Apache.Geode.Client.IGFSerializable LastValue
+ public Apache.Geode.Client.IGeodeSerializable LastValue
{
get
{
@@ -112,7 +112,7 @@ namespace Apache.Geode.Client.UnitTests
isWriterFailed = true;
}
- public void SetCallBackArg( Apache.Geode.Client.IGFSerializable callbackArg )
+ public void SetCallBackArg( Apache.Geode.Client.IGeodeSerializable callbackArg )
{
m_callbackArg = callbackArg;
}
@@ -174,7 +174,7 @@ namespace Apache.Geode.Client.UnitTests
isWriterInvoke = true;
if (m_callbackArg != null)
{
- Apache.Geode.Client.IGFSerializable callbkArg = (Apache.Geode.Client.IGFSerializable)ev.CallbackArgument;
+ Apache.Geode.Client.IGeodeSerializable callbkArg = (Apache.Geode.Client.IGeodeSerializable)ev.CallbackArgument;
if (m_callbackArg.Equals(callbkArg))
isCallbackCalled = true;
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/TallyWriterN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyWriterN.cs b/src/clicache/integration-test/TallyWriterN.cs
index 90ade58..1f3aaa2 100644
--- a/src/clicache/integration-test/TallyWriterN.cs
+++ b/src/clicache/integration-test/TallyWriterN.cs
@@ -178,8 +178,8 @@ namespace Apache.Geode.Client.UnitTests
/*
if (m_callbackArg != null)
{
- IGFSerializable callbkArg1 = ev.CallbackArgument as IGFSerializable;
- IGFSerializable callbkArg2 = m_callbackArg as IGFSerializable;
+ IGeodeSerializable callbkArg1 = ev.CallbackArgument as IGeodeSerializable;
+ IGeodeSerializable callbkArg2 = m_callbackArg as IGeodeSerializable;
if (callbkArg1 != null && callbkArg1.Equals(callbkArg2))
{
isCallbackCalled = true;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/ThinClientCqTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCqTestsN.cs b/src/clicache/integration-test/ThinClientCqTestsN.cs
index 3da1feb..6b5cf6e 100644
--- a/src/clicache/integration-test/ThinClientCqTestsN.cs
+++ b/src/clicache/integration-test/ThinClientCqTestsN.cs
@@ -69,7 +69,7 @@ namespace Apache.Geode.Client.UnitTests
else
m_eventCountBefore++;
- //IGFSerializable val = ev.getNewValue();
+ //IGeodeSerializable val = ev.getNewValue();
//ICacheableKey key = ev.getKey();
TResult val = (TResult)ev.getNewValue();
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/ThinClientDeltaTestN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDeltaTestN.cs b/src/clicache/integration-test/ThinClientDeltaTestN.cs
index 6bd4d74..c4530f6 100644
--- a/src/clicache/integration-test/ThinClientDeltaTestN.cs
+++ b/src/clicache/integration-test/ThinClientDeltaTestN.cs
@@ -79,7 +79,7 @@ namespace Apache.Geode.Client.UnitTests
private int m_valueCount;
}
- public class DeltaTestAD : IGFDelta, IGFSerializable
+ public class DeltaTestAD : IGeodeDelta, IGeodeSerializable
{
private int _deltaUpdate;
private string _staticData;
@@ -96,7 +96,7 @@ namespace Apache.Geode.Client.UnitTests
}
- #region IGFDelta Members
+ #region IGeodeDelta Members
public void FromDelta(DataInput input)
{
@@ -118,14 +118,14 @@ namespace Apache.Geode.Client.UnitTests
#endregion
- #region IGFSerializable Members
+ #region IGeodeSerializable Members
public uint ClassId
{
get { return 151; }
}
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
_deltaUpdate = input.ReadInt32();
_staticData = input.ReadUTF();
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/ThinClientPdxTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPdxTests.cs b/src/clicache/integration-test/ThinClientPdxTests.cs
index 0638c40..a186839 100755
--- a/src/clicache/integration-test/ThinClientPdxTests.cs
+++ b/src/clicache/integration-test/ThinClientPdxTests.cs
@@ -1128,7 +1128,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGFSerializable.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable);
Serializable.RegisterPdxType(NestedPdx.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes2.CreateDeserializable);
@@ -1144,10 +1144,10 @@ namespace Apache.Geode.Client.UnitTests
}
Region region0 = CacheHelper.GetVerifyRegion<object, object>(m_regionNames[0]);
- PdxInsideIGFSerializable np = new PdxInsideIGFSerializable();
+ PdxInsideIGeodeSerializable np = new PdxInsideIGeodeSerializable();
region0[1] = np;
- PdxInsideIGFSerializable pRet = (PdxInsideIGFSerializable)region0[1];
+ PdxInsideIGeodeSerializable pRet = (PdxInsideIGeodeSerializable)region0[1];
Assert.AreEqual(np, pRet);
}
@@ -1156,7 +1156,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGFSerializable.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable);
Serializable.RegisterPdxType(NestedPdx.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes2.CreateDeserializable);
@@ -1173,8 +1173,8 @@ namespace Apache.Geode.Client.UnitTests
Region region0 = CacheHelper.GetVerifyRegion<object, object>(m_regionNames[0]);
- PdxInsideIGFSerializable orig = new PdxInsideIGFSerializable();
- PdxInsideIGFSerializable pRet = (PdxInsideIGFSerializable)region0[1];
+ PdxInsideIGeodeSerializable orig = new PdxInsideIGeodeSerializable();
+ PdxInsideIGeodeSerializable pRet = (PdxInsideIGeodeSerializable)region0[1];
Assert.AreEqual(orig, pRet);
}
@@ -1371,7 +1371,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGFSerializable.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable);
Serializable.RegisterPdxType(NestedPdx.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes2.CreateDeserializable);
@@ -1514,7 +1514,7 @@ namespace Apache.Geode.Client.UnitTests
{
try
{
- Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGFSerializable.CreateDeserializable);
+ Serializable.RegisterTypeGeneric(PdxTests.PdxInsideIGeodeSerializable.CreateDeserializable);
Serializable.RegisterPdxType(NestedPdx.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes1.CreateDeserializable);
Serializable.RegisterPdxType(PdxTypes2.CreateDeserializable);
@@ -7165,7 +7165,7 @@ namespace javaobject
{
using Apache.Geode.Client;
#region Pdx Delta class
- public class PdxDelta : IPdxSerializable, IGFDelta, ICloneable
+ public class PdxDelta : IPdxSerializable, IGeodeDelta, ICloneable
{
public static int GotDelta = 0;
int _delta = 0;
@@ -7196,7 +7196,7 @@ namespace javaobject
{
get { return _delta; }
}
- #region IGFDelta Members
+ #region IGeodeDelta Members
public void FromDelta(DataInput input)
{
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/ThinClientQueryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientQueryTestsN.cs b/src/clicache/integration-test/ThinClientQueryTestsN.cs
index b87f89d..c03aa1d 100644
--- a/src/clicache/integration-test/ThinClientQueryTestsN.cs
+++ b/src/clicache/integration-test/ThinClientQueryTestsN.cs
@@ -1471,9 +1471,9 @@ namespace Apache.Geode.Client.UnitTests
// if (map1.Count != map2.Count)
// Assert.Fail("Number of Keys dont match");
// if (map1.Count == 0) return;
- // foreach (KeyValuePair<ICacheableKey, IGFSerializable> entry in map1)
+ // foreach (KeyValuePair<ICacheableKey, IGeodeSerializable> entry in map1)
// {
- // IGFSerializable value;
+ // IGeodeSerializable value;
// if (!(map2.TryGetValue(entry.Key,out value)))
// {
// Assert.Fail("Key was not found");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/ThinClientRegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionTestsN.cs b/src/clicache/integration-test/ThinClientRegionTestsN.cs
index 0a0e620..2e974a6 100644
--- a/src/clicache/integration-test/ThinClientRegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionTestsN.cs
@@ -241,7 +241,7 @@ namespace Apache.Geode.Client.UnitTests
m_accountid = accId;
}
- public IGFSerializable FromData(DataInput input)
+ public IGeodeSerializable FromData(DataInput input)
{
m_id = input.ReadInt32();
m_accountid = input.ReadInt32();
@@ -273,7 +273,7 @@ namespace Apache.Geode.Client.UnitTests
}
}
- public static IGFSerializable CreateDeserializable()
+ public static IGeodeSerializable CreateDeserializable()
{
return new TradeKey();
}
@@ -908,7 +908,7 @@ namespace Apache.Geode.Client.UnitTests
// else {
// region0 = CacheHelper.CreateTCRegion(RegionNames[0], true, true, null, endpoints, true); //caching enable true
// }
- // Dictionary<ICacheableKey, IGFSerializable> values = new Dictionary<ICacheableKey, IGFSerializable>();
+ // Dictionary<ICacheableKey, IGeodeSerializable> values = new Dictionary<ICacheableKey, IGeodeSerializable>();
// Dictionary<ICacheableKey, Exception> exceptions = new Dictionary<ICacheableKey, Exception>();
// resultKeys.Clear();
// try {
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientStringArrayTestsN.cs b/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
index 9b83dd4..1050b6b 100644
--- a/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
+++ b/src/clicache/integration-test/ThinClientStringArrayTestsN.cs
@@ -161,7 +161,7 @@ namespace Apache.Geode.Client.UnitTests
while (iter.HasNext)
{
- /*IGFSerializable*/ object item = iter.Next();
+ /*IGeodeSerializable*/ object item = iter.Next();
Portfolio port = item as Portfolio;
if (port == null)
{
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/AttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.cpp b/src/clicache/src/AttributesFactory.cpp
index 23cb9ad..a603be1 100644
--- a/src/clicache/src/AttributesFactory.cpp
+++ b/src/clicache/src/AttributesFactory.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "AttributesFactory.hpp"
#include "Region.hpp"
#include "impl/ManagedCacheLoader.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/AttributesFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.hpp b/src/clicache/src/AttributesFactory.hpp
index 8f7313c..f9901c8 100644
--- a/src/clicache/src/AttributesFactory.hpp
+++ b/src/clicache/src/AttributesFactory.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include <geode/AttributesFactory.hpp>
//#include "impl/NativeWrapper.hpp"
#include "ExpirationAction.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/AttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.cpp b/src/clicache/src/AttributesMutator.cpp
index 14c48f2..73f6ca6 100644
--- a/src/clicache/src/AttributesMutator.cpp
+++ b/src/clicache/src/AttributesMutator.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "AttributesMutator.hpp"
//#include "Region.hpp"
#include "impl/ManagedCacheListener.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/AttributesMutator.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesMutator.hpp b/src/clicache/src/AttributesMutator.hpp
index a44664d..73af10e 100644
--- a/src/clicache/src/AttributesMutator.hpp
+++ b/src/clicache/src/AttributesMutator.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include <geode/AttributesMutator.hpp>
//#include "impl/NativeWrapper.hpp"
#include "ExpirationAction.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/Cache.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.cpp b/src/clicache/src/Cache.cpp
index 160bbbd..106f1e5 100644
--- a/src/clicache/src/Cache.cpp
+++ b/src/clicache/src/Cache.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "Cache.hpp"
#include "ExceptionTypes.hpp"
#include "DistributedSystem.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/Cache.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Cache.hpp b/src/clicache/src/Cache.hpp
index 1ad3178..67bd11c 100644
--- a/src/clicache/src/Cache.hpp
+++ b/src/clicache/src/Cache.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
//#include <geode/Cache.hpp>
//#include "impl/NativeWrapper.hpp"
#include "RegionShortcut.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheFactory.cpp b/src/clicache/src/CacheFactory.cpp
index 6cd7c68..7c84ac1 100644
--- a/src/clicache/src/CacheFactory.cpp
+++ b/src/clicache/src/CacheFactory.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "ExceptionTypes.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheFactory.hpp b/src/clicache/src/CacheFactory.hpp
index 01b1314..acaca31 100644
--- a/src/clicache/src/CacheFactory.hpp
+++ b/src/clicache/src/CacheFactory.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include "impl/NativeWrapper.hpp"
#include <geode/CacheFactory.hpp>
#include "Properties.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheListenerAdapter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheListenerAdapter.hpp b/src/clicache/src/CacheListenerAdapter.hpp
index 146c6fd..aaf3212 100644
--- a/src/clicache/src/CacheListenerAdapter.hpp
+++ b/src/clicache/src/CacheListenerAdapter.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include "ICacheListener.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheStatistics.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheStatistics.cpp b/src/clicache/src/CacheStatistics.cpp
index 326ffec..149467a 100644
--- a/src/clicache/src/CacheStatistics.cpp
+++ b/src/clicache/src/CacheStatistics.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "CacheStatistics.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheStatistics.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheStatistics.hpp b/src/clicache/src/CacheStatistics.hpp
index 930a982..6405411 100644
--- a/src/clicache/src/CacheStatistics.hpp
+++ b/src/clicache/src/CacheStatistics.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include <geode/CacheStatistics.hpp>
#include "impl/NativeWrapper.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheTransactionManager.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.cpp b/src/clicache/src/CacheTransactionManager.cpp
index 6d15b38..54a6e4a 100644
--- a/src/clicache/src/CacheTransactionManager.cpp
+++ b/src/clicache/src/CacheTransactionManager.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "impl/SafeConvert.hpp"
#include "impl/ManagedTransactionListener.hpp"
#include "impl/ManagedTransactionWriter.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheTransactionManager.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheTransactionManager.hpp b/src/clicache/src/CacheTransactionManager.hpp
index ede5c5b..92b4ef2 100644
--- a/src/clicache/src/CacheTransactionManager.hpp
+++ b/src/clicache/src/CacheTransactionManager.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include <geode/CacheTransactionManager.hpp>
#include <geode/InternalCacheTransactionManager2PC.hpp>
#include "TransactionId.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheWriterAdapter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheWriterAdapter.hpp b/src/clicache/src/CacheWriterAdapter.hpp
index 3731f9e..47cb717 100644
--- a/src/clicache/src/CacheWriterAdapter.hpp
+++ b/src/clicache/src/CacheWriterAdapter.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include "ICacheWriter.hpp"
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableArrayList.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableArrayList.hpp b/src/clicache/src/CacheableArrayList.hpp
index 31336f2..06ba735 100644
--- a/src/clicache/src/CacheableArrayList.hpp
+++ b/src/clicache/src/CacheableArrayList.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include "CacheableVector.hpp"
@@ -32,7 +32,7 @@ namespace Apache
{
/// <summary>
- /// A mutable <c>IGFSerializable</c> vector wrapper that can serve as
+ /// A mutable <c>IGeodeSerializable</c> vector wrapper that can serve as
/// a distributable object for caching. This class extends .NET generic
/// <c>List</c> class.
/// </summary>
@@ -65,7 +65,7 @@ namespace Apache
}
- // Region: IGFSerializable Members
+ // Region: IGeodeSerializable Members
/// <summary>
/// Returns the classId of the instance being serialized.
@@ -81,12 +81,12 @@ namespace Apache
}
}
- // End Region: IGFSerializable Members
+ // End Region: IGeodeSerializable Members
/// <summary>
/// Factory function to register this class.
/// </summary>
- static IGFSerializable^ CreateDeserializable()
+ static IGeodeSerializable^ CreateDeserializable()
{
return gcnew CacheableArrayList(gcnew System::Collections::Generic::List<Object^>());
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableBuiltins.hpp b/src/clicache/src/CacheableBuiltins.hpp
index c5f430a..be30c3b 100644
--- a/src/clicache/src/CacheableBuiltins.hpp
+++ b/src/clicache/src/CacheableBuiltins.hpp
@@ -19,7 +19,7 @@
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include <geode/CacheableBuiltins.hpp>
#include "CacheableKey.hpp"
#include "Serializable.hpp"
@@ -185,7 +185,7 @@ namespace Apache
output->WriteObject(m_value);
}
- virtual IGFSerializable^ FromData(DataInput^ input) override
+ virtual IGeodeSerializable^ FromData(DataInput^ input) override
{
input->ReadObject(m_value);
return this;
@@ -358,13 +358,13 @@ namespace Apache
* Factory function to register this class.
* </summary>
*/ \
- static IGFSerializable^ CreateDeserializable() \
+ static IGeodeSerializable^ CreateDeserializable() \
{ \
return gcnew m(); \
} \
\
internal: \
- static IGFSerializable^ Create(apache::geode::client::Serializable* obj) \
+ static IGeodeSerializable^ Create(apache::geode::client::Serializable* obj) \
{ \
return (obj != nullptr ? gcnew m(obj) : nullptr); \
} \
@@ -421,13 +421,13 @@ namespace Apache
* Factory function to register this class.
* </summary>
*/ \
- static IGFSerializable^ CreateDeserializable() \
+ static IGeodeSerializable^ CreateDeserializable() \
{ \
return gcnew m(); \
} \
\
internal: \
- static IGFSerializable^ Create(apache::geode::client::Serializable* obj) \
+ static IGeodeSerializable^ Create(apache::geode::client::Serializable* obj) \
{ \
return (obj != nullptr ? gcnew m(obj) : nullptr); \
} \
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableDate.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.cpp b/src/clicache/src/CacheableDate.cpp
index 8e48ea0..2a55557 100644
--- a/src/clicache/src/CacheableDate.cpp
+++ b/src/clicache/src/CacheableDate.cpp
@@ -18,7 +18,7 @@
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "CacheableDate.hpp"
#include "DataInput.hpp"
#include "DataOutput.hpp"
@@ -57,7 +57,7 @@ namespace Apache
//Log::Fine("CacheableDate::Todata time " + m_dateTime.Ticks);
}
- IGFSerializable^ CacheableDate::FromData(DataInput^ input)
+ IGeodeSerializable^ CacheableDate::FromData(DataInput^ input)
{
DateTime epochTime = EpochTime;
int64_t millisSinceEpoch = input->ReadInt64();
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableDate.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableDate.hpp b/src/clicache/src/CacheableDate.hpp
index 25b5a45..ab0bee6 100644
--- a/src/clicache/src/CacheableDate.hpp
+++ b/src/clicache/src/CacheableDate.hpp
@@ -19,7 +19,7 @@
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include "ICacheableKey.hpp"
@@ -72,7 +72,7 @@ namespace Apache
return gcnew CacheableDate(dateTime);
}
- // Region: IGFSerializable Members
+ // Region: IGeodeSerializable Members
/// <summary>
/// Serializes this object.
@@ -90,7 +90,7 @@ namespace Apache
/// the DataInput stream to use for reading the object data
/// </param>
/// <returns>the deserialized object</returns>
- virtual IGFSerializable^ FromData(DataInput^ input);
+ virtual IGeodeSerializable^ FromData(DataInput^ input);
/// <summary>
/// return the size of this object in bytes
@@ -119,7 +119,7 @@ namespace Apache
/// </summary>
virtual String^ ToString() override;
- // End Region: IGFSerializable Members
+ // End Region: IGeodeSerializable Members
// Region: ICacheableKey Members
@@ -161,7 +161,7 @@ namespace Apache
/// <summary>
/// Factory function to register this class.
/// </summary>
- static IGFSerializable^ CreateDeserializable()
+ static IGeodeSerializable^ CreateDeserializable()
{
return gcnew CacheableDate();
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableFileName.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableFileName.cpp b/src/clicache/src/CacheableFileName.cpp
index f17ae53..3fad6d4 100644
--- a/src/clicache/src/CacheableFileName.cpp
+++ b/src/clicache/src/CacheableFileName.cpp
@@ -18,7 +18,7 @@
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "CacheableFileName.hpp"
#include "DataOutput.hpp"
#include "DataInput.hpp"
@@ -44,7 +44,7 @@ namespace Apache
}
}
- IGFSerializable^ CacheableFileName::FromData(DataInput^ input)
+ IGeodeSerializable^ CacheableFileName::FromData(DataInput^ input)
{
unsigned char filetype = input->ReadByte();
if (filetype == apache::geode::client::GeodeTypeIds::CacheableString) {
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableFileName.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableFileName.hpp b/src/clicache/src/CacheableFileName.hpp
index bcdaa93..298dfc0 100644
--- a/src/clicache/src/CacheableFileName.hpp
+++ b/src/clicache/src/CacheableFileName.hpp
@@ -19,7 +19,7 @@
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include "ICacheableKey.hpp"
@@ -59,7 +59,7 @@ namespace Apache
gcnew CacheableFileName(value) : nullptr);
}
- // Region: IGFSerializable Members
+ // Region: IGeodeSerializable Members
/// <summary>
/// Serializes this object.
@@ -77,7 +77,7 @@ namespace Apache
/// the DataInput stream to use for reading the object data
/// </param>
/// <returns>the deserialized object</returns>
- virtual IGFSerializable^ FromData(DataInput^ input);
+ virtual IGeodeSerializable^ FromData(DataInput^ input);
/// <summary>
/// return the size of this object in bytes
@@ -107,7 +107,7 @@ namespace Apache
return m_str;
}
- // End Region: IGFSerializable Members
+ // End Region: IGeodeSerializable Members
// Region: ICacheableKey Members
@@ -143,7 +143,7 @@ namespace Apache
/// <summary>
/// Factory function to register this class.
/// </summary>
- static IGFSerializable^ CreateDeserializable()
+ static IGeodeSerializable^ CreateDeserializable()
{
return gcnew CacheableFileName((String^)nullptr);
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableHashMap.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashMap.cpp b/src/clicache/src/CacheableHashMap.cpp
index 8dea0f4..28f2ec5 100644
--- a/src/clicache/src/CacheableHashMap.cpp
+++ b/src/clicache/src/CacheableHashMap.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-//#include "gf_includes.hpp"
+//#include "geode_includes.hpp"
#include "CacheableHashMap.hpp"
#include "DataOutput.hpp"
#include "DataInput.hpp"
@@ -31,14 +31,14 @@ namespace Apache
namespace Client
{
- // Region: IGFSerializable Members
+ // Region: IGeodeSerializable Members
void Client::CacheableHashMap::ToData(DataOutput^ output)
{
output->WriteDictionary((System::Collections::IDictionary^)m_dictionary);
}
- IGFSerializable^ Client::CacheableHashMap::FromData(DataInput^ input)
+ IGeodeSerializable^ Client::CacheableHashMap::FromData(DataInput^ input)
{
m_dictionary = input->ReadDictionary();
return this;
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableHashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashMap.hpp b/src/clicache/src/CacheableHashMap.hpp
index d012a06..4b94cb8 100644
--- a/src/clicache/src/CacheableHashMap.hpp
+++ b/src/clicache/src/CacheableHashMap.hpp
@@ -17,8 +17,8 @@
#pragma once
-#include "gf_defs.hpp"
-#include "IGFSerializable.hpp"
+#include "geode_defs.hpp"
+#include "IGeodeSerializable.hpp"
#include "ICacheableKey.hpp"
#include "GeodeClassIds.hpp"
@@ -35,12 +35,12 @@ namespace Apache
{
/// <summary>
- /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash map
+ /// A mutable <c>ICacheableKey</c> to <c>IGeodeSerializable</c> hash map
/// that can serve as a distributable object for caching. This class
/// extends .NET generic <c>Dictionary</c> class.
/// </summary>
ref class CacheableHashMap
- : public IGFSerializable
+ : public IGeodeSerializable
{
protected:
Object^ m_dictionary;
@@ -81,7 +81,7 @@ namespace Apache
}
- // Region: IGFSerializable Members
+ // Region: IGeodeSerializable Members
/// <summary>
/// Serializes this object.
@@ -99,7 +99,7 @@ namespace Apache
/// the DataInput stream to use for reading the object data
/// </param>
/// <returns>the deserialized object</returns>
- virtual IGFSerializable^ FromData(DataInput^ input);
+ virtual IGeodeSerializable^ FromData(DataInput^ input);
/// <summary>
/// return the size of this object in bytes
@@ -131,12 +131,12 @@ namespace Apache
}
}
- // End Region: IGFSerializable Members
+ // End Region: IGeodeSerializable Members
/// <summary>
/// Factory function to register this class.
/// </summary>
- static IGFSerializable^ CreateDeserializable()
+ static IGeodeSerializable^ CreateDeserializable()
{
return gcnew CacheableHashMap();
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableHashSet.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashSet.hpp b/src/clicache/src/CacheableHashSet.hpp
index 9115fef..c6e2d60 100644
--- a/src/clicache/src/CacheableHashSet.hpp
+++ b/src/clicache/src/CacheableHashSet.hpp
@@ -19,7 +19,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include <geode/CacheableBuiltins.hpp>
#include "Serializable.hpp"
#include "ExceptionTypes.hpp"
@@ -63,7 +63,7 @@ namespace Apache
}
}
- virtual IGFSerializable^ FromData(DataInput^ input) override
+ virtual IGeodeSerializable^ FromData(DataInput^ input) override
{
int len = input->ReadArrayLen();
if (len > 0)
@@ -476,7 +476,7 @@ namespace Apache
/// <summary>
/// Factory function to register wrapper
/// </summary>
- static IGFSerializable^ Create(apache::geode::client::Serializable* obj)
+ static IGeodeSerializable^ Create(apache::geode::client::Serializable* obj)
{
return (obj != NULL ?
gcnew CacheableHashSetType<TYPEID, HSTYPE>(obj) : nullptr);
@@ -566,13 +566,13 @@ namespace Apache
* Factory function to register this class.
* </summary>
*/ \
- static IGFSerializable^ CreateDeserializable() \
+ static IGeodeSerializable^ CreateDeserializable() \
{ \
return gcnew m(); \
} \
\
internal: \
- static IGFSerializable^ Create(apache::geode::client::Serializable* obj) \
+ static IGeodeSerializable^ Create(apache::geode::client::Serializable* obj) \
{ \
return gcnew m(obj); \
} \
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableHashTable.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableHashTable.hpp b/src/clicache/src/CacheableHashTable.hpp
index 3e66bed..30812bd 100644
--- a/src/clicache/src/CacheableHashTable.hpp
+++ b/src/clicache/src/CacheableHashTable.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include "CacheableHashMap.hpp"
#include "DataInput.hpp"
@@ -33,7 +33,7 @@ namespace Apache
{
/// <summary>
- /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash table
+ /// A mutable <c>ICacheableKey</c> to <c>IGeodeSerializable</c> hash table
/// that can serve as a distributable object for caching. This class
/// extends .NET generic <c>Dictionary</c> class.
/// </summary>
@@ -70,7 +70,7 @@ namespace Apache
{ }
- // Region: IGFSerializable Members
+ // Region: IGeodeSerializable Members
/// <summary>
/// Returns the classId of the instance being serialized.
@@ -86,17 +86,17 @@ namespace Apache
}
}
- // End Region: IGFSerializable Members
+ // End Region: IGeodeSerializable Members
/// <summary>
/// Factory function to register this class.
/// </summary>
- static IGFSerializable^ CreateDeserializable()
+ static IGeodeSerializable^ CreateDeserializable()
{
return gcnew CacheableHashTable();
}
- virtual IGFSerializable^ FromData(DataInput^ input) override
+ virtual IGeodeSerializable^ FromData(DataInput^ input) override
{
m_dictionary = input->ReadHashtable();
return this;
@@ -106,7 +106,7 @@ namespace Apache
/// <summary>
/// Factory function to register this class.
/// </summary>
- static IGFSerializable^ Create(Object^ hashtable)
+ static IGeodeSerializable^ Create(Object^ hashtable)
{
return gcnew CacheableHashTable(hashtable);
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/46f71fde/src/clicache/src/CacheableIdentityHashMap.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheableIdentityHashMap.hpp b/src/clicache/src/CacheableIdentityHashMap.hpp
index fbcc900..6d42e1e 100644
--- a/src/clicache/src/CacheableIdentityHashMap.hpp
+++ b/src/clicache/src/CacheableIdentityHashMap.hpp
@@ -17,7 +17,7 @@
#pragma once
-#include "gf_defs.hpp"
+#include "geode_defs.hpp"
#include "CacheableHashMap.hpp"
@@ -32,7 +32,7 @@ namespace Apache
{
/// <summary>
- /// A mutable <c>ICacheableKey</c> to <c>IGFSerializable</c> hash map
+ /// A mutable <c>ICacheableKey</c> to <c>IGeodeSerializable</c> hash map
/// that can serve as a distributable object for caching. This class
/// extends .NET generic <c>Dictionary</c> class. This class is meant
/// as a means to interoperate with java server side
@@ -96,7 +96,7 @@ namespace Apache
return gcnew CacheableIdentityHashMap(capacity);
}
- // Region: IGFSerializable Members
+ // Region: IGeodeSerializable Members
/// <summary>
/// Returns the classId of the instance being serialized.
@@ -112,12 +112,12 @@ namespace Apache
}
}
- // End Region: IGFSerializable Members
+ // End Region: IGeodeSerializable Members
/// <summary>
/// Factory function to register this class.
/// </summary>
- static IGFSerializable^ CreateDeserializable()
+ static IGeodeSerializable^ CreateDeserializable()
{
return gcnew CacheableIdentityHashMap();
}