geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [3/3] geode git commit: GEODE-2340: Renamed inclusion of the renamed files.
Date Tue, 24 Jan 2017 22:26:28 GMT
GEODE-2340: Renamed inclusion of the renamed files.

This closes #355


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

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 2c88dfee8de14a6f40f9b8bcfd8911ed128cb35a
Parents: f3850b4
Author: Ernest Burghardt <eburghardt@pivotal.io>
Authored: Tue Jan 24 13:25:03 2017 -0800
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Tue Jan 24 14:25:33 2017 -0800

----------------------------------------------------------------------
 src/cppcache/include/gfcpp/GeodeCppCache.hpp                 | 8 ++++----
 src/cppcache/include/gfcpp/GeodeCppCache.inl                 | 6 +++---
 src/cppcache/integration-test/CacheHelper.cpp                | 2 +-
 src/cppcache/integration-test/CacheHelper.hpp                | 2 +-
 src/cppcache/integration-test/CacheImplHelper.hpp            | 2 +-
 src/cppcache/integration-test/CacheableWrapper.hpp           | 2 +-
 src/cppcache/integration-test/DeltaEx.hpp                    | 2 +-
 src/cppcache/integration-test/QueryHelper.hpp                | 2 +-
 src/cppcache/integration-test/TallyListener.hpp              | 2 +-
 src/cppcache/integration-test/TallyLoader.hpp                | 2 +-
 src/cppcache/integration-test/TallyWriter.hpp                | 2 +-
 src/cppcache/integration-test/ThinClientDistOps.hpp          | 2 +-
 src/cppcache/integration-test/ThinClientDistOps2.hpp         | 2 +-
 src/cppcache/integration-test/ThinClientFailover.hpp         | 2 +-
 src/cppcache/integration-test/ThinClientFailover2.hpp        | 2 +-
 src/cppcache/integration-test/ThinClientFailover3.hpp        | 2 +-
 src/cppcache/integration-test/ThinClientFailoverInterest.hpp | 2 +-
 .../integration-test/ThinClientFailoverInterest2.hpp         | 2 +-
 .../ThinClientFailoverInterestAllWithCache.hpp               | 2 +-
 src/cppcache/integration-test/ThinClientFailoverRegex.hpp    | 2 +-
 src/cppcache/integration-test/ThinClientGatewayTest.hpp      | 2 +-
 src/cppcache/integration-test/ThinClientHeapLRU.hpp          | 2 +-
 src/cppcache/integration-test/ThinClientHelper.hpp           | 2 +-
 src/cppcache/integration-test/ThinClientInterestList.hpp     | 2 +-
 src/cppcache/integration-test/ThinClientInterestList2.hpp    | 2 +-
 src/cppcache/integration-test/ThinClientNotification.hpp     | 2 +-
 src/cppcache/integration-test/ThinClientPdxSerializer.hpp    | 2 +-
 src/cppcache/integration-test/ThinClientPutAll.hpp           | 2 +-
 .../integration-test/ThinClientPutAllWithCallBack.hpp        | 2 +-
 src/cppcache/integration-test/ThinClientPutGetAll.hpp        | 2 +-
 .../integration-test/ThinClientRIwithlocalRegionDestroy.hpp  | 2 +-
 src/cppcache/integration-test/ThinClientRegex.hpp            | 2 +-
 src/cppcache/integration-test/ThinClientRegex2.hpp           | 2 +-
 src/cppcache/integration-test/ThinClientRegex3.hpp           | 2 +-
 src/cppcache/integration-test/ThinClientRemoveAll.hpp        | 2 +-
 src/cppcache/integration-test/ThinClientSSL.hpp              | 2 +-
 src/cppcache/integration-test/ThinClientSSLWithPassword.hpp  | 2 +-
 src/cppcache/integration-test/ThinClientSecurityHelper.hpp   | 2 +-
 src/cppcache/integration-test/ThinClientTXFailover.hpp       | 2 +-
 src/cppcache/integration-test/ThinClientTransactions.hpp     | 2 +-
 src/cppcache/integration-test/ThinClientTransactionsXA.hpp   | 2 +-
 src/cppcache/integration-test/fw_dunit.cpp                   | 2 +-
 src/cppcache/integration-test/testAttributesFactory.cpp      | 2 +-
 src/cppcache/integration-test/testAttributesMutator.cpp      | 2 +-
 src/cppcache/integration-test/testCache.cpp                  | 2 +-
 src/cppcache/integration-test/testCacheless.cpp              | 2 +-
 src/cppcache/integration-test/testConnect.cpp                | 2 +-
 src/cppcache/integration-test/testCreateAndDestroyPool.cpp   | 2 +-
 src/cppcache/integration-test/testDunit.cpp                  | 2 +-
 src/cppcache/integration-test/testEntriesMap.cpp             | 2 +-
 .../integration-test/testEntriesMapForVersioning.cpp         | 2 +-
 src/cppcache/integration-test/testExpiration.cpp             | 2 +-
 src/cppcache/integration-test/testFwPerf.cpp                 | 2 +-
 src/cppcache/integration-test/testLRUList.cpp                | 2 +-
 src/cppcache/integration-test/testLinkage.cpp                | 2 +-
 src/cppcache/integration-test/testLogger.cpp                 | 2 +-
 src/cppcache/integration-test/testOverflowPutGetSqLite.cpp   | 2 +-
 src/cppcache/integration-test/testRegionAccessThreadSafe.cpp | 2 +-
 src/cppcache/integration-test/testRegionMap.cpp              | 2 +-
 src/cppcache/integration-test/testRegionTemplateArgs.cpp     | 2 +-
 src/cppcache/integration-test/testSerialization.cpp          | 2 +-
 src/cppcache/integration-test/testSharedPtr.cpp              | 2 +-
 src/cppcache/integration-test/testSpinLock.cpp               | 2 +-
 src/cppcache/integration-test/testSystemProperties.cpp       | 2 +-
 .../integration-test/testThinClientCacheableStringArray.cpp  | 2 +-
 src/cppcache/integration-test/testThinClientCacheables.cpp   | 2 +-
 .../integration-test/testThinClientCacheablesLimits.cpp      | 2 +-
 src/cppcache/integration-test/testThinClientCq.cpp           | 2 +-
 src/cppcache/integration-test/testThinClientCqDurable.cpp    | 2 +-
 src/cppcache/integration-test/testThinClientCqFailover.cpp   | 2 +-
 src/cppcache/integration-test/testThinClientCqHAFailover.cpp | 2 +-
 src/cppcache/integration-test/testThinClientCqIR.cpp         | 2 +-
 .../testThinClientFixedPartitionResolver.cpp                 | 2 +-
 src/cppcache/integration-test/testThinClientHADistOps.cpp    | 2 +-
 src/cppcache/integration-test/testThinClientHAEventIDMap.cpp | 2 +-
 src/cppcache/integration-test/testThinClientHAFailover.cpp   | 2 +-
 .../integration-test/testThinClientHAFailoverRegex.cpp       | 2 +-
 .../integration-test/testThinClientHAMixedRedundancy.cpp     | 2 +-
 .../integration-test/testThinClientHAPeriodicAck.cpp         | 2 +-
 .../integration-test/testThinClientHAQueryFailover.cpp       | 2 +-
 src/cppcache/integration-test/testThinClientHeapLRU.cpp      | 2 +-
 .../integration-test/testThinClientIntResPolKeysInv.cpp      | 2 +-
 .../integration-test/testThinClientInterest1Cacheless.cpp    | 2 +-
 .../integration-test/testThinClientLRUExpiration.cpp         | 2 +-
 src/cppcache/integration-test/testThinClientMultiDS.cpp      | 2 +-
 .../integration-test/testThinClientPRPutAllFailover.cpp      | 2 +-
 src/cppcache/integration-test/testThinClientPRSingleHop.cpp  | 2 +-
 .../testThinClientPRSingleHopServerGroup.cpp                 | 2 +-
 .../integration-test/testThinClientPartitionResolver.cpp     | 2 +-
 src/cppcache/integration-test/testThinClientPdxEnum.cpp      | 2 +-
 src/cppcache/integration-test/testThinClientPdxInstance.cpp  | 2 +-
 src/cppcache/integration-test/testThinClientPdxTests.cpp     | 2 +-
 src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp | 2 +-
 .../integration-test/testThinClientPdxTestsWithAuto.cpp      | 2 +-
 src/cppcache/integration-test/testThinClientPoolAttrTest.cpp | 2 +-
 .../integration-test/testThinClientPutAllPRSingleHop.cpp     | 2 +-
 .../testThinClientRegionQueryDifferentServerConfigs.cpp      | 2 +-
 .../testThinClientRegionQueryExclusiveness.cpp               | 2 +-
 .../integration-test/testThinClientRemoteQueryFailover.cpp   | 2 +-
 .../testThinClientRemoteQueryFailoverPdx.cpp                 | 2 +-
 .../integration-test/testThinClientRemoteQueryRS.cpp         | 2 +-
 .../integration-test/testThinClientRemoteQuerySS.cpp         | 2 +-
 .../integration-test/testThinClientRemoteQueryTimeout.cpp    | 2 +-
 .../integration-test/testThinClientRemoteRegionQuery.cpp     | 2 +-
 src/cppcache/integration-test/testThinClientRemoveOps.cpp    | 2 +-
 .../integration-test/testThinClientSSLWithSecurityAuthz.cpp  | 2 +-
 .../testThinClientSecurityAuthentication.cpp                 | 2 +-
 .../testThinClientSecurityAuthenticationMU.cpp               | 2 +-
 .../integration-test/testThinClientSecurityAuthorization.cpp | 2 +-
 .../testThinClientSecurityAuthorizationMU.cpp                | 2 +-
 .../testThinClientSecurityCQAuthorization.cpp                | 2 +-
 .../testThinClientSecurityCQAuthorizationMU.cpp              | 2 +-
 src/cppcache/integration-test/testThinClientSecurityDH.cpp   | 2 +-
 .../integration-test/testThinClientSecurityDH_MU.cpp         | 2 +-
 .../testThinClientSecurityDurableCQAuthorizationMU.cpp       | 2 +-
 .../integration-test/testThinClientSecurityMultiUserTest.cpp | 2 +-
 .../testThinClientSecurityPostAuthorization.cpp              | 2 +-
 .../integration-test/testThinClientWriterException.cpp       | 2 +-
 src/cppcache/integration-test/testUtils.hpp                  | 2 +-
 .../integration-test/testXmlCacheCreationWithOverFlow.cpp    | 2 +-
 .../integration-test/testXmlCacheCreationWithPools.cpp       | 2 +-
 .../integration-test/testXmlCacheCreationWithRefid.cpp       | 2 +-
 src/quickstart/cpp/BasicOperations.cpp                       | 2 +-
 src/quickstart/cpp/CqQuery.cpp                               | 2 +-
 src/quickstart/cpp/DataExpiration.cpp                        | 2 +-
 src/quickstart/cpp/Delta.cpp                                 | 2 +-
 src/quickstart/cpp/DistributedSystem.cpp                     | 2 +-
 src/quickstart/cpp/DurableClient.cpp                         | 2 +-
 src/quickstart/cpp/Exceptions.cpp                            | 2 +-
 src/quickstart/cpp/ExecuteFunctions.cpp                      | 2 +-
 src/quickstart/cpp/HACache.cpp                               | 2 +-
 src/quickstart/cpp/LoaderListenerWriter.cpp                  | 2 +-
 src/quickstart/cpp/MultiuserSecurity.cpp                     | 2 +-
 src/quickstart/cpp/PdxAutoSerializer.cpp                     | 2 +-
 src/quickstart/cpp/PdxInstance.cpp                           | 2 +-
 src/quickstart/cpp/PdxRemoteQuery.cpp                        | 2 +-
 src/quickstart/cpp/PdxSerializer.cpp                         | 2 +-
 src/quickstart/cpp/PoolCqQuery.cpp                           | 2 +-
 src/quickstart/cpp/PoolRemoteQuery.cpp                       | 2 +-
 src/quickstart/cpp/PoolWithEndpoints.cpp                     | 2 +-
 src/quickstart/cpp/PutAllGetAllOperations.cpp                | 2 +-
 src/quickstart/cpp/RefIDExample.cpp                          | 2 +-
 src/quickstart/cpp/RegisterInterest.cpp                      | 2 +-
 src/quickstart/cpp/RemoteQuery.cpp                           | 2 +-
 src/quickstart/cpp/Security.cpp                              | 2 +-
 src/quickstart/cpp/Transactions.cpp                          | 2 +-
 src/quickstart/cpp/TransactionsXA.cpp                        | 2 +-
 src/quickstart/cpp/deltaobjects/DeltaExample.hpp             | 2 +-
 src/quickstart/cpp/plugins/DurableCacheListener.hpp          | 2 +-
 src/quickstart/cpp/plugins/SimpleCacheListener.hpp           | 2 +-
 src/quickstart/cpp/plugins/SimpleCacheLoader.hpp             | 2 +-
 src/quickstart/cpp/plugins/SimpleCacheWriter.hpp             | 2 +-
 src/quickstart/cpp/queryobjects/Portfolio.hpp                | 2 +-
 src/quickstart/cpp/queryobjects/Position.hpp                 | 2 +-
 src/quickstart/cpp/queryobjects/PositionPdx.hpp              | 2 +-
 src/quickstart/cpp/queryobjects/PositionPdxAuto.hpp          | 2 +-
 src/sqliteimpl/SqLiteHelper.hpp                              | 2 +-
 src/tests/cpp/fwk/UdpIpc.cpp                                 | 2 +-
 src/tests/cpp/fwk/UdpIpc.hpp                                 | 2 +-
 src/tests/cpp/fwklib/ClientTask.hpp                          | 2 +-
 src/tests/cpp/fwklib/PoolHelper.hpp                          | 2 +-
 src/tests/cpp/fwklib/QueryHelper.hpp                         | 2 +-
 src/tests/cpp/fwklib/RegionHelper.hpp                        | 2 +-
 src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned1.hpp   | 2 +-
 src/tests/cpp/pdxautoserializerclass/AutoPdxVersioned2.hpp   | 2 +-
 src/tests/cpp/pdxautoserializerclass/PositionPdx.hpp         | 2 +-
 src/tests/cpp/security/Security.hpp                          | 2 +-
 src/tests/cpp/testobject/ArrayOfByte.hpp                     | 2 +-
 src/tests/cpp/testobject/BatchObject.hpp                     | 2 +-
 src/tests/cpp/testobject/DeltaFastAssetAccount.hpp           | 2 +-
 src/tests/cpp/testobject/DeltaPSTObject.hpp                  | 2 +-
 src/tests/cpp/testobject/DeltaTestObj.hpp                    | 2 +-
 src/tests/cpp/testobject/EqStruct.hpp                        | 2 +-
 src/tests/cpp/testobject/FastAsset.hpp                       | 2 +-
 src/tests/cpp/testobject/FastAssetAccount.hpp                | 2 +-
 src/tests/cpp/testobject/InvalidPdxUsage.hpp                 | 2 +-
 src/tests/cpp/testobject/NestedPdxObject.hpp                 | 2 +-
 src/tests/cpp/testobject/NonPdxType.hpp                      | 2 +-
 src/tests/cpp/testobject/PSTObject.hpp                       | 2 +-
 src/tests/cpp/testobject/PdxAutoMegaType.hpp                 | 2 +-
 src/tests/cpp/testobject/PdxClassV1.hpp                      | 2 +-
 src/tests/cpp/testobject/PdxClassV1WithAuto.hpp              | 2 +-
 src/tests/cpp/testobject/PdxClassV2.hpp                      | 2 +-
 src/tests/cpp/testobject/PdxClassV2WithAuto.hpp              | 2 +-
 src/tests/cpp/testobject/PdxType.hpp                         | 2 +-
 src/tests/cpp/testobject/PdxTypeWithAuto.hpp                 | 2 +-
 src/tests/cpp/testobject/PdxVersioned1.hpp                   | 2 +-
 src/tests/cpp/testobject/PdxVersioned2.hpp                   | 2 +-
 src/tests/cpp/testobject/Portfolio.hpp                       | 2 +-
 src/tests/cpp/testobject/Position.hpp                        | 2 +-
 src/tests/cpp/testobject/PositionPdx.hpp                     | 2 +-
 src/tests/cpp/testobject/TestObject1.hpp                     | 2 +-
 src/tests/cpp/testobject/TimestampedObject.hpp               | 2 +-
 src/tests/cpp/testobject/VariousPdxTypes.hpp                 | 2 +-
 src/tests/cpp/testobject/VariousPdxTypesWithAuto.hpp         | 2 +-
 195 files changed, 200 insertions(+), 200 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/include/gfcpp/GeodeCppCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/GeodeCppCache.hpp b/src/cppcache/include/gfcpp/GeodeCppCache.hpp
