GEODE-2316: Renamed namespace GemStone.GemFire.Cache -> Apache.Geode.Client

- GemStone.GemFire.Cache -> Apache.Geode.Client
- GemStone.GemFire -> Apache.Geode


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c5454e83
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c5454e83
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c5454e83

Branch: refs/heads/next-gen-native-client-software-grant
Commit: c5454e837cd9730654caf31868df80e0137967d4
Parents: 69c3ac3
Author: Jacob Barrett <jbarr...@pivotal.io>
Authored: Fri Jan 20 05:32:56 2017 +0000
Committer: Jacob Barrett <jbarr...@pivotal.io>
Committed: Mon Jan 23 11:15:38 2017 -0800

----------------------------------------------------------------------
 examples/clicache/CacheRunner/ComplexNumber.cs  |  12 +-
 src/clicache/include/gfcli/Utils.hpp            |  10 +-
 src/clicache/integration-test/AckMixTests.cs    |   4 +-
 .../integration-test/AttributesFactoryTestsN.cs |  10 +-
 .../integration-test/AttributesMutatorTestsN.cs |  10 +-
 .../BuiltinCacheableWrappersN.cs                |   6 +-
 src/clicache/integration-test/CMakeLists.txt    |   4 +-
 src/clicache/integration-test/CacheHelperN.cs   |  12 +-
 .../integration-test/CacheServerMsgs.cs         |   4 +-
 .../integration-test/CacheableWrapper.cs        |   2 +-
 .../integration-test/CacheableWrapperN.cs       |   4 +-
 .../integration-test/CachelessTestsN.cs         |   6 +-
 src/clicache/integration-test/DataIOTests.cs    |   4 +-
 .../integration-test/DataOutputTests.cs         |   6 +-
 .../integration-test/DefaultCacheable.cs        |  98 +++---
 .../integration-test/DefaultCacheableN.cs       |   4 +-
 src/clicache/integration-test/DistGetTests.cs   |   4 +-
 src/clicache/integration-test/DistOpsStepsN.cs  |  26 +-
 src/clicache/integration-test/DistOpsTests.cs   |   4 +-
 .../integration-test/DistributedSystemTests.cs  |   4 +-
 src/clicache/integration-test/DupListenerN.cs   |   8 +-
 .../integration-test/DurableListenerN.cs        |   8 +-
 .../integration-test/ExpirationTestsN.cs        |   6 +-
 src/clicache/integration-test/LogTests.cs       |   4 +-
 src/clicache/integration-test/NetTests.cs       |   4 +-
 src/clicache/integration-test/OverflowTestsN.cs |  30 +-
 .../integration-test/PutGetPerfTests.cs         |   4 +-
 src/clicache/integration-test/PutGetTestsN.cs   |  12 +-
 .../integration-test/RegionEntryTests.cs        |   4 +-
 .../integration-test/RegionOperationN.cs        |   8 +-
 src/clicache/integration-test/RegionWrapperN.cs |   8 +-
 .../integration-test/SecurityTestUtilN.cs       |  10 +-
 .../integration-test/SerializationTestsN.cs     |   6 +-
 .../integration-test/SystemPropertiesTestsN.cs  |   6 +-
 src/clicache/integration-test/TallyListener.cs  |  48 +--
 src/clicache/integration-test/TallyListenerN.cs |   8 +-
 src/clicache/integration-test/TallyLoaderN.cs   |   8 +-
 src/clicache/integration-test/TallyResolverN.cs |   8 +-
 src/clicache/integration-test/TallyWriter.cs    |  32 +-
 src/clicache/integration-test/TallyWriterN.cs   |   6 +-
 .../ThinClientAppDomainQueryTests.cs            |  20 +-
 .../integration-test/ThinClientCSTXN.cs         |  12 +-
 .../integration-test/ThinClientCallbackArgN.cs  |  10 +-
 .../ThinClientConflationTestsN.cs               |   8 +-
 .../integration-test/ThinClientCqIRTestsN.cs    |  10 +-
 .../integration-test/ThinClientCqTestsN.cs      |  10 +-
 .../integration-test/ThinClientDeltaTestN.cs    |  12 +-
 .../integration-test/ThinClientDocExamplesN.cs  |  18 +-
 .../ThinClientDurableCqTestsN.cs                |   8 +-
 .../integration-test/ThinClientDurableTestsN.cs |   8 +-
 .../ThinClientFunctionExecutionTestsN.cs        |  26 +-
 .../ThinClientHARegionTestsN.cs                 |  10 +-
 .../ThinClientListenerWriterN.cs                |  10 +-
 .../integration-test/ThinClientPdxTests.cs      |  16 +-
 .../integration-test/ThinClientPoolTestsN.cs    |   8 +-
 .../integration-test/ThinClientQueryTestsN.cs   |  20 +-
 .../ThinClientRegionInterestTestsN.cs           |   6 +-
 .../integration-test/ThinClientRegionStepsN.cs  |   8 +-
 .../integration-test/ThinClientRegionTestsN.cs  |   8 +-
 .../ThinClientSecurityAuthTestsMUN.cs           |  12 +-
 .../ThinClientSecurityAuthTestsN.cs             |  12 +-
 .../ThinClientSecurityAuthzTestBaseN.cs         |  14 +-
 .../ThinClientSecurityAuthzTestsMUN.cs          |   8 +-
 .../ThinClientSecurityAuthzTestsN.cs            |   8 +-
 .../ThinClientStatisticTestsN.cs                |   6 +-
 .../ThinClientStringArrayTestsN.cs              |  10 +-
 .../integration-test/UnitTests.csproj.in        |   2 +-
 src/clicache/integration-test/UnitTestsN.cs     |   8 +-
 .../client_generics_plugins.xml                 |  16 +-
 .../integration-test/valid_overflowAttr.xml     |   6 +-
 src/clicache/src/AttributesFactory.cpp          |  14 +-
 src/clicache/src/AttributesFactory.hpp          |  10 +-
 src/clicache/src/AttributesMutator.cpp          |   8 +-
 src/clicache/src/AttributesMutator.hpp          |   8 +-
 src/clicache/src/CMakeLists.txt                 |   3 +-
 src/clicache/src/Cache.cpp                      |  24 +-
 src/clicache/src/Cache.hpp                      |  16 +-
 src/clicache/src/CacheFactory.cpp               |  14 +-
 src/clicache/src/CacheFactory.hpp               |   8 +-
 src/clicache/src/CacheListenerAdapter.hpp       |  12 +-
 src/clicache/src/CacheStatistics.cpp            |   8 +-
 src/clicache/src/CacheStatistics.hpp            |   8 +-
 src/clicache/src/CacheTransactionManager.cpp    |  27 +-
 src/clicache/src/CacheTransactionManager.hpp    |  25 +-
 src/clicache/src/CacheWriterAdapter.hpp         |   8 +-
 src/clicache/src/CacheableArrayList.hpp         |   8 +-
 src/clicache/src/CacheableBuiltins.hpp          |   8 +-
 src/clicache/src/CacheableDate.cpp              |   8 +-
 src/clicache/src/CacheableDate.hpp              |   8 +-
 src/clicache/src/CacheableFileName.cpp          |   8 +-
 src/clicache/src/CacheableFileName.hpp          |   8 +-
 src/clicache/src/CacheableHashMap.cpp           |   8 +-
 src/clicache/src/CacheableHashMap.hpp           |   8 +-
 src/clicache/src/CacheableHashSet.hpp           |  16 +-
 src/clicache/src/CacheableHashTable.hpp         |   8 +-
 src/clicache/src/CacheableIdentityHashMap.hpp   |   8 +-
 src/clicache/src/CacheableKey.cpp               |   8 +-
 src/clicache/src/CacheableKey.hpp               |   8 +-
 src/clicache/src/CacheableLinkedList.hpp        |   8 +-
 src/clicache/src/CacheableObject.cpp            |   8 +-
 src/clicache/src/CacheableObject.hpp            |   8 +-
 src/clicache/src/CacheableObjectArray.cpp       |   8 +-
 src/clicache/src/CacheableObjectArray.hpp       |   8 +-
 src/clicache/src/CacheableObjectXml.cpp         |   8 +-
 src/clicache/src/CacheableObjectXml.hpp         |   8 +-
 src/clicache/src/CacheableStack.cpp             |   8 +-
 src/clicache/src/CacheableStack.hpp             |   8 +-
 src/clicache/src/CacheableString.cpp            |  10 +-
 src/clicache/src/CacheableString.hpp            |  10 +-
 src/clicache/src/CacheableStringArray.cpp       |   8 +-
 src/clicache/src/CacheableStringArray.hpp       |   8 +-
 src/clicache/src/CacheableUndefined.cpp         |   8 +-
 src/clicache/src/CacheableUndefined.hpp         |   8 +-
 src/clicache/src/CacheableVector.cpp            |   8 +-
 src/clicache/src/CacheableVector.hpp            |   8 +-
 src/clicache/src/CqAttributes.cpp               |   8 +-
 src/clicache/src/CqAttributes.hpp               |   8 +-
 src/clicache/src/CqAttributesFactory.cpp        |   8 +-
 src/clicache/src/CqAttributesFactory.hpp        |   8 +-
 src/clicache/src/CqAttributesMutator.cpp        |   8 +-
 src/clicache/src/CqAttributesMutator.hpp        |   8 +-
 src/clicache/src/CqEvent.cpp                    |   8 +-
 src/clicache/src/CqEvent.hpp                    |   9 +-
 src/clicache/src/CqListener.hpp                 |   8 +-
 src/clicache/src/CqOperation.hpp                |   8 +-
 src/clicache/src/CqQuery.cpp                    |   8 +-
 src/clicache/src/CqQuery.hpp                    |   8 +-
 src/clicache/src/CqServiceStatistics.cpp        |   8 +-
 src/clicache/src/CqServiceStatistics.hpp        |   8 +-
 src/clicache/src/CqState.cpp                    |   8 +-
 src/clicache/src/CqState.hpp                    |   8 +-
 src/clicache/src/CqStatistics.cpp               |   8 +-
 src/clicache/src/CqStatistics.hpp               |   8 +-
 src/clicache/src/DataInput.cpp                  |   8 +-
 src/clicache/src/DataInput.hpp                  |   8 +-
 src/clicache/src/DataOutput.cpp                 |  12 +-
 src/clicache/src/DataOutput.hpp                 |   8 +-
 src/clicache/src/DiskPolicyType.hpp             |   8 +-
 src/clicache/src/DistributedSystem.cpp          | 106 +++---
 src/clicache/src/DistributedSystem.hpp          |  12 +-
 src/clicache/src/EntryEvent.cpp                 |   8 +-
 src/clicache/src/EntryEvent.hpp                 |   9 +-
 src/clicache/src/ExceptionTypes.cpp             |   8 +-
 src/clicache/src/ExceptionTypes.hpp             |  10 +-
 src/clicache/src/Execution.cpp                  |   8 +-
 src/clicache/src/Execution.hpp                  |   9 +-
 src/clicache/src/ExpirationAction.hpp           |   8 +-
 src/clicache/src/FunctionService.cpp            |  24 +-
 src/clicache/src/FunctionService.hpp            |   8 +-
 src/clicache/src/GemFireClassIds.hpp            |   8 +-
 src/clicache/src/IAuthInitialize.hpp            |  10 +-
 src/clicache/src/ICacheListener.hpp             |   8 +-
 src/clicache/src/ICacheLoader.hpp               |   9 +-
 src/clicache/src/ICacheWriter.hpp               |   8 +-
 src/clicache/src/ICacheableKey.hpp              |   8 +-
 src/clicache/src/ICqAttributes.hpp              |   8 +-
 src/clicache/src/ICqEvent.hpp                   |   9 +-
 src/clicache/src/ICqListener.hpp                |   8 +-
 src/clicache/src/ICqResults.hpp                 |   8 +-
 src/clicache/src/ICqStatusListener.hpp          |  10 +-
 src/clicache/src/IFixedPartitionResolver.hpp    |   9 +-
 src/clicache/src/IGFDelta.hpp                   |   8 +-
 src/clicache/src/IGFSerializable.hpp            |   8 +-
 src/clicache/src/IGemFireCache.hpp              |  14 +-
 src/clicache/src/IPartitionResolver.hpp         |   9 +-
 src/clicache/src/IPdxInstance.hpp               |   8 +-
 src/clicache/src/IPdxInstanceFactory.hpp        |   8 +-
 src/clicache/src/IPdxReader.hpp                 |   8 +-
 src/clicache/src/IPdxSerializable.hpp           |   8 +-
 src/clicache/src/IPdxSerializer.hpp             |   8 +-
 src/clicache/src/IPdxTypeMapper.hpp             |   8 +-
 src/clicache/src/IPdxUnreadFields.hpp           |   8 +-
 src/clicache/src/IPdxWriter.hpp                 |   8 +-
 src/clicache/src/IPersistenceManager.hpp        |  10 +-
 src/clicache/src/IRegion.hpp                    |  21 +-
 src/clicache/src/IRegionService.hpp             |   8 +-
 src/clicache/src/IResultCollector.hpp           |  10 +-
 src/clicache/src/ISelectResults.hpp             |  14 +-
 src/clicache/src/ISubscriptionService.hpp       |   8 +-
 src/clicache/src/ITransactionListener.hpp       |   8 +-
 src/clicache/src/ITransactionWriter.hpp         |  10 +-
 src/clicache/src/IWritablePdxInstance.hpp       |   8 +-
 src/clicache/src/LocalRegion.cpp                |  24 +-
 src/clicache/src/LocalRegion.hpp                |  18 +-
 src/clicache/src/Log.cpp                        |   8 +-
 src/clicache/src/Log.hpp                        |   8 +-
 src/clicache/src/PdxIdentityFieldAttribute.hpp  |   8 +-
 src/clicache/src/Pool.cpp                       |   8 +-
 src/clicache/src/Pool.hpp                       |  10 +-
 src/clicache/src/PoolFactory.cpp                |   8 +-
 src/clicache/src/PoolFactory.hpp                |   8 +-
 src/clicache/src/PoolManager.cpp                |   8 +-
 src/clicache/src/PoolManager.hpp                |   8 +-
 src/clicache/src/Properties.cpp                 |  18 +-
 src/clicache/src/Properties.hpp                 |  20 +-
 src/clicache/src/Query.cpp                      |   8 +-
 src/clicache/src/Query.hpp                      |   8 +-
 src/clicache/src/QueryService.cpp               |   8 +-
 src/clicache/src/QueryService.hpp               |  12 +-
 .../src/ReflectionBasedAutoSerializer.cpp       |  12 +-
 .../src/ReflectionBasedAutoSerializer.hpp       |   8 +-
 src/clicache/src/Region.cpp                     |  26 +-
 src/clicache/src/Region.hpp                     |  19 +-
 src/clicache/src/RegionAttributes.cpp           |  20 +-
 src/clicache/src/RegionAttributes.hpp           |  15 +-
 src/clicache/src/RegionEntry.cpp                |  14 +-
 src/clicache/src/RegionEntry.hpp                |  13 +-
 src/clicache/src/RegionEvent.cpp                |   8 +-
 src/clicache/src/RegionEvent.hpp                |  12 +-
 src/clicache/src/RegionFactory.cpp              |   8 +-
 src/clicache/src/RegionFactory.hpp              |   8 +-
 src/clicache/src/RegionShortcut.hpp             |   8 +-
 src/clicache/src/ResultCollector.cpp            |   8 +-
 src/clicache/src/ResultCollector.hpp            |   8 +-
 src/clicache/src/ResultSet.cpp                  |   8 +-
 src/clicache/src/ResultSet.hpp                  |  10 +-
 src/clicache/src/SelectResultsIterator.cpp      |  12 +-
 src/clicache/src/SelectResultsIterator.hpp      |  21 +-
 src/clicache/src/Serializable.cpp               | 274 +++++++--------
 src/clicache/src/Serializable.hpp               |  70 ++--
 src/clicache/src/StatisticDescriptor.cpp        |   8 +-
 src/clicache/src/StatisticDescriptor.hpp        |   8 +-
 src/clicache/src/Statistics.cpp                 |   8 +-
 src/clicache/src/Statistics.hpp                 |   8 +-
 src/clicache/src/StatisticsFactory.cpp          |   8 +-
 src/clicache/src/StatisticsFactory.hpp          |   8 +-
 src/clicache/src/StatisticsType.cpp             |   8 +-
 src/clicache/src/StatisticsType.hpp             |   8 +-
 src/clicache/src/Struct.cpp                     |   8 +-
 src/clicache/src/Struct.hpp                     |  41 +--
 src/clicache/src/StructSet.cpp                  |  12 +-
 src/clicache/src/StructSet.hpp                  |  15 +-
 src/clicache/src/SystemProperties.cpp           |   8 +-
 src/clicache/src/SystemProperties.hpp           |   8 +-
 src/clicache/src/TransactionEvent.cpp           |  16 +-
 src/clicache/src/TransactionEvent.hpp           |  26 +-
 src/clicache/src/TransactionId.hpp              |   8 +-
 src/clicache/src/TransactionListenerAdapter.hpp |  16 +-
 src/clicache/src/TransactionWriterAdapte.hpp    |  10 +-
 .../src/UserFunctionExecutionException.cpp      |   8 +-
 .../src/UserFunctionExecutionException.hpp      |   8 +-
 src/clicache/src/Utils.cpp                      |  10 +-
 src/clicache/src/gf_defs.hpp                    |  10 +-
 src/clicache/src/gfclicache.rc                  |   4 +-
 src/clicache/src/impl/AppDomainContext.cpp      |   9 +-
 src/clicache/src/impl/AppDomainContext.hpp      |   9 +-
 src/clicache/src/impl/AuthenticatedCache.cpp    |   8 +-
 src/clicache/src/impl/AuthenticatedCache.hpp    |   8 +-
 src/clicache/src/impl/CacheListener.hpp         |  34 +-
 src/clicache/src/impl/CacheLoader.hpp           |  12 +-
 src/clicache/src/impl/CacheWriter.hpp           |  26 +-
 src/clicache/src/impl/CliCallbackDelgate.hpp    |  12 +-
 src/clicache/src/impl/CqListenerProxy.hpp       |  16 +-
 src/clicache/src/impl/CqStatusListenerProxy.hpp |  16 +-
 src/clicache/src/impl/DelegateWrapper.hpp       |   8 +-
 src/clicache/src/impl/DotNetTypes.hpp           |   8 +-
 src/clicache/src/impl/EnumInfo.cpp              |   8 +-
 src/clicache/src/impl/EnumInfo.hpp              |   8 +-
 .../src/impl/FixedPartitionResolver.hpp         |   8 +-
 src/clicache/src/impl/GFDataInputStream.hpp     |   8 +-
 src/clicache/src/impl/GFDataOutputStream.hpp    |   8 +-
 src/clicache/src/impl/GFNullStream.hpp          |   8 +-
 src/clicache/src/impl/ManagedAuthInitialize.cpp |  26 +-
 src/clicache/src/impl/ManagedAuthInitialize.hpp |  10 +-
 src/clicache/src/impl/ManagedCacheListener.cpp  |  84 ++---
 src/clicache/src/impl/ManagedCacheListener.hpp  |  44 +--
 src/clicache/src/impl/ManagedCacheLoader.cpp    |  32 +-
 src/clicache/src/impl/ManagedCacheLoader.hpp    |  18 +-
 src/clicache/src/impl/ManagedCacheWriter.cpp    |  60 ++--
 src/clicache/src/impl/ManagedCacheWriter.hpp    |  36 +-
 src/clicache/src/impl/ManagedCacheableDelta.cpp |  60 ++--
 src/clicache/src/impl/ManagedCacheableDelta.hpp |  24 +-
 .../src/impl/ManagedCacheableDeltaBytes.cpp     | 134 ++++----
 .../src/impl/ManagedCacheableDeltaBytes.hpp     |  48 +--
 src/clicache/src/impl/ManagedCacheableKey.cpp   |  66 ++--
 src/clicache/src/impl/ManagedCacheableKey.hpp   |  22 +-
 .../src/impl/ManagedCacheableKeyBytes.cpp       |  92 ++---
 .../src/impl/ManagedCacheableKeyBytes.hpp       |  22 +-
 src/clicache/src/impl/ManagedCqListener.cpp     |  26 +-
 src/clicache/src/impl/ManagedCqListener.hpp     |  16 +-
 .../src/impl/ManagedCqStatusListener.cpp        |  34 +-
 .../src/impl/ManagedCqStatusListener.hpp        |   8 +-
 .../src/impl/ManagedFixedPartitionResolver.cpp  |  32 +-
 .../src/impl/ManagedFixedPartitionResolver.hpp  |   8 +-
 .../src/impl/ManagedPartitionResolver.cpp       |  28 +-
 .../src/impl/ManagedPartitionResolver.hpp       |   8 +-
 .../src/impl/ManagedPersistenceManager.cpp      |  20 +-
 .../src/impl/ManagedPersistenceManager.hpp      |   6 +-
 .../src/impl/ManagedResultCollector.cpp         |  38 +--
 .../src/impl/ManagedResultCollector.hpp         |  10 +-
 src/clicache/src/impl/ManagedString.hpp         |   9 +-
 .../src/impl/ManagedTransactionListener.cpp     |  42 +--
 .../src/impl/ManagedTransactionListener.hpp     |   8 +-
 .../src/impl/ManagedTransactionWriter.cpp       |  24 +-
 .../src/impl/ManagedTransactionWriter.hpp       |  22 +-
 src/clicache/src/impl/ManagedVisitor.cpp        |   4 +-
 src/clicache/src/impl/ManagedVisitor.hpp        |   6 +-
 src/clicache/src/impl/MemoryPressureHandler.cpp |   8 +-
 src/clicache/src/impl/MemoryPressureHandler.hpp |  12 +-
 src/clicache/src/impl/NativeWrapper.hpp         |  10 +-
 src/clicache/src/impl/PartitionResolver.hpp     |   8 +-
 src/clicache/src/impl/PdxFieldType.cpp          |   8 +-
 src/clicache/src/impl/PdxFieldType.hpp          |   8 +-
 src/clicache/src/impl/PdxHelper.cpp             |   8 +-
 src/clicache/src/impl/PdxHelper.hpp             |   8 +-
 .../src/impl/PdxInstanceFactoryImpl.cpp         |   8 +-
 .../src/impl/PdxInstanceFactoryImpl.hpp         |   8 +-
 src/clicache/src/impl/PdxInstanceImpl.cpp       |  12 +-
 src/clicache/src/impl/PdxInstanceImpl.hpp       |   8 +-
 src/clicache/src/impl/PdxLocalReader.cpp        |   8 +-
 src/clicache/src/impl/PdxLocalReader.hpp        |   8 +-
 src/clicache/src/impl/PdxLocalWriter.cpp        |   8 +-
 src/clicache/src/impl/PdxLocalWriter.hpp        |   8 +-
 .../src/impl/PdxManagedCacheableKey.cpp         |  76 ++---
 .../src/impl/PdxManagedCacheableKey.hpp         |  22 +-
 .../src/impl/PdxManagedCacheableKeyBytes.cpp    | 144 ++++----
 .../src/impl/PdxManagedCacheableKeyBytes.hpp    |  26 +-
 .../src/impl/PdxReaderWithTypeCollector.cpp     |   8 +-
 .../src/impl/PdxReaderWithTypeCollector.hpp     |   8 +-
 .../src/impl/PdxRemotePreservedData.hpp         |   8 +-
 src/clicache/src/impl/PdxRemoteReader.cpp       |   8 +-
 src/clicache/src/impl/PdxRemoteReader.hpp       |   8 +-
 src/clicache/src/impl/PdxRemoteWriter.cpp       |   8 +-
 src/clicache/src/impl/PdxRemoteWriter.hpp       |   8 +-
 src/clicache/src/impl/PdxType.cpp               |   8 +-
 src/clicache/src/impl/PdxType.hpp               |   8 +-
 src/clicache/src/impl/PdxTypeRegistry.cpp       |   8 +-
 src/clicache/src/impl/PdxTypeRegistry.hpp       |   8 +-
 src/clicache/src/impl/PdxWrapper.hpp            |   8 +-
 .../src/impl/PdxWriterWithTypeCollector.cpp     |   8 +-
 .../src/impl/PdxWriterWithTypeCollector.hpp     |   8 +-
 .../src/impl/PersistenceManagerProxy.hpp        |  10 +-
 src/clicache/src/impl/ResultCollectorProxy.hpp  |  10 +-
 src/clicache/src/impl/SafeConvert.hpp           |  56 ++--
 src/clicache/src/impl/TransactionListener.hpp   |  26 +-
 src/clicache/src/impl/TransactionWriter.hpp     |  20 +-
 src/clicache/src/impl/WeakhashMap.hpp           |   8 +-
 src/clicache/src/templates/Templates.csproj.in  |   4 +-
 .../gemfire/plugins/sqlite/AssemblyInfo.cs      |   4 +-
 .../gemfire/plugins/sqlite/SqLiteImpl.cs        |   4 +-
 src/cppcache/src/CppCacheLibrary.cpp            |   2 +-
 src/cppcache/src/dllmain.cpp                    |   2 +-
 src/executables/GacInstall/Program.cs           |   4 +-
 src/pdxautoserializer/ASCLIBuiltins.hpp         |   9 +-
 src/plugins/SQLiteCLI/SQLiteCLI.csproj.in       |   4 +-
 src/quickstart/csharp/BasicOperations.cs        |   4 +-
 src/quickstart/csharp/CqQuery.cs                |   6 +-
 src/quickstart/csharp/DataExpiration.cs         |   4 +-
 src/quickstart/csharp/Delta.cs                  |   4 +-
 src/quickstart/csharp/DeltaExample.cs           |   4 +-
 src/quickstart/csharp/DistributedSystem.cs      |   6 +-
 src/quickstart/csharp/DurableClient.cs          |   4 +-
 src/quickstart/csharp/Exceptions.cs             |   4 +-
 src/quickstart/csharp/ExecuteFunctions.cs       |   4 +-
 src/quickstart/csharp/HACache.cs                |   6 +-
 src/quickstart/csharp/LoaderListenerWriter.cs   |   4 +-
 src/quickstart/csharp/MultiuserSecurity.cs      |   4 +-
 src/quickstart/csharp/PdxInstance.cs            |   4 +-
 src/quickstart/csharp/PdxRemoteQuery.cs         |   4 +-
 src/quickstart/csharp/PdxSerializer.cs          |   4 +-
 src/quickstart/csharp/PoolCqQuery.cs            |   6 +-
 src/quickstart/csharp/PoolRemoteQuery.cs        |   6 +-
 src/quickstart/csharp/PoolWithEndpoints.cs      |   4 +-
 src/quickstart/csharp/PortfolioN.cs             |   4 +-
 src/quickstart/csharp/PortfolioPdx.cs           |   2 +-
 src/quickstart/csharp/PositionN.cs              |   4 +-
 src/quickstart/csharp/PositionPdx.cs            |   2 +-
 src/quickstart/csharp/PutAllGetAllOperations.cs |   4 +-
 src/quickstart/csharp/RefIDExample.cs           |   4 +-
 src/quickstart/csharp/RegisterInterest.cs       |   4 +-
 src/quickstart/csharp/RemoteQuery.cs            |   6 +-
 src/quickstart/csharp/Security.cs               |   4 +-
 src/quickstart/csharp/Transactions.cs           |   4 +-
 src/quickstart/csharp/TransactionsXA.cs         |   4 +-
 .../csharp/plugins/DurableCacheListener.cs      |   6 +-
 .../csharp/plugins/SimpleCacheListener.cs       |   6 +-
 .../csharp/plugins/SimpleCacheLoader.cs         |   4 +-
 .../csharp/plugins/SimpleCacheWriter.cs         |   4 +-
 .../BasicOperations/BasicOperations.csproj.in   |   4 +-
 .../csharp/vsprojects/CqQuery/CqQuery.csproj.in |   4 +-
 .../DataExpiration/DataExpiration.csproj.in     |   4 +-
 .../csharp/vsprojects/Delta/Delta.csproj.in     |   4 +-
 .../DistributedSystem.csproj.in                 |   4 +-
 .../DurableClient/DurableClient.csproj.in       |   4 +-
 .../vsprojects/Exceptions/Exceptions.csproj.in  |   4 +-
 .../ExecuteFunctions/ExecuteFunctions.csproj.in |   4 +-
 .../csharp/vsprojects/HACache/HACache.csproj.in |   4 +-
 .../LoaderListenerWriter.csproj.in              |   4 +-
 .../MultiuserSecurity.csproj.in                 |   4 +-
 .../PdxInstance/PdxInstance.csproj.in           |   4 +-
 .../PdxRemoteQuery/PdxRemoteQuery.csproj.in     |   4 +-
 .../PdxSerializer/PdxSerializer.csproj.in       |   4 +-
 .../PoolCqQuery/PoolCqQuery.csproj.in           |   4 +-
 .../PoolRemoteQuery/PoolRemoteQuery.csproj.in   |   4 +-
 .../PoolWithEndpoints.csproj.in                 |   4 +-
 .../PutAllGetAllOperations.csproj.in            |   4 +-
 .../RefIDExample/RefIDExample.csproj.in         |   4 +-
 .../RegisterInterest/RegisterInterest.csproj.in |   4 +-
 .../RemoteQuery/RemoteQuery.csproj.in           |   4 +-
 .../vsprojects/Security/Security.csproj.in      |   4 +-
 .../SimplePlugins/SimplePlugins.csproj.in       |   4 +-
 .../Transactions/Transactions.csproj.in         |   4 +-
 .../TransactionsXA/TransactionsXA.csproj.in     |   4 +-
 .../security/csharp/UserPasswordAuthInit.cs     |  10 +-
 src/tests/cli/DUnitFramework/ClientBase.cs      |   2 +-
 src/tests/cli/DUnitFramework/ClientGroup.cs     |   2 +-
 .../cli/DUnitFramework/DUnitFramework.csproj.in |   2 +-
 src/tests/cli/DUnitFramework/DUnitTestClass.cs  |   2 +-
 src/tests/cli/DUnitFramework/Exceptions.cs      |   2 +-
 .../cli/DUnitFramework/IClientServerComm.cs     |   2 +-
 src/tests/cli/DUnitFramework/Log.cs             |   2 +-
 .../cli/DUnitFramework/ServerCommunication.cs   |   2 +-
 .../cli/DUnitFramework/ServerConnection.cs      |   2 +-
 src/tests/cli/DUnitFramework/TimeBomb.cs        |   2 +-
 src/tests/cli/DUnitFramework/UnitProcess.cs     |   2 +-
 src/tests/cli/DUnitFramework/UnitThread.cs      |   2 +-
 src/tests/cli/DUnitFramework/Util.cs            |   2 +-
 .../cli/DUnitFramework/XmlNodeReaderWriter.cs   |   2 +-
 src/tests/cli/FwkClient/ClientComm.cs           |   8 +-
 src/tests/cli/FwkClient/ClientProcess.cs        |   4 +-
 src/tests/cli/FwkClient/FwkClient.csproj.in     |   2 +-
 src/tests/cli/FwkLauncher/FwkLauncher.csproj.in |   2 +-
 src/tests/cli/FwkLauncher/LauncherComm.cs       |   4 +-
 src/tests/cli/FwkLauncher/LauncherProcess.cs    |   4 +-
 src/tests/cli/FwkUtil/FwkClient.cs              |   4 +-
 src/tests/cli/FwkUtil/FwkData.cs                |  48 +--
 src/tests/cli/FwkUtil/FwkUtil.csproj.in         |   2 +-
 src/tests/cli/NativeWrapper/ManagedWrapper.cpp  |  10 +-
 src/tests/cli/NativeWrapper/ManagedWrapper.hpp  |  14 +-
 src/tests/cli/NativeWrapper/NativeType.cpp      |   8 +-
 src/tests/cli/NewFwkLib/CacheHelper.cs          |  18 +-
 src/tests/cli/NewFwkLib/CacheServer.cs          |  50 +--
 .../DeltaTest/DeltaClientValidationListener.cs  |  12 +-
 src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs  |  10 +-
 .../NewFwkLib/DurableTest/DurableClientTests.cs |  14 +-
 .../NewFwkLib/DurableTest/DurableListener.cs    |  12 +-
 .../DurableTest/DurablePerfListener.cs          |   6 +-
 .../cli/NewFwkLib/EventTest/ETCacheListener.cs  |   4 +-
 .../cli/NewFwkLib/EventTest/ETCacheLoader.cs    |   4 +-
 .../cli/NewFwkLib/EventTest/ETCacheWriter.cs    |   4 +-
 src/tests/cli/NewFwkLib/EventTest/EventTests.cs |   4 +-
 .../FunctionExecution/FunctionExecution.cs      |  60 ++--
 .../FunctionExecution/MyResultCollector.cs      |   6 +-
 src/tests/cli/NewFwkLib/FwkTask.cs              |   8 +-
 src/tests/cli/NewFwkLib/FwkTest.cs              |  14 +-
 src/tests/cli/NewFwkLib/NewFwkLib.csproj.in     |   2 +-
 src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs     |  30 +-
 src/tests/cli/NewFwkLib/PerfTest/DupChecker.cs  |   8 +-
 .../cli/NewFwkLib/PerfTest/LatencyListener.cs   |  10 +-
 src/tests/cli/NewFwkLib/PerfTest/PerfTasks.cs   |  12 +-
 .../NewFwkLib/PerfTest/PerfTestCacheListener.cs |   8 +-
 src/tests/cli/NewFwkLib/PerfTest/PerfTests.cs   |  12 +-
 src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs |  30 +-
 .../cli/NewFwkLib/ResumableTx/ResumableTx.cs    |  12 +-
 src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs   | 335 ++++++++++---------
 .../cli/NewFwkLib/SecurityTest/Security.cs      |   6 +-
 .../cli/NewFwkLib/SmokePerf/ObjectHelper.cs     |   8 +-
 src/tests/cli/NewFwkLib/SmokePerf/PerfStat.cs   |   8 +-
 src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs  |  20 +-
 src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs |  10 +-
 src/tests/cli/NewFwkLib/Utils.cs                |  12 +-
 src/tests/cli/NewTestObject/ArrayOfByte.cs      |   4 +-
 src/tests/cli/NewTestObject/BatchObject.cs      |   4 +-
 src/tests/cli/NewTestObject/DeltaEx.cs          |  18 +-
 .../cli/NewTestObject/DeltaFastAssetAccount.cs  |   4 +-
 src/tests/cli/NewTestObject/DeltaPSTObject.cs   |   4 +-
 src/tests/cli/NewTestObject/DeltaTestImpl.cs    |   4 +-
 src/tests/cli/NewTestObject/EqStruct.cs         |   4 +-
 src/tests/cli/NewTestObject/FastAsset.cs        |   6 +-
 src/tests/cli/NewTestObject/FastAssetAccount.cs |   4 +-
 src/tests/cli/NewTestObject/NoopAuthInit.cs     |   4 +-
 src/tests/cli/NewTestObject/PSTObject.cs        |   4 +-
 .../cli/NewTestObject/PdxAutoSerializerObj.cs   |   4 +-
 src/tests/cli/NewTestObject/Portfolio.cs        |   4 +-
 src/tests/cli/NewTestObject/PortfolioPdx.cs     |   4 +-
 src/tests/cli/NewTestObject/Position.cs         |   4 +-
 src/tests/cli/NewTestObject/PositionPdx.cs      |   4 +-
 .../cli/NewTestObject/SimpleCacheListener.cs    |   6 +-
 src/tests/cli/NewTestObject/TestObject1.cs      |   4 +-
 src/tests/cli/NewTestObject/TimeStampdObject.cs |   4 +-
 src/tests/cli/PdxClassLibrary/PdxType.cs        |   4 +-
 .../PdxClassLibrary/PdxTypesReflectionTest.cs   |   4 +-
 src/tests/cli/PdxClassLibrary/PortfolioPdx.cs   |   2 +-
 src/tests/cli/PdxClassLibrary/PositionPdx.cs    |   2 +-
 .../cli/PdxClassLibrary/VariousPdxTypes.cs      |   2 +-
 src/tests/cli/PdxVersion1Lib/Version1.cs        |   4 +-
 src/tests/cli/PdxVersion2Lib/Version2.cs        |   4 +-
 src/tests/cli/PkcsWrapper/PkcsAuthInitMN.cpp    |  12 +-
 src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp    |  16 +-
 src/tests/cli/QueryHelper/QueryHelperN.cs       |   8 +-
 src/tests/cli/QueryHelper/QueryStringsM.cpp     |  12 +-
 src/tests/cli/QueryHelper/QueryStringsM.hpp     |  10 +-
 .../SecurityUtil/AuthzCredentialGeneratorN.cs   |   8 +-
 .../cli/SecurityUtil/CredentialGeneratorN.cs    |   6 +-
 .../cli/SecurityUtil/DummyAuthorization3N.cs    |   4 +-
 .../SecurityUtil/LdapCredentialGeneratorN.cs    |   8 +-
 .../SecurityUtil/PKCSCredentialGeneratorN.cs    |   8 +-
 .../cli/SecurityUtil/SecurityUtil.csproj.in     |   2 +-
 .../XmlAuthzCredentialGeneratorN.cs             |   8 +-
 499 files changed, 3306 insertions(+), 3058 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/examples/clicache/CacheRunner/ComplexNumber.cs
