geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [35/50] [abbrv] geode git commit: GEODE-2316: Removed namespace Apache.Geode.Client.Generic.
Date Mon, 23 Jan 2017 19:17:27 GMT
GEODE-2316: Removed namespace Apache.Geode.Client.Generic.


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

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 649e4a875e10380d64b72797346a8492ab23ddd9
Parents: c5454e8
Author: Jacob Barrett <jbarrett@pivotal.io>
Authored: Fri Jan 20 17:20:31 2017 -0800
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Mon Jan 23 11:15:38 2017 -0800

----------------------------------------------------------------------
 examples/clicache/CacheRunner/ComplexNumber.cs  |  10 +-
 src/clicache/include/gfcli/Utils.hpp            |  10 +-
 .../integration-test/AttributesFactoryTestsN.cs |   4 +-
 .../integration-test/AttributesMutatorTestsN.cs |   6 +-
 .../BuiltinCacheableWrappersN.cs                |   2 +-
 src/clicache/integration-test/CacheHelperN.cs   |   8 +-
 .../integration-test/CacheableWrapperN.cs       |   2 +-
 .../integration-test/CachelessTestsN.cs         |   2 +-
 .../integration-test/DataOutputTests.cs         |   2 +-
 .../integration-test/DefaultCacheable.cs        |  96 +--
 .../integration-test/DefaultCacheableN.cs       |   2 +-
 src/clicache/integration-test/DistOpsStepsN.cs  |  14 +-
 src/clicache/integration-test/DupListenerN.cs   |   4 +-
 .../integration-test/DurableListenerN.cs        |   2 +-
 .../integration-test/ExpirationTestsN.cs        |   2 +-
 src/clicache/integration-test/OverflowTestsN.cs |  10 +-
 src/clicache/integration-test/PutGetTestsN.cs   |   8 +-
 .../integration-test/RegionOperationN.cs        |   4 +-
 src/clicache/integration-test/RegionWrapperN.cs |   4 +-
 .../integration-test/SecurityTestUtilN.cs       |   4 +-
 .../integration-test/SerializationTestsN.cs     |   2 +-
 .../integration-test/SystemPropertiesTestsN.cs  |   2 +-
 src/clicache/integration-test/TallyListener.cs  |  44 +-
 src/clicache/integration-test/TallyListenerN.cs |   4 +-
 src/clicache/integration-test/TallyLoaderN.cs   |   2 +-
 src/clicache/integration-test/TallyResolverN.cs |   2 +-
 src/clicache/integration-test/TallyWriter.cs    |  28 +-
 src/clicache/integration-test/TallyWriterN.cs   |   2 +-
 .../ThinClientAppDomainQueryTests.cs            |   4 +-
 .../integration-test/ThinClientCSTXN.cs         |   4 +-
 .../integration-test/ThinClientCallbackArgN.cs  |   4 +-
 .../ThinClientConflationTestsN.cs               |   2 +-
 .../integration-test/ThinClientCqIRTestsN.cs    |   4 +-
 .../integration-test/ThinClientCqTestsN.cs      |   4 +-
 .../integration-test/ThinClientDeltaTestN.cs    |   4 +-
 .../integration-test/ThinClientDocExamplesN.cs  |   6 +-
 .../ThinClientDurableCqTestsN.cs                |  16 +-
 .../integration-test/ThinClientDurableTestsN.cs |   4 +-
 .../ThinClientFunctionExecutionTestsN.cs        |  70 +--
 .../ThinClientHARegionTestsN.cs                 |   4 +-
 .../ThinClientListenerWriterN.cs                |   4 +-
 .../integration-test/ThinClientPdxTests.cs      |  24 +-
 .../integration-test/ThinClientPoolTestsN.cs    |   6 +-
 .../integration-test/ThinClientQueryTestsN.cs   |   4 +-
 .../ThinClientRegionInterestTestsN.cs           |   2 +-
 .../integration-test/ThinClientRegionStepsN.cs  |  18 +-
 .../integration-test/ThinClientRegionTestsN.cs  |   4 +-
 .../ThinClientSecurityAuthTestsMUN.cs           |   2 +-
 .../ThinClientSecurityAuthTestsN.cs             |   2 +-
 .../ThinClientSecurityAuthzTestBaseN.cs         |  20 +-
 .../ThinClientSecurityAuthzTestsMUN.cs          |   2 +-
 .../ThinClientSecurityAuthzTestsN.cs            |   2 +-
 .../ThinClientStatisticTestsN.cs                |   2 +-
 .../ThinClientStringArrayTestsN.cs              |   4 +-
 src/clicache/integration-test/UnitTestsN.cs     |   4 +-
 src/clicache/src/AttributesFactory.cpp          |  24 +-
 src/clicache/src/AttributesFactory.hpp          |   9 +-
 src/clicache/src/AttributesMutator.cpp          |   9 +-
 src/clicache/src/AttributesMutator.hpp          |   9 +-
 src/clicache/src/Cache.cpp                      |  45 +-
 src/clicache/src/Cache.hpp                      |  22 +-
 src/clicache/src/CacheFactory.cpp               |  17 +-
 src/clicache/src/CacheFactory.hpp               |  10 +-
 src/clicache/src/CacheListenerAdapter.hpp       |  13 +-
 src/clicache/src/CacheStatistics.cpp            |   9 +-
 src/clicache/src/CacheStatistics.hpp            |   9 +-
 src/clicache/src/CacheTransactionManager.cpp    |  28 +-
 src/clicache/src/CacheTransactionManager.hpp    |  28 +-
 src/clicache/src/CacheWriterAdapter.hpp         |   9 +-
 src/clicache/src/CacheableArrayList.hpp         |  11 +-
 src/clicache/src/CacheableBuiltins.hpp          |  11 +-
 src/clicache/src/CacheableDate.cpp              |  11 +-
 src/clicache/src/CacheableDate.hpp              |  11 +-
 src/clicache/src/CacheableFileName.cpp          |  11 +-
 src/clicache/src/CacheableFileName.hpp          |  11 +-
 src/clicache/src/CacheableHashMap.cpp           |  18 +-
 src/clicache/src/CacheableHashMap.hpp           |  11 +-
 src/clicache/src/CacheableHashSet.hpp           |  23 +-
 src/clicache/src/CacheableHashTable.hpp         |  10 +-
 src/clicache/src/CacheableIdentityHashMap.hpp   |  11 +-
 src/clicache/src/CacheableKey.cpp               |  15 +-
 src/clicache/src/CacheableKey.hpp               |  15 +-
 src/clicache/src/CacheableLinkedList.hpp        |  11 +-
 src/clicache/src/CacheableObject.cpp            |  11 +-
 src/clicache/src/CacheableObject.hpp            |  11 +-
 src/clicache/src/CacheableObjectArray.cpp       |  12 +-
 src/clicache/src/CacheableObjectArray.hpp       |   9 +-
 src/clicache/src/CacheableObjectXml.cpp         |  11 +-
 src/clicache/src/CacheableObjectXml.hpp         |  11 +-
 src/clicache/src/CacheableStack.cpp             |  11 +-
 src/clicache/src/CacheableStack.hpp             |  11 +-
 src/clicache/src/CacheableString.cpp            |  12 +-
 src/clicache/src/CacheableString.hpp            |  13 +-
 src/clicache/src/CacheableStringArray.cpp       |   9 +-
 src/clicache/src/CacheableStringArray.hpp       |  11 +-
 src/clicache/src/CacheableUndefined.cpp         |  11 +-
 src/clicache/src/CacheableUndefined.hpp         |  11 +-
 src/clicache/src/CacheableVector.cpp            |  11 +-
 src/clicache/src/CacheableVector.hpp            |  11 +-
 src/clicache/src/CqAttributes.cpp               |  10 +-
 src/clicache/src/CqAttributes.hpp               |  12 +-
 src/clicache/src/CqAttributesFactory.cpp        |  18 +-
 src/clicache/src/CqAttributesFactory.hpp        |  17 +-
 src/clicache/src/CqAttributesMutator.cpp        |  25 +-
 src/clicache/src/CqAttributesMutator.hpp        |  23 +-
 src/clicache/src/CqEvent.cpp                    |  10 +-
 src/clicache/src/CqEvent.hpp                    |  10 +-
 src/clicache/src/CqListener.hpp                 |  10 +-
 src/clicache/src/CqOperation.hpp                |  10 +-
 src/clicache/src/CqQuery.cpp                    |   9 +-
 src/clicache/src/CqQuery.hpp                    |  10 +-
 src/clicache/src/CqServiceStatistics.cpp        |  11 +-
 src/clicache/src/CqServiceStatistics.hpp        |   9 +-
 src/clicache/src/CqState.cpp                    |   9 +-
 src/clicache/src/CqState.hpp                    |   9 +-
 src/clicache/src/CqStatistics.cpp               |  11 +-
 src/clicache/src/CqStatistics.hpp               |   9 +-
 src/clicache/src/DataInput.cpp                  |  11 +-
 src/clicache/src/DataInput.hpp                  |  12 +-
 src/clicache/src/DataOutput.cpp                 |  14 +-
 src/clicache/src/DataOutput.hpp                 |  12 +-
 src/clicache/src/DiskPolicyType.hpp             |   9 +-
 src/clicache/src/DistributedSystem.cpp          |  21 +-
 src/clicache/src/DistributedSystem.hpp          |  17 +-
 src/clicache/src/EntryEvent.cpp                 |  11 +-
 src/clicache/src/EntryEvent.hpp                 |  10 +-
 src/clicache/src/ExceptionTypes.cpp             |  10 +-
 src/clicache/src/ExceptionTypes.hpp             |  11 +-
 src/clicache/src/Execution.cpp                  |  12 +-
 src/clicache/src/Execution.hpp                  |  11 +-
 src/clicache/src/ExpirationAction.hpp           |   9 +-
 src/clicache/src/FunctionService.cpp            |  29 +-
 src/clicache/src/FunctionService.hpp            |  10 +-
 src/clicache/src/GemFireClassIds.hpp            |   9 +-
 src/clicache/src/IAuthInitialize.hpp            |  11 +-
 src/clicache/src/ICacheListener.hpp             |  10 +-
 src/clicache/src/ICacheLoader.hpp               |  10 +-
 src/clicache/src/ICacheWriter.hpp               |  10 +-
 src/clicache/src/ICacheableKey.hpp              |   9 +-
 src/clicache/src/ICqAttributes.hpp              |   9 +-
 src/clicache/src/ICqEvent.hpp                   |  11 +-
 src/clicache/src/ICqListener.hpp                |   9 +-
 src/clicache/src/ICqResults.hpp                 |   9 +-
 src/clicache/src/ICqStatusListener.hpp          |  10 +-
 src/clicache/src/IFixedPartitionResolver.hpp    |  11 +-
 src/clicache/src/IGFDelta.hpp                   |   9 +-
 src/clicache/src/IGFSerializable.hpp            |  10 +-
 src/clicache/src/IGemFireCache.hpp              |  17 +-
 src/clicache/src/IPartitionResolver.hpp         |  10 +-
 src/clicache/src/IPdxInstance.hpp               |  11 +-
 src/clicache/src/IPdxInstanceFactory.hpp        |  11 +-
 src/clicache/src/IPdxReader.hpp                 |  11 +-
 src/clicache/src/IPdxSerializable.hpp           |  11 +-
 src/clicache/src/IPdxSerializer.hpp             |  11 +-
 src/clicache/src/IPdxTypeMapper.hpp             |  11 +-
 src/clicache/src/IPdxUnreadFields.hpp           |  11 +-
 src/clicache/src/IPdxWriter.hpp                 |  11 +-
 src/clicache/src/IPersistenceManager.hpp        |  10 +-
 src/clicache/src/IRegion.hpp                    |  24 +-
 src/clicache/src/IRegionService.hpp             |  13 +-
 src/clicache/src/IResultCollector.hpp           |  10 +-
 src/clicache/src/ISelectResults.hpp             |  15 +-
 src/clicache/src/ISubscriptionService.hpp       |  12 +-
 src/clicache/src/ITransactionListener.hpp       |  10 +-
 src/clicache/src/ITransactionWriter.hpp         |  10 +-
 src/clicache/src/IWritablePdxInstance.hpp       |  11 +-
 src/clicache/src/LocalRegion.cpp                |  27 +-
 src/clicache/src/LocalRegion.hpp                |  22 +-
 src/clicache/src/Log.cpp                        |  11 +-
 src/clicache/src/Log.hpp                        |  10 +-
 src/clicache/src/PdxIdentityFieldAttribute.hpp  |  10 +-
 src/clicache/src/Pool.cpp                       |  11 +-
 src/clicache/src/Pool.hpp                       |  12 +-
 src/clicache/src/PoolFactory.cpp                |  10 +-
 src/clicache/src/PoolFactory.hpp                |  11 +-
 src/clicache/src/PoolManager.cpp                |  13 +-
 src/clicache/src/PoolManager.hpp                |  12 +-
 src/clicache/src/Properties.cpp                 |  21 +-
 src/clicache/src/Properties.hpp                 |  25 +-
 src/clicache/src/Query.cpp                      |   9 +-
 src/clicache/src/Query.hpp                      |   9 +-
 src/clicache/src/QueryService.cpp               |  10 +-
 src/clicache/src/QueryService.hpp               |  13 +-
 .../src/ReflectionBasedAutoSerializer.cpp       |  15 +-
 .../src/ReflectionBasedAutoSerializer.hpp       |  11 +-
 src/clicache/src/Region.cpp                     |  29 +-
 src/clicache/src/Region.hpp                     |  31 +-
 src/clicache/src/RegionAttributes.cpp           | 104 ++--
 src/clicache/src/RegionAttributes.hpp           |  16 +-
 src/clicache/src/RegionEntry.cpp                |  15 +-
 src/clicache/src/RegionEntry.hpp                |  17 +-
 src/clicache/src/RegionEvent.cpp                |  13 +-
 src/clicache/src/RegionEvent.hpp                |  17 +-
 src/clicache/src/RegionFactory.cpp              |  31 +-
 src/clicache/src/RegionFactory.hpp              |  15 +-
 src/clicache/src/RegionShortcut.hpp             |  10 +-
 src/clicache/src/ResultCollector.cpp            |  10 +-
 src/clicache/src/ResultCollector.hpp            |   9 +-
 src/clicache/src/ResultSet.cpp                  |   9 +-
 src/clicache/src/ResultSet.hpp                  |  10 +-
 src/clicache/src/SelectResultsIterator.cpp      |  13 +-
 src/clicache/src/SelectResultsIterator.hpp      |  22 +-
 src/clicache/src/Serializable.cpp               | 274 +++++----
 src/clicache/src/Serializable.hpp               |  73 ++-
 src/clicache/src/StatisticDescriptor.cpp        |  10 +-
 src/clicache/src/StatisticDescriptor.hpp        |  10 +-
 src/clicache/src/Statistics.cpp                 |  11 +-
 src/clicache/src/Statistics.hpp                 |  13 +-
 src/clicache/src/StatisticsFactory.cpp          |  11 +-
 src/clicache/src/StatisticsFactory.hpp          |  10 +-
 src/clicache/src/StatisticsType.cpp             |  11 +-
 src/clicache/src/StatisticsType.hpp             |  11 +-
 src/clicache/src/Struct.cpp                     |  10 +-
 src/clicache/src/Struct.hpp                     |  43 +-
 src/clicache/src/StructSet.cpp                  |  13 +-
 src/clicache/src/StructSet.hpp                  |  18 +-
 src/clicache/src/SystemProperties.cpp           |  10 +-
 src/clicache/src/SystemProperties.hpp           |  11 +-
 src/clicache/src/TransactionEvent.cpp           |  18 +-
 src/clicache/src/TransactionEvent.hpp           |  20 +-
 src/clicache/src/TransactionId.hpp              |  12 +-
 src/clicache/src/TransactionListenerAdapter.hpp |  17 +-
 src/clicache/src/TransactionWriterAdapte.hpp    |  11 +-
 .../src/UserFunctionExecutionException.cpp      |  11 +-
 .../src/UserFunctionExecutionException.hpp      |  10 +-
 src/clicache/src/Utils.cpp                      |  10 +-
 src/clicache/src/gf_defs.hpp                    |   2 +-
 src/clicache/src/impl/AppDomainContext.cpp      |  10 +-
 src/clicache/src/impl/AppDomainContext.hpp      |   8 +-
 src/clicache/src/impl/AuthenticatedCache.cpp    |  18 +-
 src/clicache/src/impl/AuthenticatedCache.hpp    |  10 +-
 src/clicache/src/impl/CacheListener.hpp         |  50 +-
 src/clicache/src/impl/CacheLoader.hpp           |  12 +-
 src/clicache/src/impl/CacheWriter.hpp           |  36 +-
 src/clicache/src/impl/CliCallbackDelgate.hpp    |  14 +-
 src/clicache/src/impl/CqListenerProxy.hpp       |  16 +-
 src/clicache/src/impl/CqStatusListenerProxy.hpp |  17 +-
 src/clicache/src/impl/DelegateWrapper.hpp       |  10 +-
 src/clicache/src/impl/DotNetTypes.hpp           |  11 +-
 src/clicache/src/impl/EnumInfo.cpp              |  13 +-
 src/clicache/src/impl/EnumInfo.hpp              |  11 +-
 .../src/impl/FixedPartitionResolver.hpp         |  10 +-
 src/clicache/src/impl/GFDataInputStream.hpp     |  10 +-
 src/clicache/src/impl/GFDataOutputStream.hpp    |  11 +-
 src/clicache/src/impl/GFNullStream.hpp          |  10 +-
 src/clicache/src/impl/ManagedAuthInitialize.cpp |  26 +-
 src/clicache/src/impl/ManagedAuthInitialize.hpp |   8 +-
 src/clicache/src/impl/ManagedCacheListener.cpp  |  84 +--
 src/clicache/src/impl/ManagedCacheListener.hpp  |  17 +-
 src/clicache/src/impl/ManagedCacheLoader.cpp    |  28 +-
 src/clicache/src/impl/ManagedCacheLoader.hpp    |   4 +-
 src/clicache/src/impl/ManagedCacheWriter.cpp    |  60 +-
 src/clicache/src/impl/ManagedCacheWriter.hpp    |  17 +-
 src/clicache/src/impl/ManagedCacheableDelta.cpp |  60 +-
 src/clicache/src/impl/ManagedCacheableDelta.hpp |  25 +-
 .../src/impl/ManagedCacheableDeltaBytes.cpp     | 132 ++--
 .../src/impl/ManagedCacheableDeltaBytes.hpp     |  31 +-
 src/clicache/src/impl/ManagedCacheableKey.cpp   |  66 +-
 src/clicache/src/impl/ManagedCacheableKey.hpp   |   8 +-
 .../src/impl/ManagedCacheableKeyBytes.cpp       |  92 +--
 .../src/impl/ManagedCacheableKeyBytes.hpp       |  23 +-
 src/clicache/src/impl/ManagedCqListener.cpp     |  26 +-
 src/clicache/src/impl/ManagedCqListener.hpp     |   6 +-
 .../src/impl/ManagedCqStatusListener.cpp        |  34 +-
 .../src/impl/ManagedCqStatusListener.hpp        |   6 +-
 .../src/impl/ManagedFixedPartitionResolver.cpp  |  32 +-
 .../src/impl/ManagedFixedPartitionResolver.hpp  |   6 +-
 .../src/impl/ManagedPartitionResolver.cpp       |  28 +-
 .../src/impl/ManagedPartitionResolver.hpp       |   6 +-
 .../src/impl/ManagedPersistenceManager.cpp      |  20 +-
 .../src/impl/ManagedPersistenceManager.hpp      |   4 +-
 .../src/impl/ManagedResultCollector.cpp         |  36 +-
 .../src/impl/ManagedResultCollector.hpp         |   6 +-
 src/clicache/src/impl/ManagedString.hpp         |   8 +-
 .../src/impl/ManagedTransactionListener.cpp     |  36 +-
 .../src/impl/ManagedTransactionWriter.cpp       |  22 +-
 src/clicache/src/impl/ManagedVisitor.cpp        |   4 +-
 src/clicache/src/impl/MemoryPressureHandler.cpp |  11 +-
 src/clicache/src/impl/MemoryPressureHandler.hpp |   9 +-
 src/clicache/src/impl/NativeWrapper.hpp         |  11 +-
 src/clicache/src/impl/PartitionResolver.hpp     |  10 +-
 src/clicache/src/impl/PdxFieldType.cpp          |  11 +-
 src/clicache/src/impl/PdxFieldType.hpp          |  11 +-
 src/clicache/src/impl/PdxHelper.cpp             |  11 +-
 src/clicache/src/impl/PdxHelper.hpp             |  11 +-
 .../src/impl/PdxInstanceFactoryImpl.cpp         |  11 +-
 .../src/impl/PdxInstanceFactoryImpl.hpp         |  11 +-
 src/clicache/src/impl/PdxInstanceImpl.cpp       |  14 +-
 src/clicache/src/impl/PdxInstanceImpl.hpp       |  11 +-
 src/clicache/src/impl/PdxLocalReader.cpp        |  10 +-
 src/clicache/src/impl/PdxLocalReader.hpp        |  11 +-
 src/clicache/src/impl/PdxLocalWriter.cpp        |  11 +-
 src/clicache/src/impl/PdxLocalWriter.hpp        |  11 +-
 .../src/impl/PdxManagedCacheableKey.cpp         |  74 +--
 .../src/impl/PdxManagedCacheableKey.hpp         |  25 +-
 .../src/impl/PdxManagedCacheableKeyBytes.cpp    | 144 ++---
 .../src/impl/PdxManagedCacheableKeyBytes.hpp    |  27 +-
 .../src/impl/PdxReaderWithTypeCollector.cpp     |  11 +-
 .../src/impl/PdxReaderWithTypeCollector.hpp     |  11 +-
 .../src/impl/PdxRemotePreservedData.hpp         |  11 +-
 src/clicache/src/impl/PdxRemoteReader.cpp       |  11 +-
 src/clicache/src/impl/PdxRemoteReader.hpp       |  11 +-
 src/clicache/src/impl/PdxRemoteWriter.cpp       | 596 +++++++++----------
 src/clicache/src/impl/PdxRemoteWriter.hpp       |  11 +-
 src/clicache/src/impl/PdxType.cpp               | 300 +++++-----
 src/clicache/src/impl/PdxType.hpp               |  11 +-
 src/clicache/src/impl/PdxTypeRegistry.cpp       |  11 +-
 src/clicache/src/impl/PdxTypeRegistry.hpp       |  11 +-
 src/clicache/src/impl/PdxWrapper.hpp            |  10 +-
 .../src/impl/PdxWriterWithTypeCollector.cpp     |  11 +-
 .../src/impl/PdxWriterWithTypeCollector.hpp     |  11 +-
 .../src/impl/PersistenceManagerProxy.hpp        |  11 +-
 src/clicache/src/impl/ResultCollectorProxy.hpp  |  11 +-
 src/clicache/src/impl/SafeConvert.hpp           |  69 ++-
 src/clicache/src/impl/TransactionListener.hpp   |  20 +-
 src/clicache/src/impl/TransactionWriter.hpp     |  16 +-
 src/clicache/src/impl/WeakhashMap.hpp           |  11 +-
 .../gemfire/plugins/sqlite/SqLiteImpl.cs        |   2 +-
 .../security/csharp/UserPasswordAuthInit.cs     |   4 +-
 src/tests/cli/FwkUtil/FwkData.cs                |  42 +-
 src/tests/cli/NativeWrapper/ManagedWrapper.cpp  |   6 +-
 src/tests/cli/NativeWrapper/ManagedWrapper.hpp  |   6 +-
 src/tests/cli/NativeWrapper/NativeType.cpp      |   8 +-
 src/tests/cli/NewFwkLib/CacheHelper.cs          |  12 +-
 src/tests/cli/NewFwkLib/CacheServer.cs          |  36 +-
 .../DeltaTest/DeltaClientValidationListener.cs  |   6 +-
 src/tests/cli/NewFwkLib/DeltaTest/DeltaTest.cs  |   2 +-
 .../NewFwkLib/DurableTest/DurableClientTests.cs |   4 +-
 .../NewFwkLib/DurableTest/DurableListener.cs    |   2 +-
 .../DurableTest/DurablePerfListener.cs          |   2 +-
 .../FunctionExecution/FunctionExecution.cs      | 102 ++--
 .../FunctionExecution/MyResultCollector.cs      |   6 +-
 src/tests/cli/NewFwkLib/FwkTest.cs              |   6 +-
 src/tests/cli/NewFwkLib/PdxTest/PdxTests.cs     |  18 +-
 src/tests/cli/NewFwkLib/PerfTest/DupChecker.cs  |   4 +-
 .../cli/NewFwkLib/PerfTest/LatencyListener.cs   |   4 +-
 src/tests/cli/NewFwkLib/PerfTest/PerfTasks.cs   |   8 +-
 .../NewFwkLib/PerfTest/PerfTestCacheListener.cs |   4 +-
 src/tests/cli/NewFwkLib/PerfTest/PerfTests.cs   |   8 +-
 src/tests/cli/NewFwkLib/QueryTest/QueryTests.cs |   8 +-
 .../cli/NewFwkLib/ResumableTx/ResumableTx.cs    |   6 +-
 src/tests/cli/NewFwkLib/ResumableTx/TxInfo.cs   |   2 +-
 .../cli/NewFwkLib/SmokePerf/ObjectHelper.cs     |   2 +-
 src/tests/cli/NewFwkLib/SmokePerf/PerfStat.cs   |   2 +-
 src/tests/cli/NewFwkLib/SmokePerf/SmokePerf.cs  |   4 +-
 src/tests/cli/NewFwkLib/SmokePerf/SmokeTasks.cs |   4 +-
 src/tests/cli/NewFwkLib/Utils.cs                |   2 +-
 src/tests/cli/NewTestObject/ArrayOfByte.cs      |   2 +-
 src/tests/cli/NewTestObject/BatchObject.cs      |   2 +-
 src/tests/cli/NewTestObject/DeltaEx.cs          |  14 +-
 .../cli/NewTestObject/DeltaFastAssetAccount.cs  |   2 +-
 src/tests/cli/NewTestObject/DeltaPSTObject.cs   |   2 +-
 src/tests/cli/NewTestObject/DeltaTestImpl.cs    |   2 +-
 src/tests/cli/NewTestObject/EqStruct.cs         |   2 +-
 src/tests/cli/NewTestObject/FastAsset.cs        |   2 +-
 src/tests/cli/NewTestObject/FastAssetAccount.cs |   2 +-
 src/tests/cli/NewTestObject/NoopAuthInit.cs     |   2 +-
 src/tests/cli/NewTestObject/PSTObject.cs        |   2 +-
 .../cli/NewTestObject/PdxAutoSerializerObj.cs   |   2 +-
 src/tests/cli/NewTestObject/Portfolio.cs        |   2 +-
 src/tests/cli/NewTestObject/PortfolioPdx.cs     |   2 +-
 src/tests/cli/NewTestObject/Position.cs         |   2 +-
 src/tests/cli/NewTestObject/PositionPdx.cs      |   2 +-
 .../cli/NewTestObject/SimpleCacheListener.cs    |   2 +-
 src/tests/cli/NewTestObject/TestObject1.cs      |   2 +-
 src/tests/cli/NewTestObject/TimeStampdObject.cs |   2 +-
 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    |  10 +-
 src/tests/cli/PkcsWrapper/PkcsAuthInitMN.hpp    |   8 +-
 src/tests/cli/QueryHelper/QueryHelperN.cs       |   4 +-
 src/tests/cli/QueryHelper/QueryStringsM.cpp     |   4 +-
 src/tests/cli/QueryHelper/QueryStringsM.hpp     |   2 +-
 .../SecurityUtil/AuthzCredentialGeneratorN.cs   |   2 +-
 .../cli/SecurityUtil/CredentialGeneratorN.cs    |   2 +-
 .../cli/SecurityUtil/DummyAuthorization3N.cs    |   2 +-
 .../SecurityUtil/LdapCredentialGeneratorN.cs    |   2 +-
 .../SecurityUtil/PKCSCredentialGeneratorN.cs    |   2 +-
 .../XmlAuthzCredentialGeneratorN.cs             |   2 +-
 384 files changed, 3000 insertions(+), 3468 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/include/gfcli/Utils.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/include/gfcli/Utils.hpp b/src/clicache/include/gfcli/Utils.hpp