index a93c8fb..a0b4279 100644
--- a/src/cppcache/include/gfcpp/GeodeCppCache.hpp
+++ b/src/cppcache/include/gfcpp/GeodeCppCache.hpp
@@ -1,5 +1,5 @@
-#ifndef __GEMFIRE_GEMFIRECPPCACHE_H__
-#define __GEMFIRE_GEMFIRECPPCACHE_H__
+#ifndef __APACHE_GEODECPPCACHE_H__
+#define __APACHE_GEODECPPCACHE_H__
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -79,5 +79,5 @@
 #include "CqStatusListener.hpp"
 #include "PdxFieldTypes.hpp"
 
-#include "GemfireCppCache.inl"
-#endif  // define __GEMFIRE_GEMFIRECPPCACHE_H__
+#include "GeodeCppCache.inl"
+#endif  // define __APACHE_GEODECPPCACHE_H__

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/include/gfcpp/GeodeCppCache.inl
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/GeodeCppCache.inl b/src/cppcache/include/gfcpp/GeodeCppCache.inl
index 9b8a783..24bfabb 100755
--- a/src/cppcache/include/gfcpp/GeodeCppCache.inl
+++ b/src/cppcache/include/gfcpp/GeodeCppCache.inl
@@ -1,5 +1,5 @@
-#ifndef __GEMFIRE_GEMFIRECPPCACHE_I__
-#define __GEMFIRE_GEMFIRECPPCACHE_I__
+#ifndef __APACHE_GEODECPPCACHE_I__
+#define __APACHE_GEODECPPCACHE_I__
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -24,4 +24,4 @@
 #include "Cacheable.inl"
 #include "CacheableKey.inl"
 