----------------------------------------------------------------------
diff --git a/examples/clicache/CacheRunner/ComplexNumber.cs 
b/examples/clicache/CacheRunner/ComplexNumber.cs
index 107637e..aad668c 100644
--- a/examples/clicache/CacheRunner/ComplexNumber.cs
+++ b/examples/clicache/CacheRunner/ComplexNumber.cs
@@ -18,12 +18,12 @@
 using System;
 using System.Text.RegularExpressions;
 
-namespace GemStone.GemFire.Cache.Examples
+namespace Apache.Geode.Client.Examples
 {
   /// <summary>
   /// A complex number -- no operations defined yet.
   /// </summary>
-  public class ComplexNumber : GemStone.GemFire.Cache.Generic.ICacheableKey
+  public class ComplexNumber : Apache.Geode.Client.Generic.ICacheableKey
   {
     #region Public Accessors
 
@@ -83,7 +83,7 @@ namespace GemStone.GemFire.Cache.Examples
     /// Factory function to be registered using
     /// <see cref="Serializable.registerType" />.
     /// </summary>
-    public static GemStone.GemFire.Cache.Generic.IGFSerializable Create()
+    public static Apache.Geode.Client.Generic.IGFSerializable Create()
     {
       return new ComplexNumber(0.0, 0.0);
     }
@@ -97,7 +97,7 @@ namespace GemStone.GemFire.Cache.Examples
     /// </summary>
     /// <param name="input">The <c>DataInput</c> stream.</param>
     /// <returns>A reference to <c>this</c> object.</returns>
-    public GemStone.GemFire.Cache.Generic.IGFSerializable 
FromData(GemStone.GemFire.Cache.Generic.DataInput input)
+    public Apache.Geode.Client.Generic.IGFSerializable 
FromData(Apache.Geode.Client.Generic.DataInput input)
     {
       m_real = input.ReadDouble();
       m_imaginary = input.ReadDouble();
@@ -108,7 +108,7 @@ namespace GemStone.GemFire.Cache.Examples
     /// Write the complex number to the <see cref="DataOutput" /> stream.
     /// </summary>
     /// <param name="output">The <c>DataOutput</c> stream.</param>
-    public void ToData(GemStone.GemFire.Cache.Generic.DataOutput output)
+    public void ToData(Apache.Geode.Client.Generic.DataOutput output)
     {
       output.WriteDouble(m_real);
       output.WriteDouble(m_imaginary);
@@ -141,7 +141,7 @@ namespace GemStone.GemFire.Cache.Examples
 
     #region ICacheableKey Members
 
-    public bool Equals(GemStone.GemFire.Cache.Generic.ICacheableKey other)
+    public bool Equals(Apache.Geode.Client.Generic.ICacheableKey other)
     {
       ComplexNumber cOther = other as ComplexNumber;
       if (cOther != null)

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/include/gfcli/Utils.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/include/gfcli/Utils.hpp 
b/src/clicache/include/gfcli/Utils.hpp
index 0c860eb..210a64a 100644
--- a/src/clicache/include/gfcli/Utils.hpp
+++ b/src/clicache/include/gfcli/Utils.hpp
@@ -28,13 +28,13 @@
 using namespace System;
 using namespace System::Reflection;
 
-namespace GemStone
+namespace Apache
 {
-  namespace GemFire
+  namespace Geode
   {
-               namespace Cache
-               {
-                       namespace Generic
+    namespace Client
+    {
+namespace Generic
                        {
 
     /// <summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/AckMixTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/AckMixTests.cs 
b/src/clicache/integration-test/AckMixTests.cs
index ec9a4a3..8cf394d 100644
--- a/src/clicache/integration-test/AckMixTests.cs
+++ b/src/clicache/integration-test/AckMixTests.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   [Category("unicast_only")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/AttributesFactoryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/AttributesFactoryTestsN.cs 
b/src/clicache/integration-test/AttributesFactoryTestsN.cs
index 8b17d59..c8d3d88 100644
--- a/src/clicache/integration-test/AttributesFactoryTestsN.cs
+++ b/src/clicache/integration-test/AttributesFactoryTestsN.cs
@@ -20,13 +20,13 @@
 
 //#pragma warning disable 618
 
-//namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+//namespace Apache.Geode.Client.UnitTests.NewAPI
 //{
 //  using NUnit.Framework;
-//  using GemStone.GemFire.DUnitFramework;
-// // using GemStone.GemFire.Cache; 
-//  using GemStone.GemFire.Cache.Generic;
-//  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+//  using Apache.Geode.DUnitFramework;
+// // using Apache.Geode.Client; 
+//  using Apache.Geode.Client.Generic;
+//  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
 //  [TestFixture]
 //  [Category("group1")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/AttributesMutatorTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/AttributesMutatorTestsN.cs 
b/src/clicache/integration-test/AttributesMutatorTestsN.cs
index 82bba3d..572a6a8 100644
--- a/src/clicache/integration-test/AttributesMutatorTestsN.cs
+++ b/src/clicache/integration-test/AttributesMutatorTestsN.cs
@@ -20,13 +20,13 @@ using System.Threading;
 
 #pragma warning disable 618
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
-  using GIRegion = GemStone.GemFire.Cache.Generic.IRegion<string, string>;
+  using GIRegion = Apache.Geode.Client.Generic.IRegion<string, string>;
 
   class ThinClientTallyLoader : TallyLoader<string, string>
   {
@@ -267,7 +267,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         IRegion<string, int> region = 
CacheHelper.CreateLocalRegionWithETTL<string, int>(RegionName,
           ExpirationAction.LocalInvalidate, TimeToLive);
 
-        GemStone.GemFire.Cache.Generic.RegionAttributes<string, int> newAttrs 
= region.Attributes;
+        Apache.Geode.Client.Generic.RegionAttributes<string, int> newAttrs = 
region.Attributes;
         int ttl = newAttrs.EntryTimeToLive;
         Assert.AreEqual(TimeToLive, ttl);
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/BuiltinCacheableWrappersN.cs 
b/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
index bbfa350..3d53e68 100644
--- a/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
+++ b/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
   
   #region Helper class
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CMakeLists.txt 
b/src/clicache/integration-test/CMakeLists.txt
index 012bf14..5baf047 100755
--- a/src/clicache/integration-test/CMakeLists.txt
+++ b/src/clicache/integration-test/CMakeLists.txt
@@ -48,8 +48,8 @@ foreach(FILE ${SOURCES})
          if (NOT IsDeprecated)
 
                  # Get the namespace
-                 file(STRINGS ${FILE} NameSpaceLine REGEX "namespace 
GemStone.GemFire.Cache.UnitTests")
-                 string(REGEX REPLACE "namespace.*GemStone" "GemStone" 
NAMESPACE ${NameSpaceLine})
+                 file(STRINGS ${FILE} NameSpaceLine REGEX "namespace 
Apache.Geode.Client.UnitTests")
+                 string(REGEX REPLACE "namespace.*Apache" "Apache" NAMESPACE 
${NameSpaceLine})
 
           string(REGEX REPLACE "\\.cs" "" TEST ${FILE})        
           set(TESTS ${TESTS} ${TEST})

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/CacheHelperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheHelperN.cs 
b/src/clicache/integration-test/CacheHelperN.cs
index 9f2f614..dc86c2f 100644
--- a/src/clicache/integration-test/CacheHelperN.cs
+++ b/src/clicache/integration-test/CacheHelperN.cs
@@ -25,11 +25,11 @@ using System.Xml;
 
 #pragma warning disable 618
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
   using System.Management;
 
   public class PropsStringToObject
@@ -711,7 +711,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
 
     #region Functions to create or destroy a region
 
-    public static IRegion<TKey, TValue> CreateRegion<TKey, TValue>(string 
name, GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TValue> attrs)
+    public static IRegion<TKey, TValue> CreateRegion<TKey, TValue>(string 
name, Apache.Geode.Client.Generic.RegionAttributes<TKey, TValue> attrs)
     {
       Init();
       IRegion<TKey, TValue> region = GetRegion<TKey, TValue>(name);
@@ -829,7 +829,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       AttributesFactory<TKey, TValue> af = new AttributesFactory<TKey, 
TValue>();
       af.SetLruEntriesLimit(0);
       af.SetInitialCapacity(size);
-      GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TValue> rattrs = 
af.CreateRegionAttributes();
+      Apache.Geode.Client.Generic.RegionAttributes<TKey, TValue> rattrs = 
af.CreateRegionAttributes();
       IRegion<TKey, TValue> region = ((Region<TKey, 
TValue>)m_currRegion).CreateSubRegion(name, rattrs);
       Assert.IsNotNull(region, "SubRegion {0} was not created.", name);
       return region;
@@ -2447,7 +2447,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       }
     }
 
-    public static string RegionAttributesToString<TKey, 
TVal>(GemStone.GemFire.Cache.Generic.RegionAttributes<TKey, TVal> attrs)
+    public static string RegionAttributesToString<TKey, 
TVal>(Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> attrs)
     {
       string poolName = "RegionWithoutPool";
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/CacheServerMsgs.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheServerMsgs.cs 
b/src/clicache/integration-test/CacheServerMsgs.cs
index 570e923..076e59a 100644
--- a/src/clicache/integration-test/CacheServerMsgs.cs
+++ b/src/clicache/integration-test/CacheServerMsgs.cs
@@ -17,10 +17,10 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   [Category("unicast_only")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/CacheableWrapper.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheableWrapper.cs 
b/src/clicache/integration-test/CacheableWrapper.cs
index d5f706b..1e0927b 100644
--- a/src/clicache/integration-test/CacheableWrapper.cs
+++ b/src/clicache/integration-test/CacheableWrapper.cs
@@ -20,7 +20,7 @@ using System.Collections.Generic;
 using System.Collections;
 using System.Runtime.Serialization;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/CacheableWrapperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheableWrapperN.cs 
b/src/clicache/integration-test/CacheableWrapperN.cs
index 50c45c7..153cd14 100644
--- a/src/clicache/integration-test/CacheableWrapperN.cs
+++ b/src/clicache/integration-test/CacheableWrapperN.cs
@@ -20,11 +20,11 @@ using System.Collections.Generic;
 using System.Collections;
 using System.Runtime.Serialization;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   
   using NUnit.Framework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
   /// <summary>
   /// Interface class for wrappers of gemfire cacheable types.
   /// </summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/CachelessTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CachelessTestsN.cs 
b/src/clicache/integration-test/CachelessTestsN.cs
index 903b5f4..5fd9066 100644
--- a/src/clicache/integration-test/CachelessTestsN.cs
+++ b/src/clicache/integration-test/CachelessTestsN.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
   [TestFixture]
   [Category("generics")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DataIOTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DataIOTests.cs 
b/src/clicache/integration-test/DataIOTests.cs
index 1fbbd5a..d4488e5 100644
--- a/src/clicache/integration-test/DataIOTests.cs
+++ b/src/clicache/integration-test/DataIOTests.cs
@@ -19,10 +19,10 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   [Category("unicast_only")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DataOutputTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DataOutputTests.cs 
b/src/clicache/integration-test/DataOutputTests.cs
index 3e1327f..70af28d 100755
--- a/src/clicache/integration-test/DataOutputTests.cs
+++ b/src/clicache/integration-test/DataOutputTests.cs
@@ -19,11 +19,11 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
     using NUnit.Framework;
-    using GemStone.GemFire.DUnitFramework;
-    using GemStone.GemFire.Cache.Generic;
+    using Apache.Geode.DUnitFramework;
+    using Apache.Geode.Client.Generic;
 
     [TestFixture]
     [Category("unicast_only")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DefaultCacheable.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DefaultCacheable.cs 
b/src/clicache/integration-test/DefaultCacheable.cs
index aa06d3d..14561fd 100755
--- a/src/clicache/integration-test/DefaultCacheable.cs
+++ b/src/clicache/integration-test/DefaultCacheable.cs
@@ -19,9 +19,9 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-using GemStone.GemFire.Cache.Generic;
+using Apache.Geode.Client.Generic;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   [Serializable]
   class CustomSerializableObject
@@ -35,19 +35,19 @@ namespace GemStone.GemFire.Cache.UnitTests
       value = "value";
     }
   }
-  class DefaultCacheable : GemStone.GemFire.Cache.Generic.IGFSerializable
+  class DefaultCacheable : Apache.Geode.Client.Generic.IGFSerializable
   {
-    GemStone.GemFire.Cache.Generic.CacheableBoolean m_cacheableBoolean = null;
-    GemStone.GemFire.Cache.Generic.CacheableInt32 m_cacheableInt32 = null;
-    GemStone.GemFire.Cache.Generic.CacheableInt32Array m_cacheableInt32Array = 
null;
-    GemStone.GemFire.Cache.Generic.CacheableFileName m_cacheableFileName = 
null;
-    GemStone.GemFire.Cache.Generic.CacheableString m_CacheableStringASCII = 
null;
-    GemStone.GemFire.Cache.Generic.CacheableStringArray m_cacheableStringArray 
= null;
-    GemStone.GemFire.Cache.Generic.CacheableHashSet m_cacheableHashSet = null;
-    GemStone.GemFire.Cache.Generic.CacheableHashMap m_cacheableHashMap = null;
-    GemStone.GemFire.Cache.Generic.CacheableDate m_cacheableDate = null;
-    GemStone.GemFire.Cache.Generic.CacheableVector m_cacheableVector = null;
-    GemStone.GemFire.Cache.Generic.CacheableObject m_cacheableObject = null;
+    Apache.Geode.Client.Generic.CacheableBoolean m_cacheableBoolean = null;
+    Apache.Geode.Client.Generic.CacheableInt32 m_cacheableInt32 = null;
+    Apache.Geode.Client.Generic.CacheableInt32Array m_cacheableInt32Array = 
null;
+    Apache.Geode.Client.Generic.CacheableFileName m_cacheableFileName = null;
+    Apache.Geode.Client.Generic.CacheableString m_CacheableStringASCII = null;
+    Apache.Geode.Client.Generic.CacheableStringArray m_cacheableStringArray = 
null;
+    Apache.Geode.Client.Generic.CacheableHashSet m_cacheableHashSet = null;
+    Apache.Geode.Client.Generic.CacheableHashMap m_cacheableHashMap = null;
+    Apache.Geode.Client.Generic.CacheableDate m_cacheableDate = null;
+    Apache.Geode.Client.Generic.CacheableVector m_cacheableVector = null;
+    Apache.Geode.Client.Generic.CacheableObject m_cacheableObject = null;
 
     bool m_initialized = false;
 
@@ -60,86 +60,86 @@ namespace GemStone.GemFire.Cache.UnitTests
     {
       if (initialized)
       {
-        GemStone.GemFire.Cache.Generic.Log.Fine(" in constructor");
+        Apache.Geode.Client.Generic.Log.Fine(" in constructor");
         m_initialized = true;
 
-        m_cacheableBoolean = 
GemStone.GemFire.Cache.Generic.CacheableBoolean.Create(true);
+        m_cacheableBoolean = 
Apache.Geode.Client.Generic.CacheableBoolean.Create(true);
 
-        m_cacheableInt32 = 
GemStone.GemFire.Cache.Generic.CacheableInt32.Create(1000);
+        m_cacheableInt32 = 
Apache.Geode.Client.Generic.CacheableInt32.Create(1000);
 
-        m_cacheableInt32Array = 
GemStone.GemFire.Cache.Generic.CacheableInt32Array.Create(new Int32[] { 1, 2, 3 
});
+        m_cacheableInt32Array = 
Apache.Geode.Client.Generic.CacheableInt32Array.Create(new Int32[] { 1, 2, 3 });
 
-        m_cacheableFileName = 
GemStone.GemFire.Cache.Generic.CacheableFileName.Create("gemstone.txt");
+        m_cacheableFileName = 
Apache.Geode.Client.Generic.CacheableFileName.Create("gemstone.txt");
 
-        m_CacheableStringASCII = 
GemStone.GemFire.Cache.Generic.CacheableString.Create("asciistring");
+        m_CacheableStringASCII = 
Apache.Geode.Client.Generic.CacheableString.Create("asciistring");
 
-        m_cacheableStringArray = 
GemStone.GemFire.Cache.Generic.CacheableStringArray.Create(new string[] { 
"one", "two" });
+        m_cacheableStringArray = 
Apache.Geode.Client.Generic.CacheableStringArray.Create(new string[] { "one", 
"two" });
 
-        m_cacheableHashSet = 
GemStone.GemFire.Cache.Generic.CacheableHashSet.Create(2);
-        
m_cacheableHashSet.Add(GemStone.GemFire.Cache.Generic.CacheableString.Create("first"));
-        
m_cacheableHashSet.Add(GemStone.GemFire.Cache.Generic.CacheableString.Create("second"));
+        m_cacheableHashSet = 
Apache.Geode.Client.Generic.CacheableHashSet.Create(2);
+        
m_cacheableHashSet.Add(Apache.Geode.Client.Generic.CacheableString.Create("first"));
+        
m_cacheableHashSet.Add(Apache.Geode.Client.Generic.CacheableString.Create("second"));
 
-        m_cacheableHashMap = new 
GemStone.GemFire.Cache.Generic.CacheableHashMap(new Dictionary<string, 
string>() {{ "key-hm", "value-hm" }});
+        m_cacheableHashMap = new 
Apache.Geode.Client.Generic.CacheableHashMap(new Dictionary<string, string>() 
{{ "key-hm", "value-hm" }});
 
         m_cacheableDate = (CacheableDate)CacheableDate.Create(DateTime.Now);
 
-        m_cacheableVector = new 
GemStone.GemFire.Cache.Generic.CacheableVector(new List<string>() { "one-vec", 
"two-vec" });
+        m_cacheableVector = new 
Apache.Geode.Client.Generic.CacheableVector(new List<string>() { "one-vec", 
"two-vec" });
 
-        m_cacheableObject = 
GemStone.GemFire.Cache.Generic.CacheableObject.Create(new 
CustomSerializableObject());
+        m_cacheableObject = 
Apache.Geode.Client.Generic.CacheableObject.Create(new 
CustomSerializableObject());
       } 
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableBoolean CBool
+    public Apache.Geode.Client.Generic.CacheableBoolean CBool
     {
       get { return m_cacheableBoolean; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableInt32 CInt
+    public Apache.Geode.Client.Generic.CacheableInt32 CInt
     {
       get { return m_cacheableInt32; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableInt32Array CIntArray
+    public Apache.Geode.Client.Generic.CacheableInt32Array CIntArray
     {
       get { return m_cacheableInt32Array; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableFileName CFileName
+    public Apache.Geode.Client.Generic.CacheableFileName CFileName
     {
       get { return m_cacheableFileName; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableString CString
+    public Apache.Geode.Client.Generic.CacheableString CString
     {
       get { return m_CacheableStringASCII; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableStringArray CStringArray
+    public Apache.Geode.Client.Generic.CacheableStringArray CStringArray
     {
       get { return m_cacheableStringArray; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableHashSet CHashSet
+    public Apache.Geode.Client.Generic.CacheableHashSet CHashSet
     {
       get { return m_cacheableHashSet; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableHashMap CHashMap
+    public Apache.Geode.Client.Generic.CacheableHashMap CHashMap
     {
       get { return m_cacheableHashMap; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableDate CDate
+    public Apache.Geode.Client.Generic.CacheableDate CDate
     {
       get { return m_cacheableDate; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableVector CVector
+    public Apache.Geode.Client.Generic.CacheableVector CVector
     {
       get { return m_cacheableVector; }
     }
 
-    public GemStone.GemFire.Cache.Generic.CacheableObject CObject
+    public Apache.Geode.Client.Generic.CacheableObject CObject
     {
       get { return m_cacheableObject; }
     }
@@ -151,21 +151,21 @@ namespace GemStone.GemFire.Cache.UnitTests
       get { return 0x04; }
     }
 
-    public GemStone.GemFire.Cache.Generic.IGFSerializable 
FromData(GemStone.GemFire.Cache.Generic.DataInput input)
+    public Apache.Geode.Client.Generic.IGFSerializable 
FromData(Apache.Geode.Client.Generic.DataInput input)
     {
       if (!m_initialized)
       {
-        m_cacheableBoolean = 
(GemStone.GemFire.Cache.Generic.CacheableBoolean)CacheableBoolean.CreateDeserializable();
-        m_cacheableInt32 = 
(GemStone.GemFire.Cache.Generic.CacheableInt32)CacheableInt32.CreateDeserializable();
-        m_cacheableInt32Array = 
(GemStone.GemFire.Cache.Generic.CacheableInt32Array)CacheableInt32Array.CreateDeserializable();
+        m_cacheableBoolean = 
(Apache.Geode.Client.Generic.CacheableBoolean)CacheableBoolean.CreateDeserializable();
+        m_cacheableInt32 = 
(Apache.Geode.Client.Generic.CacheableInt32)CacheableInt32.CreateDeserializable();
+        m_cacheableInt32Array = 
(Apache.Geode.Client.Generic.CacheableInt32Array)CacheableInt32Array.CreateDeserializable();
        // m_cacheableFileName = 
(CacheableFileName)CacheableFileName.CreateDeserializable();
         //m_CacheableStringASCII = 
(CacheableString)CacheableString.CreateDeserializable();
-        m_cacheableStringArray = 
(GemStone.GemFire.Cache.Generic.CacheableStringArray)CacheableStringArray.CreateDeserializable();
-        m_cacheableHashSet = 
(GemStone.GemFire.Cache.Generic.CacheableHashSet)CacheableHashSet.CreateDeserializable();
-        m_cacheableHashMap = 
(GemStone.GemFire.Cache.Generic.CacheableHashMap)CacheableHashMap.CreateDeserializable();
+        m_cacheableStringArray = 
(Apache.Geode.Client.Generic.CacheableStringArray)CacheableStringArray.CreateDeserializable();
+        m_cacheableHashSet = 
(Apache.Geode.Client.Generic.CacheableHashSet)CacheableHashSet.CreateDeserializable();
+        m_cacheableHashMap = 
(Apache.Geode.Client.Generic.CacheableHashMap)CacheableHashMap.CreateDeserializable();
         m_cacheableDate = (CacheableDate)CacheableDate.CreateDeserializable();
-        m_cacheableVector = 
(GemStone.GemFire.Cache.Generic.CacheableVector)CacheableVector.CreateDeserializable();
-        m_cacheableObject = 
(GemStone.GemFire.Cache.Generic.CacheableObject)CacheableObject.CreateDeserializable();
+        m_cacheableVector = 
(Apache.Geode.Client.Generic.CacheableVector)CacheableVector.CreateDeserializable();
+        m_cacheableObject = 
(Apache.Geode.Client.Generic.CacheableObject)CacheableObject.CreateDeserializable();
       }
 
       m_cacheableBoolean.FromData(input);
@@ -187,7 +187,7 @@ namespace GemStone.GemFire.Cache.UnitTests
       get { return 100; }//need to implement
     }
 
-    public void ToData(GemStone.GemFire.Cache.Generic.DataOutput output)
+    public void ToData(Apache.Geode.Client.Generic.DataOutput output)
     {
       if (m_initialized)
       {
@@ -207,7 +207,7 @@ namespace GemStone.GemFire.Cache.UnitTests
 
     #endregion
 
-    public static GemStone.GemFire.Cache.Generic.IGFSerializable 
CreateDeserializable()
+    public static Apache.Geode.Client.Generic.IGFSerializable 
CreateDeserializable()
     {
       return new DefaultCacheable();
     }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DefaultCacheableN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DefaultCacheableN.cs 
b/src/clicache/integration-test/DefaultCacheableN.cs
index 7c78d45..1776e49 100644
--- a/src/clicache/integration-test/DefaultCacheableN.cs
+++ b/src/clicache/integration-test/DefaultCacheableN.cs
@@ -19,9 +19,9 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.Client.Generic;
 
   [Serializable]
   class CustomSerializableObject

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DistGetTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DistGetTests.cs 
b/src/clicache/integration-test/DistGetTests.cs
index a78533a..ce680bb 100644
--- a/src/clicache/integration-test/DistGetTests.cs
+++ b/src/clicache/integration-test/DistGetTests.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   public class DistGetTests : UnitTests

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DistOpsStepsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DistOpsStepsN.cs 
b/src/clicache/integration-test/DistOpsStepsN.cs
index e39432c..7e6b51e 100644
--- a/src/clicache/integration-test/DistOpsStepsN.cs
+++ b/src/clicache/integration-test/DistOpsStepsN.cs
@@ -21,12 +21,12 @@ using System.Threading;
 using System.Reflection;
 using System.Collections;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   public abstract class DistOpsSteps : UnitTests
   {
@@ -201,7 +201,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       {
         CreateEntry(regionName, key, val);
       }
-      catch (GemStone.GemFire.Cache.Generic.NotConnectedException ex)
+      catch (Apache.Geode.Client.Generic.NotConnectedException ex)
       {
         if (ex.InnerException is NoAvailableLocatorsException)
         {
@@ -269,7 +269,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       {
         checkVal = (string)region[key];
       }
-      catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException)
+      catch (Apache.Geode.Client.Generic.KeyNotFoundException)
       {
         // expected?
         //checkVal = (string)region[key];
@@ -485,11 +485,11 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       m_firstAppDomain = AppDomain.CreateDomain("FIRST_APPDOMAIN");
       m_secondAppDomain = AppDomain.CreateDomain("SECOND_APPDOMAIN");
 
-      m_chw_forFirstAppDomain = 
(CacheHelperWrapper)m_firstAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName,
 "GemStone.GemFire.Cache.UnitTests.NewAPI.CacheHelperWrapper");
-      m_chw_forSecondAppDomain = 
(CacheHelperWrapper)m_secondAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName,
 "GemStone.GemFire.Cache.UnitTests.NewAPI.CacheHelperWrapper");
+      m_chw_forFirstAppDomain = 
(CacheHelperWrapper)m_firstAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName,
 "Apache.Geode.Client.UnitTests.NewAPI.CacheHelperWrapper");
+      m_chw_forSecondAppDomain = 
(CacheHelperWrapper)m_secondAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName,
 "Apache.Geode.Client.UnitTests.NewAPI.CacheHelperWrapper");
 
-      m_putGetTests_forFirstAppDomain = 
(PutGetTestsAD)m_firstAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName,
 "GemStone.GemFire.Cache.UnitTests.NewAPI.PutGetTestsAD");
-      m_putGetTests_forSecondAppDomain = 
(PutGetTestsAD)m_secondAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName,
 "GemStone.GemFire.Cache.UnitTests.NewAPI.PutGetTestsAD");
+      m_putGetTests_forFirstAppDomain = 
(PutGetTestsAD)m_firstAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName,
 "Apache.Geode.Client.UnitTests.NewAPI.PutGetTestsAD");
+      m_putGetTests_forSecondAppDomain = 
(PutGetTestsAD)m_secondAppDomain.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName,
 "Apache.Geode.Client.UnitTests.NewAPI.PutGetTestsAD");
     }
 
     public void CloseCacheAD()
@@ -1331,7 +1331,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         Object val = region[1];
         Assert.Fail("Should have got KeyNotFoundException");
       }
-      catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException ex)
+      catch (Apache.Geode.Client.Generic.KeyNotFoundException ex)
       {
         Util.Log("Got expected KeyNotFoundException {0} ", ex);
       }
@@ -1347,7 +1347,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
           Assert.Fail("Should have got KeyNotFoundException");
         }
       }
-      catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException ex)
+      catch (Apache.Geode.Client.Generic.KeyNotFoundException ex)
       {
         Util.Log("Got expected KeyNotFoundException {0} ", ex);
       }
@@ -1359,7 +1359,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         Object val = region[1];
         Assert.Fail("Should have got KeyNotFoundException");
       }
-      catch (GemStone.GemFire.Cache.Generic.KeyNotFoundException ex)
+      catch (Apache.Geode.Client.Generic.KeyNotFoundException ex)
       {
         Util.Log("Got expected KeyNotFoundException {0} ", ex);
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DistOpsTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DistOpsTests.cs 
b/src/clicache/integration-test/DistOpsTests.cs
index ce73cf5..ae6ac4c 100644
--- a/src/clicache/integration-test/DistOpsTests.cs
+++ b/src/clicache/integration-test/DistOpsTests.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   public class DistOpsTests : DistOpsSteps

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DistributedSystemTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DistributedSystemTests.cs 
b/src/clicache/integration-test/DistributedSystemTests.cs
index b9f7108..441f057 100644
--- a/src/clicache/integration-test/DistributedSystemTests.cs
+++ b/src/clicache/integration-test/DistributedSystemTests.cs
@@ -17,10 +17,10 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   [Category("unicast_only")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DupListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DupListenerN.cs 
b/src/clicache/integration-test/DupListenerN.cs
index 957ae56..646c4b1 100644
--- a/src/clicache/integration-test/DupListenerN.cs
+++ b/src/clicache/integration-test/DupListenerN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   class DupListener<TKey, TVal> : ICacheListener<TKey, TVal>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/DurableListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DurableListenerN.cs 
b/src/clicache/integration-test/DurableListenerN.cs
index ceb0b34..5aff6df 100644
--- a/src/clicache/integration-test/DurableListenerN.cs
+++ b/src/clicache/integration-test/DurableListenerN.cs
@@ -19,12 +19,12 @@ using System;
 using System.Threading;
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client;
+  using Apache.Geode.Client.Generic;
   
   //using Com.Vmware.Cache;
   //using Region = Com.Vmware.Cache.IRegion<object, object>;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/ExpirationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ExpirationTestsN.cs 
b/src/clicache/integration-test/ExpirationTestsN.cs
index 3d42892..009bc1d 100644
--- a/src/clicache/integration-test/ExpirationTestsN.cs
+++ b/src/clicache/integration-test/ExpirationTestsN.cs
@@ -20,11 +20,11 @@ using System.Threading;
 using System.Collections.Generic;
 #pragma warning disable 618
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
   [TestFixture]
   [Category("group2")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/LogTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/LogTests.cs 
b/src/clicache/integration-test/LogTests.cs
index 7489844..45f2ec8 100644
--- a/src/clicache/integration-test/LogTests.cs
+++ b/src/clicache/integration-test/LogTests.cs
@@ -18,10 +18,10 @@
 using System;
 using System.IO;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
 
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/NetTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/NetTests.cs 
b/src/clicache/integration-test/NetTests.cs
index 2d68741..434caf5 100644
--- a/src/clicache/integration-test/NetTests.cs
+++ b/src/clicache/integration-test/NetTests.cs
@@ -18,10 +18,10 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   public class NetTests : UnitTests

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/OverflowTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/OverflowTestsN.cs 
b/src/clicache/integration-test/OverflowTestsN.cs
index 7836ea1..e389ca6 100644
--- a/src/clicache/integration-test/OverflowTestsN.cs
+++ b/src/clicache/integration-test/OverflowTestsN.cs
@@ -23,11 +23,11 @@ using System.Diagnostics;
 
 #pragma warning disable 618
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
   [TestFixture]
   [Category("group4")]
@@ -114,7 +114,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
     // Testing for attibute validation.
     private void ValidateAttributes(IRegion<object, object> region)
     {
-      GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> regAttr 
= region.Attributes;
+      Apache.Geode.Client.Generic.RegionAttributes<object, object> regAttr = 
region.Attributes;
       int initialCapacity = regAttr.InitialCapacity;
       Assert.AreEqual(1000, initialCapacity, "Expected initial capacity to be 
1000");
       Assert.AreEqual(DiskPolicyType.Overflows, regAttr.DiskPolicy,
@@ -288,8 +288,8 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
     [Test]
     public void OverflowPutGetManaged()
     {
-      IRegion<object, object> region = CreateOverflowRegion("OverFlowRegion", 
"Gemstone.Gemfire.Plugins.SqLite",
-        
"Gemstone.Gemfire.Plugins.SqLite.SqLiteImpl<System.Object,System.Object>.Create");
+      IRegion<object, object> region = CreateOverflowRegion("OverFlowRegion", 
"Apache.Geode.Plugins.SqLite",
+        
"Apache.Geode.Plugins.SqLite.SqLiteImpl<System.Object,System.Object>.Create");
       ValidateAttributes(region);
 
       //Console.WriteLine("TEST-2");
@@ -315,8 +315,8 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       String sqlite_dir = "SqLiteDir" + 
Process.GetCurrentProcess().Id.ToString();
       for (int i = 0; i < 10; i++)
       {
-        subRegion = CreateSubRegion(region, "SubRegion", 
"Gemstone.Gemfire.Plugins.SqLite",
-          
"Gemstone.Gemfire.Plugins.SqLite.SqLiteImpl<System.Object,System.Object>.Create");
+        subRegion = CreateSubRegion(region, "SubRegion", 
"Apache.Geode.Plugins.SqLite",
+          
"Apache.Geode.Plugins.SqLite.SqLiteImpl<System.Object,System.Object>.Create");
         subRegion.DestroyRegion();
         Assert.IsTrue(subRegion.IsDestroyed, "Expected region to be 
destroyed");
         Assert.IsFalse(File.Exists(GetSqLiteFileName(sqlite_dir, 
"SubRegion")), "Persistence file present after region destroy");
@@ -327,8 +327,8 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
     [Test]
     public void OverflowPutGetManagedMT()
     {
-      IRegion<object, object> region = CreateOverflowRegion("OverFlowRegion", 
"Gemstone.Gemfire.Plugins.SqLite",
-        
"Gemstone.Gemfire.Plugins.SqLite.SqLiteImpl<System.Object,System.Object>.Create");
+      IRegion<object, object> region = CreateOverflowRegion("OverFlowRegion", 
"Apache.Geode.Plugins.SqLite",
+        
"Apache.Geode.Plugins.SqLite.SqLiteImpl<System.Object,System.Object>.Create");
       ValidateAttributes(region);
 
       List<Thread> threadsList = new List<Thread>();
@@ -374,7 +374,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       String sqlite_dir = "SqLiteDir" + 
Process.GetCurrentProcess().Id.ToString();
       sqliteProperties.Insert("PersistenceDirectory", sqlite_dir);
 
-      //rf.SetPersistenceManager(new 
GemStone.GemFire.Plugins.SQLite.SqLiteImpl<object, object>(), sqliteProperties);
+      //rf.SetPersistenceManager(new 
Apache.Geode.Plugins.SQLite.SqLiteImpl<object, object>(), sqliteProperties);
       rf.SetPersistenceManager("SqLiteImpl", "createSqLiteInstance", 
sqliteProperties);
 
       CacheHelper.Init();
@@ -410,7 +410,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       IRegion<object, object> subRegion;
       for (int i = 0; i < 1; i++)
       {
-        subRegion = CreateSubRegion(region, "SubRegion", 
"Gemstone.Gemfire.Plugins.SqLite", "SqLiteImpl<object,object>.Create()");
+        subRegion = CreateSubRegion(region, "SubRegion", 
"Apache.Geode.Plugins.SqLite", "SqLiteImpl<object,object>.Create()");
         subRegion.DestroyRegion();
         Assert.IsTrue(subRegion.IsDestroyed, "Expected region to be 
destroyed");
         Assert.IsFalse(File.Exists(GetSqLiteFileName(sqlite_dir, 
"SubRegion")), "Persistence file present after region destroy");
@@ -490,7 +490,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
           Util.Log('\t' + rg.Name);
         }
 
-        GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> attrs 
= region1.Attributes;
+        Apache.Geode.Client.Generic.RegionAttributes<object, object> attrs = 
region1.Attributes;
         //Util.Log("Attributes of root region Root1 are: ");
 
         bool cachingEnabled = attrs.CachingEnabled;
@@ -532,7 +532,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
         Assert.AreNotEqual(0, pageSize.Length, "Persistence PageSize should 
not be empty.");
         Util.Log("****Attributes of Root1 are correctly set****");
 
-        GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> attrs2 
= region2.Attributes;
+        Apache.Geode.Client.Generic.RegionAttributes<object, object> attrs2 = 
region2.Attributes;
         string lib2 = attrs2.PersistenceLibrary;
         string libFun2 = attrs2.PersistenceFactory;
         Util.Log(" persistence library2 = " + lib2);
@@ -551,7 +551,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
 
         Util.Log("****Attributes of Root2 are correctly set****");
 
-        GemStone.GemFire.Cache.Generic.RegionAttributes<object, object> attrs3 
= region3.Attributes;
+        Apache.Geode.Client.Generic.RegionAttributes<object, object> attrs3 = 
region3.Attributes;
         //Util.Log("Attributes of root region Root1 are: ");
 
         Assert.IsTrue(attrs3.CachingEnabled);

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/PutGetPerfTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/PutGetPerfTests.cs 
b/src/clicache/integration-test/PutGetPerfTests.cs
index fe531ad..1e37210 100644
--- a/src/clicache/integration-test/PutGetPerfTests.cs
+++ b/src/clicache/integration-test/PutGetPerfTests.cs
@@ -17,10 +17,10 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   public class PutGetPerfTests : UnitTests

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/PutGetTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/PutGetTestsN.cs 
b/src/clicache/integration-test/PutGetTestsN.cs
index cf98449..236f7aa 100644
--- a/src/clicache/integration-test/PutGetTestsN.cs
+++ b/src/clicache/integration-test/PutGetTestsN.cs
@@ -18,13 +18,13 @@
 using System;
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  // using GemStone.GemFire.Cache; 
-  using GemStone.GemFire.Cache.Generic;
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  // using Apache.Geode.Client; 
+  using Apache.Geode.Client.Generic;
+  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   [TestFixture]
   [Category("group1")]
@@ -598,7 +598,7 @@ namespace GemStone.GemFire.Cache.UnitTests.NewAPI
       }
 
       Util.Log("Executing onRegion FE with custom key and custom 
partitionResolver");
-      GemStone.GemFire.Cache.Generic.Execution<object> exc = 
Generic.FunctionService<object>.OnRegion<TradeKey, object>(region);
+      Apache.Geode.Client.Generic.Execution<object> exc = 
Generic.FunctionService<object>.OnRegion<TradeKey, object>(region);
       Assert.IsTrue(exc != null, "onRegion Returned NULL");
 
       TradeKey[] filter = new TradeKey[901];

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/RegionEntryTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionEntryTests.cs 
b/src/clicache/integration-test/RegionEntryTests.cs
index 65f0d18..2cdc335 100644
--- a/src/clicache/integration-test/RegionEntryTests.cs
+++ b/src/clicache/integration-test/RegionEntryTests.cs
@@ -17,10 +17,10 @@
 
 using System;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
   [TestFixture]
   [Category("unicast_only")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/RegionOperationN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionOperationN.cs 
b/src/clicache/integration-test/RegionOperationN.cs
index b4a2aae..ee5ac23 100644
--- a/src/clicache/integration-test/RegionOperationN.cs
+++ b/src/clicache/integration-test/RegionOperationN.cs
@@ -2,13 +2,13 @@ using System;
 using System.Diagnostics;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
-  using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
   public class RegionOperation
   {
     protected IRegion<object, object> m_region;

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/RegionWrapperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionWrapperN.cs 
b/src/clicache/integration-test/RegionWrapperN.cs
index 97477a1..b58a4e2 100644
--- a/src/clicache/integration-test/RegionWrapperN.cs
+++ b/src/clicache/integration-test/RegionWrapperN.cs
@@ -20,12 +20,12 @@ using System.Diagnostics;
 using System.Threading;
 using System.Collections.Generic;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   public class RegionWrapper
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/SecurityTestUtilN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SecurityTestUtilN.cs 
b/src/clicache/integration-test/SecurityTestUtilN.cs
index f077ec7..b72d62e 100644
--- a/src/clicache/integration-test/SecurityTestUtilN.cs
+++ b/src/clicache/integration-test/SecurityTestUtilN.cs
@@ -20,13 +20,13 @@ using System.Collections.Generic;
 
 #pragma warning disable 618
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.Cache.Tests.NewAPI;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  using AssertionException = GemStone.GemFire.Cache.Generic.AssertionException;
+  using Apache.Geode.Client.Tests.NewAPI;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  using AssertionException = Apache.Geode.Client.Generic.AssertionException;
 
   /// <summary>
   /// Enumeration to indicate the result expected of an operation.

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/SerializationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SerializationTestsN.cs 
b/src/clicache/integration-test/SerializationTestsN.cs
index 6d71c45..fcb3584 100644
--- a/src/clicache/integration-test/SerializationTestsN.cs
+++ b/src/clicache/integration-test/SerializationTestsN.cs
@@ -20,11 +20,11 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
 
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/SystemPropertiesTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SystemPropertiesTestsN.cs 
b/src/clicache/integration-test/SystemPropertiesTestsN.cs
index 94c0961..a19f72f 100644
--- a/src/clicache/integration-test/SystemPropertiesTestsN.cs
+++ b/src/clicache/integration-test/SystemPropertiesTestsN.cs
@@ -18,11 +18,11 @@
 using System;
 using System.IO;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
 
   [TestFixture]
   [Category("group3")]

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/TallyListener.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyListener.cs 
b/src/clicache/integration-test/TallyListener.cs
index c3acb42..6a37cbf 100644
--- a/src/clicache/integration-test/TallyListener.cs
+++ b/src/clicache/integration-test/TallyListener.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests
+namespace Apache.Geode.Client.UnitTests
 {
-  using GemStone.GemFire.DUnitFramework;
+  using Apache.Geode.DUnitFramework;
 
-  class TallyListener : 
GemStone.GemFire.Cache.Generic.CacheListenerAdapter<Object, Object>
+  class TallyListener : 
Apache.Geode.Client.Generic.CacheListenerAdapter<Object, Object>
   {
     #region Private members
 
@@ -31,9 +31,9 @@ namespace GemStone.GemFire.Cache.UnitTests
     private int m_invalidates = 0;
     private int m_destroys = 0;
     private int m_clears = 0;
-    private GemStone.GemFire.Cache.Generic.ICacheableKey m_lastKey = null;
-    private GemStone.GemFire.Cache.Generic.IGFSerializable m_lastValue = null;
-    private GemStone.GemFire.Cache.Generic.IGFSerializable m_callbackArg = 
null;
+    private Apache.Geode.Client.Generic.ICacheableKey m_lastKey = null;
+    private Apache.Geode.Client.Generic.IGFSerializable m_lastValue = null;
+    private Apache.Geode.Client.Generic.IGFSerializable m_callbackArg = null;
     private bool m_ignoreTimeout = false;
     private bool m_quiet = false;
     private bool isListenerInvoke = false;
@@ -83,7 +83,7 @@ namespace GemStone.GemFire.Cache.UnitTests
       }
     }
 
-    public GemStone.GemFire.Cache.Generic.IGFSerializable LastKey
+    public Apache.Geode.Client.Generic.IGFSerializable LastKey
     {
       get
       {
@@ -107,7 +107,7 @@ namespace GemStone.GemFire.Cache.UnitTests
       }
     }
 
-    public GemStone.GemFire.Cache.Generic.IGFSerializable LastValue
+    public Apache.Geode.Client.Generic.IGFSerializable LastValue
     {
       get
       {
@@ -131,7 +131,7 @@ namespace GemStone.GemFire.Cache.UnitTests
       }
     }
 
-     public void SetCallBackArg(GemStone.GemFire.Cache.Generic.IGFSerializable 
callbackArg)
+     public void SetCallBackArg(Apache.Geode.Client.Generic.IGFSerializable 
callbackArg)
     {
       m_callbackArg = callbackArg;
     }
@@ -139,13 +139,13 @@ namespace GemStone.GemFire.Cache.UnitTests
 
     #endregion
 
-    public void 
CheckcallbackArg(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public void 
CheckcallbackArg(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
     {
       if (!isListenerInvoke)
         isListenerInvoke = true;
       if (m_callbackArg != null)
       {
-        GemStone.GemFire.Cache.Generic.IGFSerializable callbkArg = 
(GemStone.GemFire.Cache.Generic.IGFSerializable)ev.CallbackArgument;
+        Apache.Geode.Client.Generic.IGFSerializable callbkArg = 
(Apache.Geode.Client.Generic.IGFSerializable)ev.CallbackArgument;
         if (m_callbackArg.Equals(callbkArg))
           isCallbackCalled = true;
       }
@@ -234,11 +234,11 @@ namespace GemStone.GemFire.Cache.UnitTests
 
     #region ICacheListener Members
 
-    public override void 
AfterCreate(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public override void 
AfterCreate(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
     {
       m_creates++;
-      m_lastKey = (GemStone.GemFire.Cache.Generic.ICacheableKey)ev.Key;
-      m_lastValue = 
(GemStone.GemFire.Cache.Generic.IGFSerializable)ev.NewValue;
+      m_lastKey = (Apache.Geode.Client.Generic.ICacheableKey)ev.Key;
+      m_lastValue = (Apache.Geode.Client.Generic.IGFSerializable)ev.NewValue;
       CheckcallbackArg(ev);
 
       string keyString = m_lastKey.ToString();
@@ -253,11 +253,11 @@ namespace GemStone.GemFire.Cache.UnitTests
       }
     }
 
-    public override void 
AfterUpdate(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public override void 
AfterUpdate(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
     {
       m_updates++;
-      m_lastKey = (GemStone.GemFire.Cache.Generic.ICacheableKey)ev.Key;
-      m_lastValue = 
(GemStone.GemFire.Cache.Generic.IGFSerializable)ev.NewValue;
+      m_lastKey = (Apache.Geode.Client.Generic.ICacheableKey)ev.Key;
+      m_lastValue = (Apache.Geode.Client.Generic.IGFSerializable)ev.NewValue;
       CheckcallbackArg(ev);
      
       string keyString = m_lastKey.ToString();
@@ -271,29 +271,29 @@ namespace GemStone.GemFire.Cache.UnitTests
         WriteLog("TallyListener: done sleeping..");
       }
     }
-    public override void 
AfterDestroy(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public override void 
AfterDestroy(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
     {
       m_destroys++;
       CheckcallbackArg(ev);
     }
-    public override void 
AfterInvalidate(GemStone.GemFire.Cache.Generic.EntryEvent<Object, Object> ev)
+    public override void 
AfterInvalidate(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
     {
       m_invalidates++;
       CheckcallbackArg(ev);
     }
 
-    public override void 
AfterRegionDestroy(GemStone.GemFire.Cache.Generic.RegionEvent<Object, Object> 
ev) { }
+    public override void 
AfterRegionDestroy(Apache.Geode.Client.Generic.RegionEvent<Object, Object> ev) 
{ }
 
-    public override void 
AfterRegionClear(GemStone.GemFire.Cache.Generic.RegionEvent<Object, Object> ev) 
+    public override void 
AfterRegionClear(Apache.Geode.Client.Generic.RegionEvent<Object, Object> ev) 
     { 
         m_clears++;
     }
 
-    public override void 
AfterRegionInvalidate(GemStone.GemFire.Cache.Generic.RegionEvent<Object, 
Object> ev) { }
+    public override void 
AfterRegionInvalidate(Apache.Geode.Client.Generic.RegionEvent<Object, Object> 
ev) { }
 
-    public override void 
AfterRegionLive(GemStone.GemFire.Cache.Generic.RegionEvent<Object, Object> ev) 
{ }
+    public override void 
AfterRegionLive(Apache.Geode.Client.Generic.RegionEvent<Object, Object> ev) { }
 
-    public override void Close(GemStone.GemFire.Cache.Generic.IRegion<Object, 
Object> region) { }
+    public override void Close(Apache.Geode.Client.Generic.IRegion<Object, 
Object> region) { }
 
     #endregion
   }

http://git-wip-us.apache.org/repos/asf/geode/blob/c5454e83/src/clicache/integration-test/TallyListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyListenerN.cs 
b/src/clicache/integration-test/TallyListenerN.cs
index 35454cc..40c40c4 100644
--- a/src/clicache/integration-test/TallyListenerN.cs
+++ b/src/clicache/integration-test/TallyListenerN.cs
@@ -18,11 +18,11 @@
 using System;
 using System.Threading;
 
-namespace GemStone.GemFire.Cache.UnitTests.NewAPI
+namespace Apache.Geode.Client.UnitTests.NewAPI
 {
-  using GemStone.GemFire.DUnitFramework;
-  using GemStone.GemFire.Cache.Generic;
-  //using Region = GemStone.GemFire.Cache.Generic.IRegion<Object, Object>;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client.Generic;
+  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
 
   class TallyListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal>
   {

Reply via email to