index 210a64a..8f4d4bd 100644
--- a/src/clicache/include/gfcli/Utils.hpp
+++ b/src/clicache/include/gfcli/Utils.hpp
@@ -34,8 +34,6 @@ namespace Apache
   {
     namespace Client
     {
-namespace Generic
-			{
 
     /// <summary>
     /// Some static utility methods.
@@ -84,7 +82,7 @@ namespace Generic
 						int32_t get( );
 					}
 				};
-			}
-		}
-  }
-}
+    }  // namespace Client
+  }  // namespace Geode
+}  // namespace Apache
+

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/AttributesFactoryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/AttributesFactoryTestsN.cs b/src/clicache/integration-test/AttributesFactoryTestsN.cs
index c8d3d88..749a56d 100644
--- a/src/clicache/integration-test/AttributesFactoryTestsN.cs
+++ b/src/clicache/integration-test/AttributesFactoryTestsN.cs
@@ -25,8 +25,8 @@
 //  using NUnit.Framework;
 //  using Apache.Geode.DUnitFramework;
 // // using Apache.Geode.Client; 
-//  using Apache.Geode.Client.Generic;
-//  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+//  using Apache.Geode.Client;
+//  //using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
 //  [TestFixture]
 //  [Category("group1")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/AttributesMutatorTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/AttributesMutatorTestsN.cs b/src/clicache/integration-test/AttributesMutatorTestsN.cs