-#endif //define __GEMFIRE_GEMFIRECPPCACHE_I__
+#endif // define __APACHE_GEODECPPCACHE_I__

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/CacheHelper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheHelper.cpp b/src/cppcache/integration-test/CacheHelper.cpp
index 10f550f..9c22916 100644
--- a/src/cppcache/integration-test/CacheHelper.cpp
+++ b/src/cppcache/integration-test/CacheHelper.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
 #include <gfcpp/SystemProperties.hpp>
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/CacheHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheHelper.hpp b/src/cppcache/integration-test/CacheHelper.hpp
index eceb6a2..e0aa0b8 100644
--- a/src/cppcache/integration-test/CacheHelper.hpp
+++ b/src/cppcache/integration-test/CacheHelper.hpp
@@ -17,7 +17,7 @@
 #ifndef TEST_CACHEHELPER_HPP
 #define TEST_CACHEHELPER_HPP
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
 #include <gfcpp/SystemProperties.hpp>
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/CacheImplHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheImplHelper.hpp b/src/cppcache/integration-test/CacheImplHelper.hpp
index ccfdd90..bba4f56 100644
--- a/src/cppcache/integration-test/CacheImplHelper.hpp
+++ b/src/cppcache/integration-test/CacheImplHelper.hpp
@@ -17,7 +17,7 @@
 #ifndef TEST_CACHEIMPLHELPER_HPP
 #define TEST_CACHEIMPLHELPER_HPP
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
 #include <gfcpp/SystemProperties.hpp>
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/CacheableWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheableWrapper.hpp b/src/cppcache/integration-test/CacheableWrapper.hpp
index dd1768f..509c3d1 100644
--- a/src/cppcache/integration-test/CacheableWrapper.hpp
+++ b/src/cppcache/integration-test/CacheableWrapper.hpp
@@ -17,7 +17,7 @@
 #ifndef _GF_TEST_CACHEABLEWRAPPER_HPP_
 #define _GF_TEST_CACHEABLEWRAPPER_HPP_
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <string>
 #include <map>
 #include <vector>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/DeltaEx.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/DeltaEx.hpp b/src/cppcache/integration-test/DeltaEx.hpp