index 572a6a8..ac6138e 100644
--- a/src/clicache/integration-test/AttributesMutatorTestsN.cs
+++ b/src/clicache/integration-test/AttributesMutatorTestsN.cs
@@ -24,9 +24,9 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
-  using GIRegion = Apache.Geode.Client.Generic.IRegion<string, string>;
+  using GIRegion = Apache.Geode.Client.IRegion<string, string>;
 
   class ThinClientTallyLoader : TallyLoader<string, string>
   {
@@ -267,7 +267,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         IRegion<string, int> region = CacheHelper.CreateLocalRegionWithETTL<string, int>(RegionName,
           ExpirationAction.LocalInvalidate, TimeToLive);
 
-        Apache.Geode.Client.Generic.RegionAttributes<string, int> newAttrs = region.Attributes;
+        Apache.Geode.Client.RegionAttributes<string, int> newAttrs = region.Attributes;
         int ttl = newAttrs.EntryTimeToLive;
         Assert.AreEqual(TimeToLive, ttl);
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/BuiltinCacheableWrappersN.cs b/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
index 3d53e68..e12fc40 100644
--- a/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
+++ b/src/clicache/integration-test/BuiltinCacheableWrappersN.cs
@@ -22,7 +22,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   
   #region Helper class
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/CacheHelperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheHelperN.cs b/src/clicache/integration-test/CacheHelperN.cs
index dc86c2f..e773d75 100644
--- a/src/clicache/integration-test/CacheHelperN.cs
+++ b/src/clicache/integration-test/CacheHelperN.cs
@@ -29,7 +29,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   using System.Management;
 
   public class PropsStringToObject
@@ -711,7 +711,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
     #region Functions to create or destroy a region
 
-    public static IRegion<TKey, TValue> CreateRegion<TKey, TValue>(string name, Apache.Geode.Client.Generic.RegionAttributes<TKey, TValue> attrs)
+    public static IRegion<TKey, TValue> CreateRegion<TKey, TValue>(string name, Apache.Geode.Client.RegionAttributes<TKey, TValue> attrs)
     {
       Init();
       IRegion<TKey, TValue> region = GetRegion<TKey, TValue>(name);
@@ -829,7 +829,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       AttributesFactory<TKey, TValue> af = new AttributesFactory<TKey, TValue>();
       af.SetLruEntriesLimit(0);
       af.SetInitialCapacity(size);
-      Apache.Geode.Client.Generic.RegionAttributes<TKey, TValue> rattrs = af.CreateRegionAttributes();
+      Apache.Geode.Client.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 Apache.Geode.Client.UnitTests.NewAPI
       }
     }
 