index 0ddf9e6..513f9a0 100644
--- a/src/cppcache/integration-test/DeltaEx.hpp
+++ b/src/cppcache/integration-test/DeltaEx.hpp
@@ -18,7 +18,7 @@
 #define __DELTAEX_HPP
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include "CacheHelper.hpp"
 class DeltaEx : public Cacheable, public Delta {

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/QueryHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/QueryHelper.hpp b/src/cppcache/integration-test/QueryHelper.hpp
index 0ad0adb..cacc1a3 100644
--- a/src/cppcache/integration-test/QueryHelper.hpp
+++ b/src/cppcache/integration-test/QueryHelper.hpp
@@ -17,7 +17,7 @@
 #ifndef TEST_QUERYHELPER_HPP
 #define TEST_QUERYHELPER_HPP
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
 #include <gfcpp/SystemProperties.hpp>
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/TallyListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyListener.hpp b/src/cppcache/integration-test/TallyListener.hpp
index 1da071c..366710a 100644
--- a/src/cppcache/integration-test/TallyListener.hpp
+++ b/src/cppcache/integration-test/TallyListener.hpp
@@ -18,7 +18,7 @@
 #ifndef _TEST_TALLYLISTENER_HPP_
 #define _TEST_TALLYLISTENER_HPP_
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <string>
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/TallyLoader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyLoader.hpp b/src/cppcache/integration-test/TallyLoader.hpp
index e1c3d8e..8f919b4 100644
--- a/src/cppcache/integration-test/TallyLoader.hpp
+++ b/src/cppcache/integration-test/TallyLoader.hpp
@@ -17,7 +17,7 @@
 #ifndef _TEST_TALLYLOADER_HPP_
 #define _TEST_TALLYLOADER_HPP_ 1
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/TallyWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyWriter.hpp b/src/cppcache/integration-test/TallyWriter.hpp
index 9ccba62..d7a2cea 100644
--- a/src/cppcache/integration-test/TallyWriter.hpp
+++ b/src/cppcache/integration-test/TallyWriter.hpp
@@ -17,7 +17,7 @@
 #ifndef _TEST_TALLYWRITER_HPP_
 #define _TEST_TALLYWRITER_HPP_ 1
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientDistOps.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDistOps.hpp b/src/cppcache/integration-test/ThinClientDistOps.hpp
index b717918..526670b 100644
--- a/src/cppcache/integration-test/ThinClientDistOps.hpp
+++ b/src/cppcache/integration-test/ThinClientDistOps.hpp
@@ -25,7 +25,7 @@
 #define THINCLIENTDISTOPS_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientDistOps2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDistOps2.hpp b/src/cppcache/integration-test/ThinClientDistOps2.hpp
index 3a9f07a..b3f780a 100644
--- a/src/cppcache/integration-test/ThinClientDistOps2.hpp
+++ b/src/cppcache/integration-test/ThinClientDistOps2.hpp
@@ -19,7 +19,7 @@
 #define THINCLIENTDISTOPS2_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientFailover.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover.hpp b/src/cppcache/integration-test/ThinClientFailover.hpp
index f1c955d..85f1853 100644
--- a/src/cppcache/integration-test/ThinClientFailover.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientFailover2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover2.hpp b/src/cppcache/integration-test/ThinClientFailover2.hpp
index 540d378..936e669 100644
--- a/src/cppcache/integration-test/ThinClientFailover2.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover2.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientFailover3.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover3.hpp b/src/cppcache/integration-test/ThinClientFailover3.hpp
index 4d92afa..ea4194c 100644
--- a/src/cppcache/integration-test/ThinClientFailover3.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover3.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverInterest.hpp b/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
index 93f8962..7ac452b 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp b/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
index 638277d..f27a69c 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp b/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
index 62876c3..4b1692a 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverRegex.hpp b/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
index d3e3d1f..f2e6474 100644
--- a/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientGatewayTest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientGatewayTest.hpp b/src/cppcache/integration-test/ThinClientGatewayTest.hpp
index b9831e5..115de03 100644
--- a/src/cppcache/integration-test/ThinClientGatewayTest.hpp
+++ b/src/cppcache/integration-test/ThinClientGatewayTest.hpp
@@ -32,7 +32,7 @@
 using namespace apache::geode::client;
 using namespace test;
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <string>
 
 class MyListener : public CacheListener {

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientHeapLRU.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientHeapLRU.hpp b/src/cppcache/integration-test/ThinClientHeapLRU.hpp
index 9e4d206..208567e 100644
--- a/src/cppcache/integration-test/ThinClientHeapLRU.hpp
+++ b/src/cppcache/integration-test/ThinClientHeapLRU.hpp
@@ -18,7 +18,7 @@
 #define THINCLIENTHEAPLRU_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "BuiltinCacheableWrappers.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientHelper.hpp b/src/cppcache/integration-test/ThinClientHelper.hpp
index c39f181..625deb2 100644
--- a/src/cppcache/integration-test/ThinClientHelper.hpp
+++ b/src/cppcache/integration-test/ThinClientHelper.hpp
@@ -17,7 +17,7 @@
 #ifndef TEST_THINCLIENTHELPER_HPP
 #define TEST_THINCLIENTHELPER_HPP
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testUtils.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientInterestList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterestList.hpp b/src/cppcache/integration-test/ThinClientInterestList.hpp
index 9558680..f6e10a2 100644
--- a/src/cppcache/integration-test/ThinClientInterestList.hpp
+++ b/src/cppcache/integration-test/ThinClientInterestList.hpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientInterestList2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterestList2.hpp b/src/cppcache/integration-test/ThinClientInterestList2.hpp
index 8d0a81e..6ddb0b6 100644
--- a/src/cppcache/integration-test/ThinClientInterestList2.hpp
+++ b/src/cppcache/integration-test/ThinClientInterestList2.hpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientNotification.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientNotification.hpp b/src/cppcache/integration-test/ThinClientNotification.hpp
index df21d34..4a2f733 100644
--- a/src/cppcache/integration-test/ThinClientNotification.hpp
+++ b/src/cppcache/integration-test/ThinClientNotification.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPdxSerializer.hpp b/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
index c592976..96bdfbc 100644
--- a/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
+++ b/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
@@ -22,7 +22,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientPutAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutAll.hpp b/src/cppcache/integration-test/ThinClientPutAll.hpp
index 9c30639..68a98d4 100644
--- a/src/cppcache/integration-test/ThinClientPutAll.hpp
+++ b/src/cppcache/integration-test/ThinClientPutAll.hpp
@@ -19,7 +19,7 @@
 #define THINCLIENTPUTALL_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp b/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
index 9335fa8..26be6d6 100644
--- a/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
+++ b/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
@@ -19,7 +19,7 @@
 #define ThinClientPutAllWITHCALLBACK_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientPutGetAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutGetAll.hpp b/src/cppcache/integration-test/ThinClientPutGetAll.hpp
index 9aa6b31..bbd4094 100644
--- a/src/cppcache/integration-test/ThinClientPutGetAll.hpp
+++ b/src/cppcache/integration-test/ThinClientPutGetAll.hpp
@@ -19,7 +19,7 @@
 #define THINCLIENTPUTGETALL_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
index c3931f9..bf4af66 100644
--- a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
+++ b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientRegex.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex.hpp b/src/cppcache/integration-test/ThinClientRegex.hpp
index 64425a0..22021c9 100644
--- a/src/cppcache/integration-test/ThinClientRegex.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex.hpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientRegex2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex2.hpp b/src/cppcache/integration-test/ThinClientRegex2.hpp
index 5cdffa5..a24d1a4 100644
--- a/src/cppcache/integration-test/ThinClientRegex2.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex2.hpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientRegex3.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex3.hpp b/src/cppcache/integration-test/ThinClientRegex3.hpp
index 560e231..e45537c 100644
--- a/src/cppcache/integration-test/ThinClientRegex3.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex3.hpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientRemoveAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRemoveAll.hpp b/src/cppcache/integration-test/ThinClientRemoveAll.hpp
index b96c3ea..79f91c6 100644
--- a/src/cppcache/integration-test/ThinClientRemoveAll.hpp
+++ b/src/cppcache/integration-test/ThinClientRemoveAll.hpp
@@ -19,7 +19,7 @@
 #define THINCLIENTREMOVEALL_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientSSL.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSSL.hpp b/src/cppcache/integration-test/ThinClientSSL.hpp
index 4711e2a..caa21d7 100644
--- a/src/cppcache/integration-test/ThinClientSSL.hpp
+++ b/src/cppcache/integration-test/ThinClientSSL.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
index 2529d85..bd4e480 100644
--- a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
+++ b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
index 68ce8fa..1bee0a1 100644
--- a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
+++ b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "ThinClientHelper.hpp"
 #include "ace/Process.h"
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientTXFailover.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTXFailover.hpp b/src/cppcache/integration-test/ThinClientTXFailover.hpp
index 0d19626..47bded7 100644
--- a/src/cppcache/integration-test/ThinClientTXFailover.hpp
+++ b/src/cppcache/integration-test/ThinClientTXFailover.hpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientTransactions.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTransactions.hpp b/src/cppcache/integration-test/ThinClientTransactions.hpp
index 4d8e44f..c0a30ae 100644
--- a/src/cppcache/integration-test/ThinClientTransactions.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactions.hpp
@@ -18,7 +18,7 @@
 #define THINCLIENTTRANSACTIONS_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/Auto_Event.h>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
index 3242743..97a7b9b 100644
--- a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
@@ -18,7 +18,7 @@
 #define THINCLIENTTRANSACTIONS_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/Auto_Event.h>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/fw_dunit.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/fw_dunit.cpp b/src/cppcache/integration-test/fw_dunit.cpp
index dca64e3..f99b128 100644
--- a/src/cppcache/integration-test/fw_dunit.cpp
+++ b/src/cppcache/integration-test/fw_dunit.cpp
@@ -33,7 +33,7 @@
 
 #include <ace/ACE.h>
 
-// #include <gfcpp/GemfireCppCache.hpp>
+// #include <gfcpp/GeodeCppCache.hpp>
 
 #include <typeinfo>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testAttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testAttributesFactory.cpp b/src/cppcache/integration-test/testAttributesFactory.cpp
index e75bf8d..0c4d9c5 100644
--- a/src/cppcache/integration-test/testAttributesFactory.cpp
+++ b/src/cppcache/integration-test/testAttributesFactory.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testAttributesFactory"
 
 #include "fw_helper.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testAttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testAttributesMutator.cpp b/src/cppcache/integration-test/testAttributesMutator.cpp
index 3e39384..e007b3b 100644
--- a/src/cppcache/integration-test/testAttributesMutator.cpp
+++ b/src/cppcache/integration-test/testAttributesMutator.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testAttributesMutator"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 
 // this is a test.

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testCache.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testCache.cpp b/src/cppcache/integration-test/testCache.cpp
index 561733f..2db7696 100644
--- a/src/cppcache/integration-test/testCache.cpp
+++ b/src/cppcache/integration-test/testCache.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testCache"
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 #include "fw_helper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testCacheless.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testCacheless.cpp b/src/cppcache/integration-test/testCacheless.cpp
index 81e6b2d..3cd9f6d 100644
--- a/src/cppcache/integration-test/testCacheless.cpp
+++ b/src/cppcache/integration-test/testCacheless.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 #define ROOT_SCOPE DISTRIBUTED_ACK
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testConnect.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testConnect.cpp b/src/cppcache/integration-test/testConnect.cpp
index 57a1f9e..da5463c 100644
--- a/src/cppcache/integration-test/testConnect.cpp
+++ b/src/cppcache/integration-test/testConnect.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testConnect"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testCreateAndDestroyPool.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testCreateAndDestroyPool.cpp b/src/cppcache/integration-test/testCreateAndDestroyPool.cpp
index c0d6c78..55025f5 100644
--- a/src/cppcache/integration-test/testCreateAndDestroyPool.cpp
+++ b/src/cppcache/integration-test/testCreateAndDestroyPool.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testDunit.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testDunit.cpp b/src/cppcache/integration-test/testDunit.cpp
index f4a325f..2df54b3 100644
--- a/src/cppcache/integration-test/testDunit.cpp
+++ b/src/cppcache/integration-test/testDunit.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testDunit"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 int getSlaveTest() {
   return dunit::globals()->getIntValue("test_alive_slaves");

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testEntriesMap.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testEntriesMap.cpp b/src/cppcache/integration-test/testEntriesMap.cpp
index 0a58461..7e31f49 100644
--- a/src/cppcache/integration-test/testEntriesMap.cpp
+++ b/src/cppcache/integration-test/testEntriesMap.cpp
@@ -28,7 +28,7 @@ END_TEST(NotOnWindows)
 #else
 
 //#define BUILD_CPPCACHE 1
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <LRUEntriesMap.hpp>
 #include <LRUMapEntry.hpp>
 #include <VersionTag.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testEntriesMapForVersioning.cpp b/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
index a4e6bee..f044520 100644
--- a/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
+++ b/src/cppcache/integration-test/testEntriesMapForVersioning.cpp
@@ -33,7 +33,7 @@ END_MAIN
 #else
 
 //#define BUILD_CPPCACHE 1
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <LRUEntriesMap.hpp>
 #include <LRUMapEntry.hpp>
 #include <LRUExpMapEntry.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testExpiration.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testExpiration.cpp b/src/cppcache/integration-test/testExpiration.cpp
index 06c0682..c0d7cc7 100644
--- a/src/cppcache/integration-test/testExpiration.cpp
+++ b/src/cppcache/integration-test/testExpiration.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testExpiration"
 
 #include "fw_helper.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testFwPerf.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testFwPerf.cpp b/src/cppcache/integration-test/testFwPerf.cpp
index 494b868..db466d7 100644
--- a/src/cppcache/integration-test/testFwPerf.cpp
+++ b/src/cppcache/integration-test/testFwPerf.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 #define ROOT_NAME "testFwPerf"
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testLRUList.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testLRUList.cpp b/src/cppcache/integration-test/testLRUList.cpp
index 09e65f7..5961071 100644
--- a/src/cppcache/integration-test/testLRUList.cpp
+++ b/src/cppcache/integration-test/testLRUList.cpp
@@ -30,7 +30,7 @@ END_TEST(NotOnWindows)
 //#define BUILD_CPPCACHE
 
 #include <LRUList.cpp>
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 using namespace apache::geode::client;
 using namespace test;

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testLinkage.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testLinkage.cpp b/src/cppcache/integration-test/testLinkage.cpp
index 5dc321d..778d014 100644
--- a/src/cppcache/integration-test/testLinkage.cpp
+++ b/src/cppcache/integration-test/testLinkage.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testLinkage"
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "fw_helper.hpp"
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testLogger.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testLogger.cpp b/src/cppcache/integration-test/testLogger.cpp
index b020ce9..64acd34 100644
--- a/src/cppcache/integration-test/testLogger.cpp
+++ b/src/cppcache/integration-test/testLogger.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testLogger"
 
 #include "fw_helper.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 #ifndef WIN32
 #include <unistd.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp b/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp
index 1fee793..15f890c 100644
--- a/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp
+++ b/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testOverflowPutGetSqLite"
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 #include "fw_helper.hpp"
 #include <CacheableToken.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp b/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp
index e19e83b..9418235 100644
--- a/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp
+++ b/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp
@@ -16,7 +16,7 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/Task.h>
 #include <ace/Recursive_Thread_Mutex.h>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testRegionMap.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testRegionMap.cpp b/src/cppcache/integration-test/testRegionMap.cpp
index 0596d3e..903aeec 100644
--- a/src/cppcache/integration-test/testRegionMap.cpp
+++ b/src/cppcache/integration-test/testRegionMap.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 #include "fw_helper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testRegionTemplateArgs.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testRegionTemplateArgs.cpp b/src/cppcache/integration-test/testRegionTemplateArgs.cpp
index 6fc2592..b802ddf 100644
--- a/src/cppcache/integration-test/testRegionTemplateArgs.cpp
+++ b/src/cppcache/integration-test/testRegionTemplateArgs.cpp
@@ -17,7 +17,7 @@
 
 #define ROOT_NAME "testRegionTemplateArgs"
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <CacheRegionHelper.hpp>
 #include "fw_helper.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testSerialization.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSerialization.cpp b/src/cppcache/integration-test/testSerialization.cpp
index 6dd463e..9d10d92 100644
--- a/src/cppcache/integration-test/testSerialization.cpp
+++ b/src/cppcache/integration-test/testSerialization.cpp
@@ -22,7 +22,7 @@
 
 #define ROOT_SCOPE DISTRIBUTED_ACK
 
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <SerializationRegistry.hpp>
 #include <gfcpp/CacheableString.hpp>
 #include <gfcpp/GeodeTypeIds.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testSharedPtr.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSharedPtr.cpp b/src/cppcache/integration-test/testSharedPtr.cpp
index b9cf7ac..e89fca2 100644
--- a/src/cppcache/integration-test/testSharedPtr.cpp
+++ b/src/cppcache/integration-test/testSharedPtr.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testSharedPtr"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 #include <HostAsm.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testSpinLock.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSpinLock.cpp b/src/cppcache/integration-test/testSpinLock.cpp
index 7829d9c..f460fa5 100644
--- a/src/cppcache/integration-test/testSpinLock.cpp
+++ b/src/cppcache/integration-test/testSpinLock.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testSpinLock"
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 #include <Condition.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testSystemProperties.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testSystemProperties.cpp b/src/cppcache/integration-test/testSystemProperties.cpp
index 22d342a..dbbbffb 100644
--- a/src/cppcache/integration-test/testSystemProperties.cpp
+++ b/src/cppcache/integration-test/testSystemProperties.cpp
@@ -18,7 +18,7 @@
 #define ROOT_NAME "testSystemProperties"
 
 #include "fw_helper.hpp"
-#include "gfcpp/GemfireCppCache.hpp"
+#include "gfcpp/GeodeCppCache.hpp"
 #include "gfcpp/SystemProperties.hpp"
 #include "gfcpp/Properties.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp b/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp
index 6f24b8b..3114c7a 100644
--- a/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp
+++ b/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientCacheables.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCacheables.cpp b/src/cppcache/integration-test/testThinClientCacheables.cpp
index a87bfce..1748fce 100644
--- a/src/cppcache/integration-test/testThinClientCacheables.cpp
+++ b/src/cppcache/integration-test/testThinClientCacheables.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp b/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp
index 679f0f0..ae19054 100644
--- a/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp
+++ b/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientCq.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCq.cpp b/src/cppcache/integration-test/testThinClientCq.cpp
index 9f062ca..453f287 100644
--- a/src/cppcache/integration-test/testThinClientCq.cpp
+++ b/src/cppcache/integration-test/testThinClientCq.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <gfcpp/CqAttributesFactory.hpp>
 #include <gfcpp/CqAttributes.hpp>
 #include <gfcpp/CqListener.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientCqDurable.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqDurable.cpp b/src/cppcache/integration-test/testThinClientCqDurable.cpp
index 3eb14c4..a743477 100644
--- a/src/cppcache/integration-test/testThinClientCqDurable.cpp
+++ b/src/cppcache/integration-test/testThinClientCqDurable.cpp
@@ -16,7 +16,7 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <gfcpp/CqAttributesFactory.hpp>
 #include <gfcpp/CqAttributes.hpp>
 #include <gfcpp/CqListener.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientCqFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqFailover.cpp b/src/cppcache/integration-test/testThinClientCqFailover.cpp
index 47ee1b9..3394234 100644
--- a/src/cppcache/integration-test/testThinClientCqFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientCqFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <gfcpp/CqAttributesFactory.hpp>
 #include <gfcpp/CqAttributes.hpp>
 #include <gfcpp/CqListener.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientCqHAFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqHAFailover.cpp b/src/cppcache/integration-test/testThinClientCqHAFailover.cpp
index 1aa11ab..279c148 100644
--- a/src/cppcache/integration-test/testThinClientCqHAFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientCqHAFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <gfcpp/CqAttributesFactory.hpp>
 #include <gfcpp/CqAttributes.hpp>
 #include <gfcpp/CqListener.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientCqIR.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientCqIR.cpp b/src/cppcache/integration-test/testThinClientCqIR.cpp
index 992ebe3..1d1d57c 100644
--- a/src/cppcache/integration-test/testThinClientCqIR.cpp
+++ b/src/cppcache/integration-test/testThinClientCqIR.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp b/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
index eff5c9b..26cc8ed 100644
--- a/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
+++ b/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 #include <gfcpp/FixedPartitionResolver.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientHADistOps.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHADistOps.cpp b/src/cppcache/integration-test/testThinClientHADistOps.cpp
index 51d21a4..9d2ed06 100644
--- a/src/cppcache/integration-test/testThinClientHADistOps.cpp
+++ b/src/cppcache/integration-test/testThinClientHADistOps.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp b/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp
index c3ed74c..bcef1cb 100644
--- a/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp
+++ b/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientHAFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAFailover.cpp b/src/cppcache/integration-test/testThinClientHAFailover.cpp
index 8156d5b..7fd298d 100644
--- a/src/cppcache/integration-test/testThinClientHAFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientHAFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp b/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
index 9bcd6e1..5ab0112 100644
--- a/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
+++ b/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp b/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
index 3201b9a..3f9d847 100644
--- a/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
+++ b/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp b/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
index 43882e9..b527f36 100644
--- a/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
+++ b/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp b/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp
index b2bb9e7..da2bc85 100644
--- a/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientHAQueryFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientHeapLRU.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientHeapLRU.cpp b/src/cppcache/integration-test/testThinClientHeapLRU.cpp
index 4b629c3..f9095a9 100644
--- a/src/cppcache/integration-test/testThinClientHeapLRU.cpp
+++ b/src/cppcache/integration-test/testThinClientHeapLRU.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "BuiltinCacheableWrappers.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp b/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
index 391e1d8..5f1d933 100644
--- a/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
+++ b/src/cppcache/integration-test/testThinClientIntResPolKeysInv.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp b/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp
index 7cc50d7..0edbeae 100644
--- a/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp
+++ b/src/cppcache/integration-test/testThinClientInterest1Cacheless.cpp
@@ -17,7 +17,7 @@
 
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 
 #define CLIENT1 s1p1
 #define CLIENT2 s1p2

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientLRUExpiration.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientLRUExpiration.cpp b/src/cppcache/integration-test/testThinClientLRUExpiration.cpp
index 4ea89c7..e6cfada 100644
--- a/src/cppcache/integration-test/testThinClientLRUExpiration.cpp
+++ b/src/cppcache/integration-test/testThinClientLRUExpiration.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientMultiDS.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientMultiDS.cpp b/src/cppcache/integration-test/testThinClientMultiDS.cpp
index f9873e4..e5f2bdf 100644
--- a/src/cppcache/integration-test/testThinClientMultiDS.cpp
+++ b/src/cppcache/integration-test/testThinClientMultiDS.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp b/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
index 83fe3a5..d4e8900 100644
--- a/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientPRPutAllFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHop.cpp b/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
index f3e83f5..8bbf05b 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 #include <gfcpp/statistics/StatisticsFactory.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
index de02239..dc8c4d8 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 #include <gfcpp/statistics/StatisticsFactory.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPartitionResolver.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPartitionResolver.cpp b/src/cppcache/integration-test/testThinClientPartitionResolver.cpp
index 65d0916..cdce1b0 100644
--- a/src/cppcache/integration-test/testThinClientPartitionResolver.cpp
+++ b/src/cppcache/integration-test/testThinClientPartitionResolver.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 #include <gfcpp/PartitionResolver.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPdxEnum.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxEnum.cpp b/src/cppcache/integration-test/testThinClientPdxEnum.cpp
index c46102b..4538b80 100644
--- a/src/cppcache/integration-test/testThinClientPdxEnum.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxEnum.cpp
@@ -23,7 +23,7 @@
 #define TEST_THIN_CLIENT_PDX_ENUM_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "testobject/NestedPdxObject.hpp"
 #include "ThinClientHelper.hpp"
 #include "QueryStrings.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPdxInstance.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxInstance.cpp b/src/cppcache/integration-test/testThinClientPdxInstance.cpp
index a7f8f83..82e8cd2 100644
--- a/src/cppcache/integration-test/testThinClientPdxInstance.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxInstance.cpp
@@ -23,7 +23,7 @@
 #define TESTTHINCLIENTPDXINSTANCE_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"
 #include "testobject/NestedPdxObject.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPdxTests.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTests.cpp b/src/cppcache/integration-test/testThinClientPdxTests.cpp
index 7fd7d0f..e331533 100644
--- a/src/cppcache/integration-test/testThinClientPdxTests.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTests.cpp
@@ -30,7 +30,7 @@
 END_MAIN*/
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp b/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp
index 892857a..05af0c7 100644
--- a/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTestsAuto.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
index 0accee8..2e437cf 100644
--- a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp b/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp
index 3d051b6..61f473f 100644
--- a/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp
+++ b/src/cppcache/integration-test/testThinClientPoolAttrTest.cpp
@@ -18,7 +18,7 @@
 #include "ThinClientHelper.hpp"
 #include "testUtils.hpp"
 
-#include "gfcpp/GemfireCppCache.hpp"
+#include "gfcpp/GeodeCppCache.hpp"
 
 /* This is to test
 1) If Connections are left idle ,they timed out to min connections.

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp b/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
index 611be37..a1096f8 100644
--- a/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
+++ b/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
 #include <gfcpp/statistics/StatisticsFactory.hpp>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp b/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
index b649060..0d1a8b4 100644
--- a/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
+++ b/src/cppcache/integration-test/testThinClientRegionQueryDifferentServerConfigs.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <string>
 #include "QueryStrings.hpp"
 #include "QueryHelper.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp b/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
index 9a7b402..b6bce77 100644
--- a/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
+++ b/src/cppcache/integration-test/testThinClientRegionQueryExclusiveness.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
index 762db2e..57a79a6 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryFailover.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
index c32c40c..82dfa4a 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryFailoverPdx.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <ace/Task.h>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
index 7bb299e..6a8d26f 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryRS.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp b/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
index dfa36c0..9f28618 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQuerySS.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp b/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
index 9934dde..25b6927 100644
--- a/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteQueryTimeout.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp b/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
index 83fa3a5..0baa5e1 100644
--- a/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoteRegionQuery.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientRemoveOps.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientRemoveOps.cpp b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
index 9239474..8868ff6 100644
--- a/src/cppcache/integration-test/testThinClientRemoveOps.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
@@ -18,7 +18,7 @@
 #define TESTTHINCLIENTREMOVEOPS_HPP_
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp b/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
index 086fad1..e4397b3 100644
--- a/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
+++ b/src/cppcache/integration-test/testThinClientSSLWithSecurityAuthz.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <gfcpp/FunctionService.hpp>
 #include <gfcpp/Execution.hpp>
 

http://git-wip-us.apache.org/repos/asf/geode/blob/2c88dfee/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp b/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp
index d45c386..65b4d6f 100644
--- a/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityAuthentication.cpp
@@ -16,7 +16,7 @@
  */
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
-#include <gfcpp/GemfireCppCache.hpp>
+#include <gfcpp/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 


Mime
View raw message