-    public static string RegionAttributesToString<TKey, TVal>(Apache.Geode.Client.Generic.RegionAttributes<TKey, TVal> attrs)
+    public static string RegionAttributesToString<TKey, TVal>(Apache.Geode.Client.RegionAttributes<TKey, TVal> attrs)
     {
       string poolName = "RegionWithoutPool";
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/CacheableWrapperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheableWrapperN.cs b/src/clicache/integration-test/CacheableWrapperN.cs
index 153cd14..cc81469 100644
--- a/src/clicache/integration-test/CacheableWrapperN.cs
+++ b/src/clicache/integration-test/CacheableWrapperN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   
   using NUnit.Framework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   /// <summary>
   /// Interface class for wrappers of gemfire cacheable types.
   /// </summary>

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/CachelessTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CachelessTestsN.cs b/src/clicache/integration-test/CachelessTestsN.cs
index 5fd9066..9ee8e48 100644
--- a/src/clicache/integration-test/CachelessTestsN.cs
+++ b/src/clicache/integration-test/CachelessTestsN.cs
@@ -22,7 +22,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   [TestFixture]
   [Category("generics")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/DataOutputTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DataOutputTests.cs b/src/clicache/integration-test/DataOutputTests.cs
index 70af28d..167e8eb 100755
--- a/src/clicache/integration-test/DataOutputTests.cs
+++ b/src/clicache/integration-test/DataOutputTests.cs
@@ -23,7 +23,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
     using NUnit.Framework;
     using Apache.Geode.DUnitFramework;
-    using Apache.Geode.Client.Generic;
+    using Apache.Geode.Client;
 
     [TestFixture]
     [Category("unicast_only")]

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

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

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/DistOpsStepsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DistOpsStepsN.cs b/src/clicache/integration-test/DistOpsStepsN.cs
index 7e6b51e..fd3cc70 100644
--- a/src/clicache/integration-test/DistOpsStepsN.cs
+++ b/src/clicache/integration-test/DistOpsStepsN.cs
@@ -25,8 +25,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
-  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client;
+  //using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   public abstract class DistOpsSteps : UnitTests
   {
@@ -201,7 +201,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       {
         CreateEntry(regionName, key, val);
       }
-      catch (Apache.Geode.Client.Generic.NotConnectedException ex)
+      catch (Apache.Geode.Client.NotConnectedException ex)
       {
         if (ex.InnerException is NoAvailableLocatorsException)
         {
@@ -269,7 +269,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       {
         checkVal = (string)region[key];
       }
-      catch (Apache.Geode.Client.Generic.KeyNotFoundException)
+      catch (Apache.Geode.Client.KeyNotFoundException)
       {
         // expected?
         //checkVal = (string)region[key];
@@ -1331,7 +1331,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         Object val = region[1];
         Assert.Fail("Should have got KeyNotFoundException");
       }
-      catch (Apache.Geode.Client.Generic.KeyNotFoundException ex)
+      catch (Apache.Geode.Client.KeyNotFoundException ex)
       {
         Util.Log("Got expected KeyNotFoundException {0} ", ex);
       }
@@ -1347,7 +1347,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
           Assert.Fail("Should have got KeyNotFoundException");
         }
       }
-      catch (Apache.Geode.Client.Generic.KeyNotFoundException ex)
+      catch (Apache.Geode.Client.KeyNotFoundException ex)
       {
         Util.Log("Got expected KeyNotFoundException {0} ", ex);
       }
@@ -1359,7 +1359,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         Object val = region[1];
         Assert.Fail("Should have got KeyNotFoundException");
       }
-      catch (Apache.Geode.Client.Generic.KeyNotFoundException ex)
+      catch (Apache.Geode.Client.KeyNotFoundException ex)
       {
         Util.Log("Got expected KeyNotFoundException {0} ", ex);
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/DupListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DupListenerN.cs b/src/clicache/integration-test/DupListenerN.cs
index 646c4b1..30af812 100644
--- a/src/clicache/integration-test/DupListenerN.cs
+++ b/src/clicache/integration-test/DupListenerN.cs
@@ -23,8 +23,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
-  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client;
+  using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   class DupListener<TKey, TVal> : ICacheListener<TKey, TVal>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/DurableListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/DurableListenerN.cs b/src/clicache/integration-test/DurableListenerN.cs
index 5aff6df..78c8280 100644
--- a/src/clicache/integration-test/DurableListenerN.cs
+++ b/src/clicache/integration-test/DurableListenerN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   
   //using Com.Vmware.Cache;
   //using Region = Com.Vmware.Cache.IRegion<object, object>;

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ExpirationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ExpirationTestsN.cs b/src/clicache/integration-test/ExpirationTestsN.cs
index 009bc1d..a8e2e3e 100644
--- a/src/clicache/integration-test/ExpirationTestsN.cs
+++ b/src/clicache/integration-test/ExpirationTestsN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   [TestFixture]
   [Category("group2")]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/OverflowTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/OverflowTestsN.cs b/src/clicache/integration-test/OverflowTestsN.cs
index e389ca6..6669ebd 100644
--- a/src/clicache/integration-test/OverflowTestsN.cs
+++ b/src/clicache/integration-test/OverflowTestsN.cs
@@ -27,7 +27,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   [TestFixture]
   [Category("group4")]
@@ -114,7 +114,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
     // Testing for attibute validation.
     private void ValidateAttributes(IRegion<object, object> region)
     {
-      Apache.Geode.Client.Generic.RegionAttributes<object, object> regAttr = region.Attributes;
+      Apache.Geode.Client.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,
@@ -490,7 +490,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
           Util.Log('\t' + rg.Name);
         }
 
-        Apache.Geode.Client.Generic.RegionAttributes<object, object> attrs = region1.Attributes;
+        Apache.Geode.Client.RegionAttributes<object, object> attrs = region1.Attributes;
         //Util.Log("Attributes of root region Root1 are: ");
 
         bool cachingEnabled = attrs.CachingEnabled;
@@ -532,7 +532,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         Assert.AreNotEqual(0, pageSize.Length, "Persistence PageSize should not be empty.");
         Util.Log("****Attributes of Root1 are correctly set****");
 
-        Apache.Geode.Client.Generic.RegionAttributes<object, object> attrs2 = region2.Attributes;
+        Apache.Geode.Client.RegionAttributes<object, object> attrs2 = region2.Attributes;
         string lib2 = attrs2.PersistenceLibrary;
         string libFun2 = attrs2.PersistenceFactory;
         Util.Log(" persistence library2 = " + lib2);
@@ -551,7 +551,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 
         Util.Log("****Attributes of Root2 are correctly set****");
 
-        Apache.Geode.Client.Generic.RegionAttributes<object, object> attrs3 = region3.Attributes;
+        Apache.Geode.Client.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/649e4a87/src/clicache/integration-test/PutGetTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/PutGetTestsN.cs b/src/clicache/integration-test/PutGetTestsN.cs
index 236f7aa..5b68534 100644
--- a/src/clicache/integration-test/PutGetTestsN.cs
+++ b/src/clicache/integration-test/PutGetTestsN.cs
@@ -23,8 +23,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   // using Apache.Geode.Client; 
-  using Apache.Geode.Client.Generic;
-  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client;
+  //using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   [TestFixture]
   [Category("group1")]
@@ -598,7 +598,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       }
 
       Util.Log("Executing onRegion FE with custom key and custom partitionResolver");
-      Apache.Geode.Client.Generic.Execution<object> exc = Generic.FunctionService<object>.OnRegion<TradeKey, object>(region);
+      Apache.Geode.Client.Execution<object> exc = Client.FunctionService<object>.OnRegion<TradeKey, object>(region);
       Assert.IsTrue(exc != null, "onRegion Returned NULL");
 
       TradeKey[] filter = new TradeKey[901];
@@ -610,7 +610,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       }
       Util.Log("filter count= {0}.", filter.Length);
 
-      Generic.IResultCollector<object> rc = exc.WithFilter<TradeKey>(filter).Execute(FEOnRegionPrSHOP_OptimizeForWrite, 15);
+      Client.IResultCollector<object> rc = exc.WithFilter<TradeKey>(filter).Execute(FEOnRegionPrSHOP_OptimizeForWrite, 15);
       Util.Log("FEOnRegionPrSHOP_OptimizeForWrite executed");
       ICollection<object> executeFunctionResult = rc.GetResult();
       Util.Log("OnRegionPrSHOP for filter executeFunctionResult.Count = {0} ", executeFunctionResult.Count);

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/RegionOperationN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionOperationN.cs b/src/clicache/integration-test/RegionOperationN.cs
index ee5ac23..aadb087 100644
--- a/src/clicache/integration-test/RegionOperationN.cs
+++ b/src/clicache/integration-test/RegionOperationN.cs
@@ -6,9 +6,9 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
-  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Region = Apache.Geode.Client.IRegion<Object, Object>;
   public class RegionOperation
   {
     protected IRegion<object, object> m_region;

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/RegionWrapperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/RegionWrapperN.cs b/src/clicache/integration-test/RegionWrapperN.cs
index b58a4e2..abbe3e3 100644
--- a/src/clicache/integration-test/RegionWrapperN.cs
+++ b/src/clicache/integration-test/RegionWrapperN.cs
@@ -24,8 +24,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
-  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client;
+  //using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   public class RegionWrapper
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/SecurityTestUtilN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SecurityTestUtilN.cs b/src/clicache/integration-test/SecurityTestUtilN.cs
index b72d62e..964447b 100644
--- a/src/clicache/integration-test/SecurityTestUtilN.cs
+++ b/src/clicache/integration-test/SecurityTestUtilN.cs
@@ -25,8 +25,8 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.Client.Tests.NewAPI;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
-  using AssertionException = Apache.Geode.Client.Generic.AssertionException;
+  using Apache.Geode.Client;
+  using AssertionException = Apache.Geode.Client.AssertionException;
 
   /// <summary>
   /// Enumeration to indicate the result expected of an operation.

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/SerializationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SerializationTestsN.cs b/src/clicache/integration-test/SerializationTestsN.cs
index fcb3584..cfa765b 100644
--- a/src/clicache/integration-test/SerializationTestsN.cs
+++ b/src/clicache/integration-test/SerializationTestsN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
 
   [TestFixture]

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/SystemPropertiesTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SystemPropertiesTestsN.cs b/src/clicache/integration-test/SystemPropertiesTestsN.cs
index a19f72f..961fea8 100644
--- a/src/clicache/integration-test/SystemPropertiesTestsN.cs
+++ b/src/clicache/integration-test/SystemPropertiesTestsN.cs
@@ -22,7 +22,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   [TestFixture]
   [Category("group3")]

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

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/TallyListenerN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyListenerN.cs b/src/clicache/integration-test/TallyListenerN.cs
index 40c40c4..4e15514 100644
--- a/src/clicache/integration-test/TallyListenerN.cs
+++ b/src/clicache/integration-test/TallyListenerN.cs
@@ -21,8 +21,8 @@ using System.Threading;
 namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
-  //using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Apache.Geode.Client;
+  //using Region = Apache.Geode.Client.IRegion<Object, Object>;
 
   class TallyListener<TKey, TVal> : CacheListenerAdapter<TKey, TVal>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/TallyLoaderN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyLoaderN.cs b/src/clicache/integration-test/TallyLoaderN.cs
index 60c9ce4..0e88e8d 100644
--- a/src/clicache/integration-test/TallyLoaderN.cs
+++ b/src/clicache/integration-test/TallyLoaderN.cs
@@ -23,7 +23,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using Apache.Geode.DUnitFramework;
 
   using Apache.Geode.Client;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   class TallyLoader<TKey, TVal> : ICacheLoader<TKey, TVal>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/TallyResolverN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyResolverN.cs b/src/clicache/integration-test/TallyResolverN.cs
index 1f868d1..8110b4e 100755
--- a/src/clicache/integration-test/TallyResolverN.cs
+++ b/src/clicache/integration-test/TallyResolverN.cs
@@ -23,7 +23,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using Apache.Geode.DUnitFramework;
 
   using Apache.Geode.Client;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   class TallyResolver<TKey, TVal> : IPartitionResolver<TKey, TVal>
   {

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/TallyWriter.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyWriter.cs b/src/clicache/integration-test/TallyWriter.cs
index 9e1bac0..5e5d407 100644
--- a/src/clicache/integration-test/TallyWriter.cs
+++ b/src/clicache/integration-test/TallyWriter.cs
@@ -22,7 +22,7 @@ namespace Apache.Geode.Client.UnitTests
 {
   using Apache.Geode.DUnitFramework;
 
-  class TallyWriter : Apache.Geode.Client.Generic.CacheWriterAdapter<Object, Object>
+  class TallyWriter : Apache.Geode.Client.CacheWriterAdapter<Object, Object>
   {
     #region Private members
 
@@ -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.Generic.IGFSerializable m_callbackArg = null;
+    private Apache.Geode.Client.IGFSerializable m_callbackArg = null;
     private int m_clears = 0;
-    private Apache.Geode.Client.Generic.IGFSerializable m_lastKey = null;
-    private Apache.Geode.Client.Generic.IGFSerializable m_lastValue = null;
+    private Apache.Geode.Client.IGFSerializable m_lastKey = null;
+    private Apache.Geode.Client.IGFSerializable 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.Generic.IGFSerializable LastKey
+    public Apache.Geode.Client.IGFSerializable LastKey
     {
       get
       {
@@ -90,7 +90,7 @@ namespace Apache.Geode.Client.UnitTests
       }
     }
 
-    public Apache.Geode.Client.Generic.IGFSerializable CallbackArgument
+    public Apache.Geode.Client.IGFSerializable CallbackArgument
     {
       get
       {
@@ -99,7 +99,7 @@ namespace Apache.Geode.Client.UnitTests
     }
 
 
-    public Apache.Geode.Client.Generic.IGFSerializable LastValue
+    public Apache.Geode.Client.IGFSerializable LastValue
     {
       get
       {
@@ -112,7 +112,7 @@ namespace Apache.Geode.Client.UnitTests
     isWriterFailed = true;
    }
 
-  public void SetCallBackArg( Apache.Geode.Client.Generic.IGFSerializable callbackArg )
+  public void SetCallBackArg( Apache.Geode.Client.IGFSerializable callbackArg )
   {
     m_callbackArg = callbackArg;
   }
@@ -167,14 +167,14 @@ namespace Apache.Geode.Client.UnitTests
         Updates, Creates, Invalidates, Destroys);
     }
 
-    public void CheckcallbackArg(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
+    public void CheckcallbackArg(Apache.Geode.Client.EntryEvent<Object, Object> ev)
       {
 
         if(!isWriterInvoke)
           isWriterInvoke = true;
         if (m_callbackArg != null)
         {
-          Apache.Geode.Client.Generic.IGFSerializable callbkArg = (Apache.Geode.Client.Generic.IGFSerializable)ev.CallbackArgument;
+          Apache.Geode.Client.IGFSerializable callbkArg = (Apache.Geode.Client.IGFSerializable)ev.CallbackArgument;
           if (m_callbackArg.Equals(callbkArg))
             isCallbackCalled = true;
         }  
@@ -187,7 +187,7 @@ namespace Apache.Geode.Client.UnitTests
 
     #region ICacheWriter Members
 
-    public override bool BeforeCreate(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
+    public override bool BeforeCreate(Apache.Geode.Client.EntryEvent<Object, Object> ev)
     {
       m_creates++;
       Util.Log("TallyWriter::BeforeCreate");
@@ -195,7 +195,7 @@ namespace Apache.Geode.Client.UnitTests
       return !isWriterFailed;
     }
 
-    public override bool BeforeDestroy(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
+    public override bool BeforeDestroy(Apache.Geode.Client.EntryEvent<Object, Object> ev)
     {
       m_destroys++;
       Util.Log("TallyWriter::BeforeDestroy");
@@ -203,14 +203,14 @@ namespace Apache.Geode.Client.UnitTests
       return !isWriterFailed;
     }
 
-    public override bool BeforeRegionClear(Apache.Geode.Client.Generic.RegionEvent<Object, Object> ev)
+    public override bool BeforeRegionClear(Apache.Geode.Client.RegionEvent<Object, Object> ev)
     {
       m_clears++;
       Util.Log("TallyWriter::BeforeRegionClear");
       return true;
     }
 
-    public override bool BeforeUpdate(Apache.Geode.Client.Generic.EntryEvent<Object, Object> ev)
+    public override bool BeforeUpdate(Apache.Geode.Client.EntryEvent<Object, Object> ev)
     {
       m_updates++;
       Util.Log("TallyWriter::BeforeUpdate");

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/TallyWriterN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/TallyWriterN.cs b/src/clicache/integration-test/TallyWriterN.cs
index 3b19215..7847a8b 100644
--- a/src/clicache/integration-test/TallyWriterN.cs
+++ b/src/clicache/integration-test/TallyWriterN.cs
@@ -21,7 +21,7 @@ using System.Threading;
 namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   class TallyWriter<TKey, TVal> : CacheWriterAdapter<TKey, TVal>
   {
     #region Private members

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
index b9d68bc..6225579 100644
--- a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
+++ b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
@@ -19,7 +19,7 @@
 
 namespace Apache.Geode.Client.UnitTests.NewAPI
 {
-    using Apache.Geode.Client.Generic;
+    using Apache.Geode.Client;
     using Apache.Geode.Client.Tests.NewAPI;
     using Apache.Geode.DUnitFramework;
     using NUnit.Framework;
@@ -90,7 +90,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
               null, locators, "__TESTPOOL1_", true);
 
             IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-            Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+            Apache.Geode.Client.RegionAttributes<object, object> regattrs = region.Attributes;
             region.CreateSubRegion(QueryRegionNames[1], regattrs);
         }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientCSTXN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCSTXN.cs b/src/clicache/integration-test/ThinClientCSTXN.cs
index 430dfba..5c8c772 100644
--- a/src/clicache/integration-test/ThinClientCSTXN.cs
+++ b/src/clicache/integration-test/ThinClientCSTXN.cs
@@ -23,9 +23,9 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   using Apache.Geode.Client.UnitTests.NewAPI;
-  using Region = Apache.Geode.Client.Generic.IRegion<Object, Object>;
+  using Region = Apache.Geode.Client.IRegion<Object, Object>;
   using Apache.Geode.Client.Tests.NewAPI;
   #region CSTX_COMMENTED - transaction listener and writer are disabled for now
   /* 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientCallbackArgN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCallbackArgN.cs b/src/clicache/integration-test/ThinClientCallbackArgN.cs
index fca1163..b50971e 100644
--- a/src/clicache/integration-test/ThinClientCallbackArgN.cs
+++ b/src/clicache/integration-test/ThinClientCallbackArgN.cs
@@ -24,9 +24,9 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
 
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
-  using GIRegion = Apache.Geode.Client.Generic.IRegion<int, object>;
+  using GIRegion = Apache.Geode.Client.IRegion<int, object>;
   using System.Collections.Generic;
 
   public class CallbackListener : CacheListenerAdapter<int, object>

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientConflationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientConflationTestsN.cs b/src/clicache/integration-test/ThinClientConflationTestsN.cs
index 8986e98..7bf6f53 100644
--- a/src/clicache/integration-test/ThinClientConflationTestsN.cs
+++ b/src/clicache/integration-test/ThinClientConflationTestsN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   #region Listener
   class ConflationListner<TKey, TValue> : ICacheListener<TKey, TValue>

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientCqIRTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCqIRTestsN.cs b/src/clicache/integration-test/ThinClientCqIRTestsN.cs
index f812435..372bfab 100644
--- a/src/clicache/integration-test/ThinClientCqIRTestsN.cs
+++ b/src/clicache/integration-test/ThinClientCqIRTestsN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
 
   [TestFixture]
@@ -93,7 +93,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
         null, locators, "__TESTPOOL1_", true);
 
       IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-      Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+      Apache.Geode.Client.RegionAttributes<object, object> regattrs = region.Attributes;
       region.CreateSubRegion(QueryRegionNames[1], regattrs);
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientCqTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientCqTestsN.cs b/src/clicache/integration-test/ThinClientCqTestsN.cs
index 93a8ac3..5d938af 100644
--- a/src/clicache/integration-test/ThinClientCqTestsN.cs
+++ b/src/clicache/integration-test/ThinClientCqTestsN.cs
@@ -24,7 +24,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   public class MyCqListener<TKey, TResult> : ICqListener<TKey, TResult>
   {
@@ -319,7 +319,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       CacheHelper.CreateTCRegion_Pool<object, object>("DistRegionAck", true, true,
         null, locators, "__TESTPOOL1_", true);
       IRegion<object, object> region = CacheHelper.GetRegion<object, object>(QueryRegionNames[0]);
-      Apache.Geode.Client.Generic.RegionAttributes<object, object> regattrs = region.Attributes;
+      Apache.Geode.Client.RegionAttributes<object, object> regattrs = region.Attributes;
       region.CreateSubRegion(QueryRegionNames[1], regattrs);
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientDeltaTestN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDeltaTestN.cs b/src/clicache/integration-test/ThinClientDeltaTestN.cs
index fcb9268..6685fd1 100644
--- a/src/clicache/integration-test/ThinClientDeltaTestN.cs
+++ b/src/clicache/integration-test/ThinClientDeltaTestN.cs
@@ -27,7 +27,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
   using DeltaEx = Apache.Geode.Client.Tests.DeltaEx;
 
   public class CqDeltaListener<TKey, TResult> : ICqListener<TKey, TResult>
@@ -245,7 +245,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
     }
     public void CreateRegion(string name, bool enableNotification, bool cloningEnabled)
     {
-      Apache.Geode.Client.Generic.RegionAttributes<object, object> attrs;
+      Apache.Geode.Client.RegionAttributes<object, object> attrs;
       AttributesFactory<object, object> attrFac = new AttributesFactory<object, object>();
       attrFac.SetCacheListener(new SimpleCacheListener<object, object>());
       attrFac.SetCloningEnabled(cloningEnabled);

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientDocExamplesN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDocExamplesN.cs b/src/clicache/integration-test/ThinClientDocExamplesN.cs
index af540f3..eddbcf8 100644
--- a/src/clicache/integration-test/ThinClientDocExamplesN.cs
+++ b/src/clicache/integration-test/ThinClientDocExamplesN.cs
@@ -27,7 +27,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
   using Apache.Geode.DUnitFramework;
   using Apache.Geode.Client.Tests.NewAPI;
   using Apache.Geode.Client.Examples;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
   namespace gemfire.cliwrap.Examples
   {
@@ -1125,7 +1125,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       bool args0 = true;
       //test data dependant function execution
       //     test get function with result
-      Apache.Geode.Client.Generic.Execution<object> exc = Apache.Geode.Client.Generic.FunctionService<object>.OnRegion<object, object>(region);
+      Apache.Geode.Client.Execution<object> exc = Apache.Geode.Client.FunctionService<object>.OnRegion<object, object>(region);
       IResultCollector<object> rc = exc.WithArgs<bool>(args0).WithFilter<object>(routingObj).Execute(
       getFuncName);
       ICollection<object> executeFunctionResult = rc.GetResult();
@@ -1165,7 +1165,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       Console.WriteLine("routingObj count= {0}.", routingObj.Length);
       //test date independant fucntion execution on one server
       //     test get function with result
-      Apache.Geode.Client.Generic.Execution<object> exc = Apache.Geode.Client.Generic.FunctionService<object>.OnServer(cache);
+      Apache.Geode.Client.Execution<object> exc = Apache.Geode.Client.FunctionService<object>.OnServer(cache);
       //TODO::split
       //CacheableVector args1 = new CacheableVector();
       System.Collections.ArrayList args1 = new System.Collections.ArrayList();

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableCqTestsN.cs b/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
index aee1ec5..9d24008 100644
--- a/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableCqTestsN.cs
@@ -18,7 +18,7 @@
 using NUnit.Framework;
 using Apache.Geode.DUnitFramework;
 using Apache.Geode.Client.Tests.NewAPI;
-using Apache.Geode.Client.Generic;
+using Apache.Geode.Client;
 using System;
 
 namespace Apache.Geode.Client.UnitTests.NewAPI
@@ -61,7 +61,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       Util.Log("Registering Cqs for client1.");
       CqAttributesFactory<object, object> cqAf = new CqAttributesFactory<object, object>();
       CqAttributes<object, object> attributes = cqAf.Create();
-      QueryService<object, object> qs = Generic.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+      QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
 
       if (!isRecycle)
       {
@@ -85,7 +85,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       Util.Log("Registering Cqs for client1 for multiple chunks.");
       CqAttributesFactory<object, object> cqAf = new CqAttributesFactory<object, object>();
       CqAttributes<object, object> attributes = cqAf.Create();
-      QueryService<object, object> qs = Generic.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+      QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
 
       for (int i = 0; i < m_NumberOfCqs; i++)
         qs.NewCq("MyCq_" + i.ToString(), "Select * From /" + QueryRegionNames[0] + " where id = 1", attributes, true).ExecuteWithInitialResults();
@@ -97,7 +97,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
       Util.Log("Registering Cqs for client2.");
       CqAttributesFactory<object, object> cqAf = new CqAttributesFactory<object, object>();
       CqAttributes<object, object> attributes = cqAf.Create();
-      QueryService<object, object> qs = Generic.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+      QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
 
       if (!isRecycle)
       {
@@ -118,7 +118,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
     public void VerifyDurableCqListClient1MultipleChunks()
     {
       Util.Log("Verifying durable Cqs for client1.");
-      QueryService<object, object> qs = Generic.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+      QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
       System.Collections.Generic.List<string> durableCqList = qs.GetAllDurableCqsFromServer();
       Assert.AreNotEqual(null, durableCqList);
 
@@ -130,7 +130,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
     public void VerifyDurableCqListClient1(bool isRecycle)
     {
       Util.Log("Verifying durable Cqs for client1.");
-      QueryService<object, object> qs = Generic.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+      QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
       System.Collections.Generic.List<string> durableCqList = qs.GetAllDurableCqsFromServer();
       Assert.AreNotEqual(null, durableCqList);
 
@@ -154,7 +154,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
     public void VerifyDurableCqListClient2(bool isRecycle)
     {
       Util.Log("Verifying durable Cqs for client2.");
-      QueryService<object, object> qs = Generic.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+      QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
       System.Collections.Generic.List<string> durableCqList = qs.GetAllDurableCqsFromServer();
       Assert.AreNotEqual(null, durableCqList);
 
@@ -183,7 +183,7 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
     public void VerifyEmptyDurableCqListClient1()
     {
       Util.Log("Verifying empty durable Cqs for client1.");
-      QueryService<object, object> qs = Generic.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
+      QueryService<object, object> qs = Client.PoolManager.Find("__TESTPOOL1_").GetQueryService<object, object>();
       System.Collections.Generic.List<string> durableCqList = qs.GetAllDurableCqsFromServer();
       Assert.AreNotEqual(null, durableCqList);
       Assert.AreEqual(0, durableCqList.Count, "Durable CQ list sholuld be empty");

http://git-wip-us.apache.org/repos/asf/geode/blob/649e4a87/src/clicache/integration-test/ThinClientDurableTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientDurableTestsN.cs b/src/clicache/integration-test/ThinClientDurableTestsN.cs
index 8f9228c..9eb2c2d 100644
--- a/src/clicache/integration-test/ThinClientDurableTestsN.cs
+++ b/src/clicache/integration-test/ThinClientDurableTestsN.cs
@@ -23,10 +23,10 @@ namespace Apache.Geode.Client.UnitTests.NewAPI
 {
   using NUnit.Framework;
   using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client.Generic;
+  using Apache.Geode.Client;
 
 
-  using AssertionException = Apache.Geode.Client.Generic.AssertionException;
+  using AssertionException = Apache.Geode.Client.AssertionException;
   [TestFixture]
   [Category("group2")]
   [Category("unicast_only")]


Mime
View raw message