http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/CacheImplHelper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/CacheImplHelper.hpp b/src/cppcache/integration-test/CacheImplHelper.hpp index cf911b3..ccfdd90 100644 --- a/src/cppcache/integration-test/CacheImplHelper.hpp +++ b/src/cppcache/integration-test/CacheImplHelper.hpp @@ -32,7 +32,7 @@ ROOT_NAME++ + #define ROOT_SCOPE LOCAL #endif - using namespace gemfire; + using namespace apache::geode::client; using namespace unitTests; class CacheImplHelper : public CacheHelper {
http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/CacheableWrapper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/CacheableWrapper.hpp b/src/cppcache/integration-test/CacheableWrapper.hpp index 6abf29b..dd1768f 100644 --- a/src/cppcache/integration-test/CacheableWrapper.hpp +++ b/src/cppcache/integration-test/CacheableWrapper.hpp @@ -22,7 +22,7 @@ #include <map> #include <vector> -using namespace gemfire; +using namespace apache::geode::client; class CacheableWrapper { protected: http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/LibraryCallbacks.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/LibraryCallbacks.cpp b/src/cppcache/integration-test/LibraryCallbacks.cpp index deecff4..7420236 100644 --- a/src/cppcache/integration-test/LibraryCallbacks.cpp +++ b/src/cppcache/integration-test/LibraryCallbacks.cpp @@ -45,17 +45,17 @@ void millisleep(uint32_t x) { extern "C" { -_T_DLL_EXPORT gemfire::CacheListener* createCacheListener() { +_T_DLL_EXPORT apache::geode::client::CacheListener* createCacheListener() { TallyListener* tl = new TallyListener(); tl->beQuiet(true); return tl; } -_T_DLL_EXPORT gemfire::CacheLoader* createCacheLoader() { +_T_DLL_EXPORT apache::geode::client::CacheLoader* createCacheLoader() { return new TallyLoader(); } -_T_DLL_EXPORT gemfire::CacheWriter* createCacheWriter() { +_T_DLL_EXPORT apache::geode::client::CacheWriter* createCacheWriter() { return new TallyWriter(); } } http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/QueryHelper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/QueryHelper.hpp b/src/cppcache/integration-test/QueryHelper.hpp index f4e7f5e..0ad0adb 100644 --- a/src/cppcache/integration-test/QueryHelper.hpp +++ b/src/cppcache/integration-test/QueryHelper.hpp @@ -41,7 +41,7 @@ #define ROOT_SCOPE LOCAL #endif -using namespace gemfire; +using namespace apache::geode::client; using namespace testData; using namespace PdxTests; using namespace testobject; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/TallyListener.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/TallyListener.hpp b/src/cppcache/integration-test/TallyListener.hpp index 6aba345..1da071c 100644 --- a/src/cppcache/integration-test/TallyListener.hpp +++ b/src/cppcache/integration-test/TallyListener.hpp @@ -21,10 +21,10 @@ #include <gfcpp/GemfireCppCache.hpp> #include <string> -using namespace gemfire; +using namespace apache::geode::client; class TallyListener; -typedef gemfire::SharedPtr<TallyListener> TallyListenerPtr; +typedef apache::geode::client::SharedPtr<TallyListener> TallyListenerPtr; class TallyListener : public CacheListener { private: http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/TallyLoader.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/TallyLoader.hpp b/src/cppcache/integration-test/TallyLoader.hpp index 82e03d9..e1c3d8e 100644 --- a/src/cppcache/integration-test/TallyLoader.hpp +++ b/src/cppcache/integration-test/TallyLoader.hpp @@ -19,12 +19,12 @@ #include <gfcpp/GemfireCppCache.hpp> -using namespace gemfire; +using namespace apache::geode::client; using namespace test; class TallyLoader; -typedef gemfire::SharedPtr<TallyLoader> TallyLoaderPtr; +typedef apache::geode::client::SharedPtr<TallyLoader> TallyLoaderPtr; class TallyLoader : virtual public CacheLoader { private: http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/TallyWriter.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/TallyWriter.hpp b/src/cppcache/integration-test/TallyWriter.hpp index d13953e..9ccba62 100644 --- a/src/cppcache/integration-test/TallyWriter.hpp +++ b/src/cppcache/integration-test/TallyWriter.hpp @@ -19,12 +19,12 @@ #include <gfcpp/GemfireCppCache.hpp> -using namespace gemfire; +using namespace apache::geode::client; using namespace test; class TallyWriter; -typedef gemfire::SharedPtr<TallyWriter> TallyWriterPtr; +typedef apache::geode::client::SharedPtr<TallyWriter> TallyWriterPtr; class TallyWriter : virtual public CacheWriter { private: http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientDistOps.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientDistOps.hpp b/src/cppcache/integration-test/ThinClientDistOps.hpp index 8cc5a49..b717918 100644 --- a/src/cppcache/integration-test/ThinClientDistOps.hpp +++ b/src/cppcache/integration-test/ThinClientDistOps.hpp @@ -37,7 +37,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientDistOps2.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientDistOps2.hpp b/src/cppcache/integration-test/ThinClientDistOps2.hpp index 4dfd2df..3a9f07a 100644 --- a/src/cppcache/integration-test/ThinClientDistOps2.hpp +++ b/src/cppcache/integration-test/ThinClientDistOps2.hpp @@ -30,7 +30,7 @@ #include "ThinClientHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientDurable.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientDurable.hpp b/src/cppcache/integration-test/ThinClientDurable.hpp index cf44e79..b61f5e5 100644 --- a/src/cppcache/integration-test/ThinClientDurable.hpp +++ b/src/cppcache/integration-test/ThinClientDurable.hpp @@ -201,22 +201,22 @@ void feederUpdate(int value, int ignoreR2 = false) { continue; } createIntEntry(regionNames[regIdx], mixKeys[0], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[regIdx], mixKeys[1], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[regIdx], mixKeys[2], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[regIdx], mixKeys[3], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); destroyEntry(regionNames[regIdx], mixKeys[0]); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); destroyEntry(regionNames[regIdx], mixKeys[1]); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); destroyEntry(regionNames[regIdx], mixKeys[2]); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); destroyEntry(regionNames[regIdx], mixKeys[3]); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); } } @@ -318,7 +318,7 @@ DUNIT_TASK_DEFINITION(FEEDER, FeederUpdate1) feederUpdate(1); // Wait 5 seconds for events to be removed from ha queues. - gemfire::millisleep(5000); + apache::geode::client::millisleep(5000); LOG("FeederUpdate1 complete."); } http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientDurableFailover.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientDurableFailover.hpp b/src/cppcache/integration-test/ThinClientDurableFailover.hpp index 79d78b9..b252ec0 100644 --- a/src/cppcache/integration-test/ThinClientDurableFailover.hpp +++ b/src/cppcache/integration-test/ThinClientDurableFailover.hpp @@ -187,9 +187,9 @@ void initClientCache(int redundancy, int durableTimeout, OperMonitorPtr& mon, void feederUpdate(int value) { createIntEntry(regionNames[0], mixKeys[0], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[0], mixKeys[1], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); } /* Close Client 1 with option keep alive = true*/ @@ -224,7 +224,7 @@ DUNIT_TASK_DEFINITION(SERVER1, StartServer2) } // sleep for 3 seconds to allow redundancy monitor to detect new server. - gemfire::millisleep(3000); + apache::geode::client::millisleep(3000); LOG("SERVER started"); } END_TASK_DEFINITION @@ -252,7 +252,7 @@ DUNIT_TASK_DEFINITION(FEEDER, FeederUpdate1) feederUpdate(1); // Wait 5 seconds for events to be removed from ha queues. - gemfire::millisleep(5000); + apache::geode::client::millisleep(5000); LOG("FeederUpdate1 complete."); } @@ -263,7 +263,7 @@ DUNIT_TASK_DEFINITION(FEEDER, FeederUpdate2) feederUpdate(2); // Wait 5 seconds for events to be removed from ha queues. - gemfire::millisleep(5000); + apache::geode::client::millisleep(5000); LOG("FeederUpdate2 complete."); } @@ -312,7 +312,7 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1) { CacheHelper::closeServer(1); // Wait 2 seconds to allow client failover. - gemfire::millisleep(2000); + apache::geode::client::millisleep(2000); LOG("SERVER closed"); } END_TASK_DEFINITION http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientDurableInterest.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientDurableInterest.hpp b/src/cppcache/integration-test/ThinClientDurableInterest.hpp index 3b67d7f..413c314 100644 --- a/src/cppcache/integration-test/ThinClientDurableInterest.hpp +++ b/src/cppcache/integration-test/ThinClientDurableInterest.hpp @@ -184,21 +184,21 @@ void initClientRemoveIntrest(int ClientIdx, OperMonitorPtr mon) { void feederUpdate(int value) { createIntEntry(regionNames[0], mixKeys[0], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[0], mixKeys[1], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); } void feederUpdate1(int value) { createIntEntry(regionNames[0], mixKeys[0], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[0], mixKeys[1], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[1], mixKeys[2], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[1], mixKeys[3], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); } DUNIT_TASK_DEFINITION(FEEDER, FeederInit) http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientFailover.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientFailover.hpp b/src/cppcache/integration-test/ThinClientFailover.hpp index 3554cfa..f1c955d 100644 --- a/src/cppcache/integration-test/ThinClientFailover.hpp +++ b/src/cppcache/integration-test/ThinClientFailover.hpp @@ -26,7 +26,7 @@ #define ROOT_SCOPE DISTRIBUTED_ACK #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientFailover2.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientFailover2.hpp b/src/cppcache/integration-test/ThinClientFailover2.hpp index 3c102a6..540d378 100644 --- a/src/cppcache/integration-test/ThinClientFailover2.hpp +++ b/src/cppcache/integration-test/ThinClientFailover2.hpp @@ -27,7 +27,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; /* * This test for client failover with client notification. http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientFailover3.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientFailover3.hpp b/src/cppcache/integration-test/ThinClientFailover3.hpp index 5230890..4d92afa 100644 --- a/src/cppcache/integration-test/ThinClientFailover3.hpp +++ b/src/cppcache/integration-test/ThinClientFailover3.hpp @@ -27,7 +27,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientFailoverInterest.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientFailoverInterest.hpp b/src/cppcache/integration-test/ThinClientFailoverInterest.hpp index c26ca80..93f8962 100644 --- a/src/cppcache/integration-test/ThinClientFailoverInterest.hpp +++ b/src/cppcache/integration-test/ThinClientFailoverInterest.hpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp b/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp index 4aa31a1..638277d 100644 --- a/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp +++ b/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; CacheHelper* cacheHelper = NULL; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp b/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp index 7692312..62876c3 100644 --- a/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp +++ b/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp @@ -25,7 +25,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; CacheHelper* cacheHelper = NULL; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientFailoverRegex.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientFailoverRegex.hpp b/src/cppcache/integration-test/ThinClientFailoverRegex.hpp index e88e5c6..d3e3d1f 100644 --- a/src/cppcache/integration-test/ThinClientFailoverRegex.hpp +++ b/src/cppcache/integration-test/ThinClientFailoverRegex.hpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientGatewayTest.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientGatewayTest.hpp b/src/cppcache/integration-test/ThinClientGatewayTest.hpp index c6d941d..b9831e5 100644 --- a/src/cppcache/integration-test/ThinClientGatewayTest.hpp +++ b/src/cppcache/integration-test/ThinClientGatewayTest.hpp @@ -29,7 +29,7 @@ #define CLIENT1 s1p1 #define CLIENT2 s1p2 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #include <gfcpp/GemfireCppCache.hpp> @@ -60,7 +60,7 @@ class MyListener : public CacheListener { int getNumEvents() { return m_events; } }; -typedef gemfire::SharedPtr<MyListener> MyListenerPtr; +typedef apache::geode::client::SharedPtr<MyListener> MyListenerPtr; void setCacheListener(const char* regName, TallyListenerPtr regListener) { RegionPtr reg = getHelper()->getRegion(regName); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientHeapLRU.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientHeapLRU.hpp b/src/cppcache/integration-test/ThinClientHeapLRU.hpp index ec41611..9e4d206 100644 --- a/src/cppcache/integration-test/ThinClientHeapLRU.hpp +++ b/src/cppcache/integration-test/ThinClientHeapLRU.hpp @@ -30,7 +30,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientHelper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientHelper.hpp b/src/cppcache/integration-test/ThinClientHelper.hpp index 286d33e..c39f181 100644 --- a/src/cppcache/integration-test/ThinClientHelper.hpp +++ b/src/cppcache/integration-test/ThinClientHelper.hpp @@ -38,7 +38,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace unitTests; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientInterest1.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientInterest1.hpp b/src/cppcache/integration-test/ThinClientInterest1.hpp index 83ef752..298f1be 100644 --- a/src/cppcache/integration-test/ThinClientInterest1.hpp +++ b/src/cppcache/integration-test/ThinClientInterest1.hpp @@ -22,7 +22,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = true; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientInterest2.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientInterest2.hpp b/src/cppcache/integration-test/ThinClientInterest2.hpp index f1bad2f..7ae133c 100644 --- a/src/cppcache/integration-test/ThinClientInterest2.hpp +++ b/src/cppcache/integration-test/ThinClientInterest2.hpp @@ -22,7 +22,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = true; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientInterest3.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientInterest3.hpp b/src/cppcache/integration-test/ThinClientInterest3.hpp index a5e8f21..db531d4 100644 --- a/src/cppcache/integration-test/ThinClientInterest3.hpp +++ b/src/cppcache/integration-test/ThinClientInterest3.hpp @@ -24,7 +24,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = true; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp b/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp index c71f918..0ce6754 100644 --- a/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp +++ b/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp @@ -24,7 +24,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = true; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientInterestList.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientInterestList.hpp b/src/cppcache/integration-test/ThinClientInterestList.hpp index de32de4..9558680 100644 --- a/src/cppcache/integration-test/ThinClientInterestList.hpp +++ b/src/cppcache/integration-test/ThinClientInterestList.hpp @@ -25,7 +25,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientInterestList2.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientInterestList2.hpp b/src/cppcache/integration-test/ThinClientInterestList2.hpp index ca0bf53..8d0a81e 100644 --- a/src/cppcache/integration-test/ThinClientInterestList2.hpp +++ b/src/cppcache/integration-test/ThinClientInterestList2.hpp @@ -25,7 +25,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientListenerInit.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientListenerInit.hpp b/src/cppcache/integration-test/ThinClientListenerInit.hpp index 5ae3fdb..8d38dd6 100644 --- a/src/cppcache/integration-test/ThinClientListenerInit.hpp +++ b/src/cppcache/integration-test/ThinClientListenerInit.hpp @@ -27,7 +27,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; static bool isLocator = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientListenerWriter.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientListenerWriter.hpp b/src/cppcache/integration-test/ThinClientListenerWriter.hpp index bd16eec..ea763c4 100644 --- a/src/cppcache/integration-test/ThinClientListenerWriter.hpp +++ b/src/cppcache/integration-test/ThinClientListenerWriter.hpp @@ -28,7 +28,8 @@ #define CLIENT3 s2p2 class SimpleCacheListener; -typedef gemfire::SharedPtr<SimpleCacheListener> SimpleCacheListenerPtr; +typedef apache::geode::client::SharedPtr<SimpleCacheListener> + SimpleCacheListenerPtr; // The SimpleCacheListener class. class SimpleCacheListener : public CacheListener { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp index 9f22dba..92c25bd 100644 --- a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp +++ b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp @@ -25,7 +25,7 @@ #define CLIENT1 s1p1 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; TallyLoaderPtr reg1Loader1; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientNotification.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientNotification.hpp b/src/cppcache/integration-test/ThinClientNotification.hpp index 079c06a..df21d34 100644 --- a/src/cppcache/integration-test/ThinClientNotification.hpp +++ b/src/cppcache/integration-test/ThinClientNotification.hpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; CacheHelper* cacheHelper = NULL; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientPdxSerializer.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientPdxSerializer.hpp b/src/cppcache/integration-test/ThinClientPdxSerializer.hpp index a3e786e..c592976 100644 --- a/src/cppcache/integration-test/ThinClientPdxSerializer.hpp +++ b/src/cppcache/integration-test/ThinClientPdxSerializer.hpp @@ -34,7 +34,7 @@ #include "testobject/NonPdxType.hpp" #include "ThinClientPdxSerializers.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace PdxTests; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientPutAll.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientPutAll.hpp b/src/cppcache/integration-test/ThinClientPutAll.hpp index b72ab59..9c30639 100644 --- a/src/cppcache/integration-test/ThinClientPutAll.hpp +++ b/src/cppcache/integration-test/ThinClientPutAll.hpp @@ -30,7 +30,7 @@ #define ROOT_SCOPE DISTRIBUTED_ACK #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp b/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp index fe4c972..c1b79a4 100644 --- a/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp +++ b/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp @@ -24,7 +24,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = true; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp b/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp index 9019d02..9335fa8 100644 --- a/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp +++ b/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp @@ -30,7 +30,7 @@ #define ROOT_SCOPE DISTRIBUTED_ACK #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientPutGetAll.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientPutGetAll.hpp b/src/cppcache/integration-test/ThinClientPutGetAll.hpp index 2deeb06..9aa6b31 100644 --- a/src/cppcache/integration-test/ThinClientPutGetAll.hpp +++ b/src/cppcache/integration-test/ThinClientPutGetAll.hpp @@ -34,7 +34,7 @@ #include "testobject/PdxClassV2.hpp" using namespace PdxTests; -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp index 7a0c99b..c3931f9 100644 --- a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp +++ b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp @@ -25,7 +25,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientRegex.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRegex.hpp b/src/cppcache/integration-test/ThinClientRegex.hpp index ae9fe8e..64425a0 100644 --- a/src/cppcache/integration-test/ThinClientRegex.hpp +++ b/src/cppcache/integration-test/ThinClientRegex.hpp @@ -25,7 +25,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientRegex2.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRegex2.hpp b/src/cppcache/integration-test/ThinClientRegex2.hpp index 0321c1e..5cdffa5 100644 --- a/src/cppcache/integration-test/ThinClientRegex2.hpp +++ b/src/cppcache/integration-test/ThinClientRegex2.hpp @@ -25,7 +25,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientRegex3.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRegex3.hpp b/src/cppcache/integration-test/ThinClientRegex3.hpp index 99e444f..560e231 100644 --- a/src/cppcache/integration-test/ThinClientRegex3.hpp +++ b/src/cppcache/integration-test/ThinClientRegex3.hpp @@ -25,7 +25,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientRemoveAll.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRemoveAll.hpp b/src/cppcache/integration-test/ThinClientRemoveAll.hpp index 03282d4..b96c3ea 100644 --- a/src/cppcache/integration-test/ThinClientRemoveAll.hpp +++ b/src/cppcache/integration-test/ThinClientRemoveAll.hpp @@ -34,7 +34,7 @@ #define ROOT_SCOPE DISTRIBUTED_ACK #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientSSL.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientSSL.hpp b/src/cppcache/integration-test/ThinClientSSL.hpp index 607924e..4711e2a 100644 --- a/src/cppcache/integration-test/ThinClientSSL.hpp +++ b/src/cppcache/integration-test/ThinClientSSL.hpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; CacheHelper* cacheHelper = NULL; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp index 37b1c8d..2529d85 100644 --- a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp +++ b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; CacheHelper* cacheHelper = NULL; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientSecurityHelper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp index 28bc3ae..68ce8fa 100644 --- a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp +++ b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp @@ -19,8 +19,8 @@ #include "ThinClientHelper.hpp" #include "ace/Process.h" -using namespace gemfire::testframework::security; -using namespace gemfire; +using namespace apache::geode::client::testframework::security; +using namespace apache::geode::client; bool isLocator = false; bool isLocalServer = false; @@ -84,20 +84,20 @@ opCodeList::value_type tmpAArr[] = {OP_CREATE, OP_UPDATE, OP_REGION_CLEAR, OP_REGISTER_INTEREST, OP_GET}; -#define HANDLE_NOT_AUTHORIZED_EXCEPTION \ - catch (const gemfire::NotAuthorizedException&) { \ - LOG("NotAuthorizedException Caught"); \ - LOG("Success"); \ - } \ - catch (const gemfire::Exception& other) { \ - other.printStackTrace(); \ - FAIL(other.getMessage()); \ +#define HANDLE_NOT_AUTHORIZED_EXCEPTION \ + catch (const apache::geode::client::NotAuthorizedException&) { \ + LOG("NotAuthorizedException Caught"); \ + LOG("Success"); \ + } \ + catch (const apache::geode::client::Exception& other) { \ + other.printStackTrace(); \ + FAIL(other.getMessage()); \ } -#define HANDLE_CACHEWRITER_EXCEPTION \ - catch (const gemfire::CacheWriterException&) { \ - LOG("CacheWriterException Caught"); \ - LOG("Success"); \ +#define HANDLE_CACHEWRITER_EXCEPTION \ + catch (const apache::geode::client::CacheWriterException&) { \ + LOG("CacheWriterException Caught"); \ + LOG("Success"); \ } #define TYPE_ADMIN_CLIENT 'A' http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientTXFailover.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientTXFailover.hpp b/src/cppcache/integration-test/ThinClientTXFailover.hpp index e571986..0d19626 100644 --- a/src/cppcache/integration-test/ThinClientTXFailover.hpp +++ b/src/cppcache/integration-test/ThinClientTXFailover.hpp @@ -26,7 +26,7 @@ #define ROOT_SCOPE DISTRIBUTED_ACK #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientTransactions.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientTransactions.hpp b/src/cppcache/integration-test/ThinClientTransactions.hpp index 0311597..4d8e44f 100644 --- a/src/cppcache/integration-test/ThinClientTransactions.hpp +++ b/src/cppcache/integration-test/ThinClientTransactions.hpp @@ -30,7 +30,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/ThinClientTransactionsXA.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp index 15c3186..3242743 100644 --- a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp +++ b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp @@ -30,7 +30,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/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 84973ce..dca64e3 100644 --- a/src/cppcache/integration-test/fw_dunit.cpp +++ b/src/cppcache/integration-test/fw_dunit.cpp @@ -842,7 +842,7 @@ int dmain(int argc, ACE_TCHAR* argv[]) { #ifdef WIN32 char* envsetting = ACE_OS::getenv("BUG481"); if (envsetting != NULL && strlen(envsetting) > 0) { - gemfire::setNewAndDelete(&operator new, & operator delete); + apache::geode::client::setNewAndDelete(&operator new, & operator delete); } #endif @@ -929,7 +929,7 @@ int dmain(int argc, ACE_TCHAR* argv[]) { } catch (dunit::TestException& te) { te.print(); - } catch (gemfire::testframework::FwkException& fe) { + } catch (apache::geode::client::testframework::FwkException& fe) { printf("Exception: %s\n", fe.what()); fflush(stdout); } catch (...) { @@ -992,7 +992,7 @@ Record& Record::operator=(const Record& other) { return *this; } -void Record::write(gemfire::DataOutput& output) { +void Record::write(apache::geode::client::DataOutput& output) { output.writeASCII(m_testName.c_str(), static_cast<uint32_t>(m_testName.length())); output.writeInt(m_operations); @@ -1000,7 +1000,7 @@ void Record::write(gemfire::DataOutput& output) { output.writeInt(m_stopTime.msec()); } -void Record::read(gemfire::DataInput& input) { +void Record::read(apache::geode::client::DataInput& input) { char* buf = NULL; input.readASCII(&buf); m_testName = buf; @@ -1054,7 +1054,7 @@ void PerfSuite::save() { /* Currently having trouble with windows... not useful until the compare function is written anyway... - gemfire::DataOutput output; + apache::geode::client::DataOutput output; output.writeASCII( m_suiteName.c_str(), m_suiteName.length() ); char hname[100]; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/fw_dunit.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/fw_dunit.hpp b/src/cppcache/integration-test/fw_dunit.hpp index 3c1a42d..046b2cc 100644 --- a/src/cppcache/integration-test/fw_dunit.hpp +++ b/src/cppcache/integration-test/fw_dunit.hpp @@ -43,7 +43,8 @@ Tasks are executed in the order, from top to bottom, that they are found in the test source file. If any task throws an uncaught exception, the framework will catch the exception and consider it a test failure. If the exception is of type dunit::TestException, then it will be logged. -(@TODO: catch and log gemfire::Exception types, and std::exceptions. ) +(@TODO: catch and log apache::geode::client::Exception types, and +std::exceptions. ) DUNIT_TASK actually begins the definition of a subclass of dunit::Task. And the task Method doTask. The block of code between DUNIT_TASK and END_TASK is @@ -153,41 +154,41 @@ END_TASK(validate) try { // Close the class definition produced by DUNIT_TASK macro. // y is a unique identifier used to generate an instance variable name. -#define END_TASK(y) \ - } \ - catch (gemfire::Exception & ex) { \ - ex.printStackTrace(); \ - FAIL(ex.getMessage()); \ - } \ - catch (std::exception & ex) { \ - FAIL(ex.what()); \ - } \ - catch (dunit::TestException&) { \ - throw; \ - } \ - catch (...) { \ - FAIL("Unknown exception type caught."); \ - } \ - } \ - } \ +#define END_TASK(y) \ + } \ + catch (apache::geode::client::Exception & ex) { \ + ex.printStackTrace(); \ + FAIL(ex.getMessage()); \ + } \ + catch (std::exception & ex) { \ + FAIL(ex.what()); \ + } \ + catch (dunit::TestException&) { \ + throw; \ + } \ + catch (...) { \ + FAIL("Unknown exception type caught."); \ + } \ + } \ + } \ SYMJOIN(a_, __LINE__); -#define ENDTASK \ - } \ - catch (gemfire::Exception & ex) { \ - ex.printStackTrace(); \ - FAIL(ex.getMessage()); \ - } \ - catch (std::exception & ex) { \ - FAIL(ex.what()); \ - } \ - catch (dunit::TestException&) { \ - throw; \ - } \ - catch (...) { \ - FAIL("Unknown exception type caught."); \ - } \ - } \ - } \ +#define ENDTASK \ + } \ + catch (apache::geode::client::Exception & ex) { \ + ex.printStackTrace(); \ + FAIL(ex.getMessage()); \ + } \ + catch (std::exception & ex) { \ + FAIL(ex.what()); \ + } \ + catch (dunit::TestException&) { \ + throw; \ + } \ + catch (...) { \ + FAIL("Unknown exception type caught."); \ + } \ + } \ + } \ SYMJOIN(a_, __LINE__); #define DUNIT_TASK_DEFINITION(x, y) \ @@ -199,23 +200,23 @@ END_TASK(validate) virtual void doTask() { \ const char* fwtest_Name ATTR_UNUSED = DTASKDESC(y, __LINE__); \ try { -#define END_TASK_DEFINITION \ - } \ - catch (gemfire::Exception & ex) { \ - ex.printStackTrace(); \ - FAIL(ex.getMessage()); \ - } \ - catch (std::exception & ex) { \ - FAIL(ex.what()); \ - } \ - catch (dunit::TestException&) { \ - throw; \ - } \ - catch (...) { \ - FAIL("Unknown exception type caught."); \ - } \ - } \ - } \ +#define END_TASK_DEFINITION \ + } \ + catch (apache::geode::client::Exception & ex) { \ + ex.printStackTrace(); \ + FAIL(ex.getMessage()); \ + } \ + catch (std::exception & ex) { \ + FAIL(ex.what()); \ + } \ + catch (dunit::TestException&) { \ + throw; \ + } \ + catch (...) { \ + FAIL("Unknown exception type caught."); \ + } \ + } \ + } \ ; #define CALL_TASK(y) \ DCLASSDEF(y) * DVARNAME(y) ATTR_UNUSED = new DCLASSDEF(y)(); @@ -225,23 +226,23 @@ END_TASK(validate) public: \ DCLASSNAME(Main)() { \ try { -#define END_MAIN \ - } \ - catch (gemfire::Exception & ex) { \ - ex.printStackTrace(); \ - FAIL(ex.getMessage()); \ - } \ - catch (std::exception & ex) { \ - FAIL(ex.what()); \ - } \ - catch (dunit::TestException&) { \ - throw; \ - } \ - catch (...) { \ - FAIL("Unknown exception type caught."); \ - } \ - } \ - } \ +#define END_MAIN \ + } \ + catch (apache::geode::client::Exception & ex) { \ + ex.printStackTrace(); \ + FAIL(ex.getMessage()); \ + } \ + catch (std::exception & ex) { \ + FAIL(ex.what()); \ + } \ + catch (dunit::TestException&) { \ + throw; \ + } \ + catch (...) { \ + FAIL("Unknown exception type caught."); \ + } \ + } \ + } \ SYMJOIN(a_, __LINE__); // identifiers for the different processes. http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/fw_helper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/fw_helper.hpp b/src/cppcache/integration-test/fw_helper.hpp index 5de5ee7..dfe644a 100644 --- a/src/cppcache/integration-test/fw_helper.hpp +++ b/src/cppcache/integration-test/fw_helper.hpp @@ -115,7 +115,8 @@ class TestException { void print() { char buf[256]; - gemfire::Log::formatLogLine(buf, gemfire::Log::Error); + apache::geode::client::Log::formatLogLine( + buf, apache::geode::client::Log::Error); fprintf(stdout, "--->%sTestException: %s in %s at line %d<---\n", buf, m_message.c_str(), m_filename, m_lineno); } @@ -143,7 +144,7 @@ class TestOp { } catch (TestException e) { e.print(); failed.push_back(m_name); - } catch (gemfire::Exception ge) { + } catch (apache::geode::client::Exception ge) { ge.printStackTrace(); failed.push_back(m_name); } @@ -179,7 +180,7 @@ int main(int argc, char* argv[]) #endif { dunit::setupCRTOutput(); - gemfire::CppCacheLibrary::initLib(); + apache::geode::client::CppCacheLibrary::initLib(); // TimeBomb* tb = new TimeBomb(); // tb->arm(); try { @@ -202,7 +203,7 @@ int main(int argc, char* argv[]) fprintf(stdout, "%d tests failed.\n", failures); } fprintf(stdout, "%d tests passed.\n", (testsRun - failures)); - gemfire::CppCacheLibrary::closeLib(); + apache::geode::client::CppCacheLibrary::closeLib(); return failures; } catch (...) { printf("Exception: unhandled/unidentified exception reached main.\n"); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/fw_perf.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/fw_perf.hpp b/src/cppcache/integration-test/fw_perf.hpp index a2a0038..c1b3ac9 100644 --- a/src/cppcache/integration-test/fw_perf.hpp +++ b/src/cppcache/integration-test/fw_perf.hpp @@ -112,9 +112,9 @@ class Record { Record& operator=(const Record& other); - void write(gemfire::DataOutput& output); + void write(apache::geode::client::DataOutput& output); - void read(gemfire::DataInput& input); + void read(apache::geode::client::DataInput& input); int elapsed(); int perSec(); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testAttributesFactory.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testAttributesFactory.cpp b/src/cppcache/integration-test/testAttributesFactory.cpp index 398baed..e75bf8d 100644 --- a/src/cppcache/integration-test/testAttributesFactory.cpp +++ b/src/cppcache/integration-test/testAttributesFactory.cpp @@ -21,7 +21,7 @@ #include <gfcpp/GemfireCppCache.hpp> #include <CacheRegionHelper.hpp> -using namespace gemfire; +using namespace apache::geode::client; BEGIN_TEST(ATTRIBUTE_FACTORY) { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testAttributesMutator.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testAttributesMutator.cpp b/src/cppcache/integration-test/testAttributesMutator.cpp index 1f1d7b2..3e39384 100644 --- a/src/cppcache/integration-test/testAttributesMutator.cpp +++ b/src/cppcache/integration-test/testAttributesMutator.cpp @@ -23,7 +23,7 @@ // this is a test. -using namespace gemfire; +using namespace apache::geode::client; class TestData { public: http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testCache.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testCache.cpp b/src/cppcache/integration-test/testCache.cpp index d55ade0..561733f 100644 --- a/src/cppcache/integration-test/testCache.cpp +++ b/src/cppcache/integration-test/testCache.cpp @@ -21,7 +21,7 @@ #include <CacheRegionHelper.hpp> #include "fw_helper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; BEGIN_TEST(CacheFunction) http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testCacheless.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testCacheless.cpp b/src/cppcache/integration-test/testCacheless.cpp index a85773d..81e6b2d 100644 --- a/src/cppcache/integration-test/testCacheless.cpp +++ b/src/cppcache/integration-test/testCacheless.cpp @@ -23,7 +23,7 @@ #include "ThinClientHelper.hpp" #include "TallyListener.hpp" -using namespace gemfire; +using namespace apache::geode::client; CacheListenerPtr nullListenerPtr; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testConnect.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testConnect.cpp b/src/cppcache/integration-test/testConnect.cpp index 95ad04a..57a1f9e 100644 --- a/src/cppcache/integration-test/testConnect.cpp +++ b/src/cppcache/integration-test/testConnect.cpp @@ -20,7 +20,7 @@ #include "fw_dunit.hpp" #include <gfcpp/GemfireCppCache.hpp> -using namespace gemfire; +using namespace apache::geode::client; const char* host_name = "Suds"; DUNIT_TASK(s1p1, CreateRegionOne) http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testCreateAndDestroyPool.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testCreateAndDestroyPool.cpp b/src/cppcache/integration-test/testCreateAndDestroyPool.cpp index c02b706..c0d6c78 100644 --- a/src/cppcache/integration-test/testCreateAndDestroyPool.cpp +++ b/src/cppcache/integration-test/testCreateAndDestroyPool.cpp @@ -26,7 +26,7 @@ #include "ThinClientHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testDataOutput.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testDataOutput.cpp b/src/cppcache/integration-test/testDataOutput.cpp index 1296f98..80f7ac3 100644 --- a/src/cppcache/integration-test/testDataOutput.cpp +++ b/src/cppcache/integration-test/testDataOutput.cpp @@ -21,7 +21,7 @@ #include <gfcpp/DataOutput.hpp> #include <gfcpp/DataInput.hpp> -using namespace gemfire; +using namespace apache::geode::client; using namespace test; void dumpnbytes(const uint8_t* buf, uint32_t length) { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testEntriesMap.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testEntriesMap.cpp b/src/cppcache/integration-test/testEntriesMap.cpp index cc5c66a..0a58461 100644 --- a/src/cppcache/integration-test/testEntriesMap.cpp +++ b/src/cppcache/integration-test/testEntriesMap.cpp @@ -34,7 +34,7 @@ END_TEST(NotOnWindows) #include <VersionTag.hpp> #include <stdlib.h> -using namespace gemfire; +using namespace apache::geode::client; using namespace std; typedef std::vector<MapEntryImplPtr> VectorOfMapEntry; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testEntriesMapForVersioning.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testEntriesMapForVersioning.cpp b/src/cppcache/integration-test/testEntriesMapForVersioning.cpp index 1f47b35..a4e6bee 100644 --- a/src/cppcache/integration-test/testEntriesMapForVersioning.cpp +++ b/src/cppcache/integration-test/testEntriesMapForVersioning.cpp @@ -57,7 +57,7 @@ END_MAIN #define CLIENT1 s1p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; CacheHelper* cacheHelper = NULL; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testExpiration.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testExpiration.cpp b/src/cppcache/integration-test/testExpiration.cpp index a3136c3..06c0682 100644 --- a/src/cppcache/integration-test/testExpiration.cpp +++ b/src/cppcache/integration-test/testExpiration.cpp @@ -21,7 +21,7 @@ #include <gfcpp/GemfireCppCache.hpp> #include <CacheRegionHelper.hpp> -using namespace gemfire; +using namespace apache::geode::client; ExpirationAction::Action action = ExpirationAction::DESTROY; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testLRUList.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testLRUList.cpp b/src/cppcache/integration-test/testLRUList.cpp index 7c1e619..09e65f7 100644 --- a/src/cppcache/integration-test/testLRUList.cpp +++ b/src/cppcache/integration-test/testLRUList.cpp @@ -32,7 +32,7 @@ END_TEST(NotOnWindows) #include <LRUList.cpp> #include <gfcpp/GemfireCppCache.hpp> -using namespace gemfire; +using namespace apache::geode::client; using namespace test; class MyNode : public SharedBase, public LRUEntryProperties { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testLinkage.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testLinkage.cpp b/src/cppcache/integration-test/testLinkage.cpp index 9d4e2b3..5dc321d 100644 --- a/src/cppcache/integration-test/testLinkage.cpp +++ b/src/cppcache/integration-test/testLinkage.cpp @@ -20,7 +20,7 @@ #include <gfcpp/GemfireCppCache.hpp> #include "fw_helper.hpp" -using namespace gemfire; +using namespace apache::geode::client; /** * @brief Test that we can link to all classes. http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testLogger.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testLogger.cpp b/src/cppcache/integration-test/testLogger.cpp index 8695bf1..b020ce9 100644 --- a/src/cppcache/integration-test/testLogger.cpp +++ b/src/cppcache/integration-test/testLogger.cpp @@ -26,7 +26,7 @@ #define LENGTH_OF_BANNER 16 -using namespace gemfire; +using namespace apache::geode::client; int numOfLinesInFile(const char* fname) { char line[2048]; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp b/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp index 28bc675..1fee793 100644 --- a/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp +++ b/src/cppcache/integration-test/testOverflowPutGetSqLite.cpp @@ -25,7 +25,7 @@ #include <CacheRegionHelper.hpp> #include <ace/OS.h> -using namespace gemfire; +using namespace apache::geode::client; uint32_t numOfEnt; std::string sqlite_dir = "SqLiteRegionData"; @@ -488,9 +488,10 @@ BEGIN_TEST(OverFlowTest_SqLiteFull) try { doNput(regionPtr, 100); FAIL("Didn't get the expected exception"); - } catch (gemfire::Exception ex) { // expected sqlite full exception - // catching generic message as we dont - // have any specific sqlitefull exception + } catch (apache::geode::client::Exception + ex) { // expected sqlite full exception + // catching generic message as we dont + // have any specific sqlitefull exception char buffer[1024]; sprintf(buffer, "Got expected exception %s: msg = %s", ex.getName(), ex.getMessage()); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp b/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp index 0af0527..e19e83b 100644 --- a/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp +++ b/src/cppcache/integration-test/testRegionAccessThreadSafe.cpp @@ -20,7 +20,7 @@ #include <ace/Task.h> #include <ace/Recursive_Thread_Mutex.h> -using namespace gemfire; +using namespace apache::geode::client; class GetRegionThread : public ACE_Task_Base { public: http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testRegionMap.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testRegionMap.cpp b/src/cppcache/integration-test/testRegionMap.cpp index a0dbe89..0596d3e 100644 --- a/src/cppcache/integration-test/testRegionMap.cpp +++ b/src/cppcache/integration-test/testRegionMap.cpp @@ -22,7 +22,7 @@ using test::cout; using test::endl; -using namespace gemfire; +using namespace apache::geode::client; #define ROOT_NAME "testRegionMap" http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testRegionTemplateArgs.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testRegionTemplateArgs.cpp b/src/cppcache/integration-test/testRegionTemplateArgs.cpp index 9add3be..6fc2592 100644 --- a/src/cppcache/integration-test/testRegionTemplateArgs.cpp +++ b/src/cppcache/integration-test/testRegionTemplateArgs.cpp @@ -21,7 +21,7 @@ #include <CacheRegionHelper.hpp> #include "fw_helper.hpp" -using namespace gemfire; +using namespace apache::geode::client; bool CheckBytesEqual(CacheableBytesPtr result, CacheablePtr expected) { CacheableBytesPtr expectedPtr = dynCast<CacheableBytesPtr>(expected); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testSerialization.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testSerialization.cpp b/src/cppcache/integration-test/testSerialization.cpp index 15691b5..8568139 100644 --- a/src/cppcache/integration-test/testSerialization.cpp +++ b/src/cppcache/integration-test/testSerialization.cpp @@ -33,7 +33,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; #include "locator_globals.hpp" @@ -263,7 +263,7 @@ DUNIT_TASK(Sender, SendCT) regionPtr->put(i, OtherType::uniqueCT(i, g_classIdToReturn)); regionPtr->put(i + 1, OtherType::uniqueCT(i + 1, g_classIdToReturn2)); regionPtr->put(i + 2, OtherType::uniqueCT(i + 2, g_classIdToReturn4)); - } catch (const gemfire::TimeoutException&) { + } catch (const apache::geode::client::TimeoutException&) { } } } http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testSharedPtr.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testSharedPtr.cpp b/src/cppcache/integration-test/testSharedPtr.cpp index 2b9a63e..b9cf7ac 100644 --- a/src/cppcache/integration-test/testSharedPtr.cpp +++ b/src/cppcache/integration-test/testSharedPtr.cpp @@ -22,7 +22,7 @@ #include <HostAsm.hpp> -using namespace gemfire; +using namespace apache::geode::client; // Test some HostAsm code first.. DUNIT_TASK(s1p1, HostAsm) http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testSpinLock.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testSpinLock.cpp b/src/cppcache/integration-test/testSpinLock.cpp index 2934ade..7829d9c 100644 --- a/src/cppcache/integration-test/testSpinLock.cpp +++ b/src/cppcache/integration-test/testSpinLock.cpp @@ -26,18 +26,22 @@ #include <ace/Time_Value.h> #include <ace/Guard_T.h> -namespace gemfire { +namespace apache { +namespace geode { +namespace client { CPPCACHE_EXPORT void* testSpinLockCreate(); CPPCACHE_EXPORT void testSpinLockAcquire(void* lock); CPPCACHE_EXPORT void testSpinLockRelease(void* lock); -} // namespace gemfire +} // namespace client +} // namespace geode +} // namespace apache DUNIT_TASK(s1p1, Basic) { - void* lock = gemfire::testSpinLockCreate(); - gemfire::testSpinLockAcquire(lock); - gemfire::testSpinLockRelease(lock); + void* lock = apache::geode::client::testSpinLockCreate(); + apache::geode::client::testSpinLockAcquire(lock); + apache::geode::client::testSpinLockRelease(lock); } END_TASK(Basic) @@ -53,11 +57,11 @@ class ThreadA : public ACE_Task_Base { ThreadA() : ACE_Task_Base() {} int svc() { - gemfire::testSpinLockAcquire(lock); + apache::geode::client::testSpinLockAcquire(lock); LOG("ThreadA: Acquired lock x."); triggerM->release(); triggerA->acquire(); - gemfire::testSpinLockRelease(lock); + apache::geode::client::testSpinLockRelease(lock); LOG("ThreadA: Released lock."); return 0; } @@ -69,11 +73,11 @@ class ThreadB : public ACE_Task_Base { int svc() { triggerB->acquire(); - gemfire::testSpinLockAcquire(lock); + apache::geode::client::testSpinLockAcquire(lock); btime = new ACE_Time_Value(ACE_OS::gettimeofday()); LOG("ThreadB: Acquired lock."); triggerM->release(); - gemfire::testSpinLockRelease(lock); // for cleanly ness. + apache::geode::client::testSpinLockRelease(lock); // for cleanly ness. return 0; } }; @@ -84,7 +88,7 @@ DUNIT_TASK(s1p1, TwoThreads) triggerB = new perf::Semaphore(0); triggerM = new perf::Semaphore(0); - lock = gemfire::testSpinLockCreate(); + lock = apache::geode::client::testSpinLockCreate(); ThreadA* threadA = new ThreadA(); ThreadB* threadB = new ThreadB(); @@ -130,7 +134,7 @@ DUNIT_TASK(s1p1, Cond) ACE_Recursive_Thread_Mutex mutex; ACE_Guard<ACE_Recursive_Thread_Mutex> guard(mutex); - gemfire::Condition cond(mutex); + apache::geode::client::Condition cond(mutex); LOG("About to wait on Condition with past time."); if (cond.waitUntil(&stopAt) != false) { FAIL("Should have timed out immediately."); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testSystemProperties.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testSystemProperties.cpp b/src/cppcache/integration-test/testSystemProperties.cpp index 2af926b..22d342a 100644 --- a/src/cppcache/integration-test/testSystemProperties.cpp +++ b/src/cppcache/integration-test/testSystemProperties.cpp @@ -26,7 +26,7 @@ #include <unistd.h> #endif -using namespace gemfire; +using namespace apache::geode::client; const bool checkSecurityProperties(PropertiesPtr securityProperties, const char* key, const char* value) { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp b/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp index b6ab37b..3a2c6e4 100644 --- a/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp +++ b/src/cppcache/integration-test/testThinClientAfterRegionLive.cpp @@ -32,7 +32,7 @@ static bool isRegionLive[4] = {false, false, false, false}; static bool isRegionDead[4] = {false, false, false, false}; const char* locatorsG = CacheHelper::getLocatorHostPort(isLocator, isLocalServer, numberOfLocators); -using namespace gemfire; +using namespace apache::geode::client; using namespace test; class DisconnectCacheListioner : public CacheListener { int m_index; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientBigValue.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientBigValue.cpp b/src/cppcache/integration-test/testThinClientBigValue.cpp index 9da644f..983a664 100644 --- a/src/cppcache/integration-test/testThinClientBigValue.cpp +++ b/src/cppcache/integration-test/testThinClientBigValue.cpp @@ -24,7 +24,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define MEGABYTE (1024 * 1024) http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp b/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp index e04ad62..6f24b8b 100644 --- a/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp +++ b/src/cppcache/integration-test/testThinClientCacheableStringArray.cpp @@ -33,7 +33,7 @@ #include <gfcpp/Query.hpp> #include <gfcpp/QueryService.hpp> -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace testobject; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCacheables.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCacheables.cpp b/src/cppcache/integration-test/testThinClientCacheables.cpp index d8fd671..a87bfce 100644 --- a/src/cppcache/integration-test/testThinClientCacheables.cpp +++ b/src/cppcache/integration-test/testThinClientCacheables.cpp @@ -29,7 +29,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp b/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp index 67634db..679f0f0 100644 --- a/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp +++ b/src/cppcache/integration-test/testThinClientCacheablesLimits.cpp @@ -29,7 +29,7 @@ #include "CacheHelper.hpp" #include "ThinClientHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientClearRegion.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientClearRegion.cpp b/src/cppcache/integration-test/testThinClientClearRegion.cpp index 15b7ad4..cdb6cf2 100644 --- a/src/cppcache/integration-test/testThinClientClearRegion.cpp +++ b/src/cppcache/integration-test/testThinClientClearRegion.cpp @@ -22,7 +22,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; class MyCacheWriter : public CacheWriter { uint32_t m_clear; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientConflation.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientConflation.cpp b/src/cppcache/integration-test/testThinClientConflation.cpp index af0a1a5..7b0a08a 100644 --- a/src/cppcache/integration-test/testThinClientConflation.cpp +++ b/src/cppcache/integration-test/testThinClientConflation.cpp @@ -176,7 +176,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, ValidateClient1Conflation) { // Client Already Initiated , Send Client Ready and wait getHelper()->cachePtr->readyForEvents(); - gemfire::millisleep(5000); + apache::geode::client::millisleep(5000); mon1C1->validate(true); LOG("Client 1 region 1 verified for conflation = true"); @@ -191,7 +191,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, ValidateClient2Conflation) { // Client Already Initiated , Send Client Ready and wait getHelper()->cachePtr->readyForEvents(); - gemfire::millisleep(5000); + apache::geode::client::millisleep(5000); mon1C2->validate(false); LOG("Client 2 region 1 verified for conflation = false"); @@ -227,7 +227,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, ValidateClient1Server) { // Client Already Initiated , Send Client Ready and wait getHelper()->cachePtr->readyForEvents(); - gemfire::millisleep(5000); + apache::geode::client::millisleep(5000); mon1C1->validate(true); LOG("Client 1 region 1 verified for conflation = server"); @@ -242,7 +242,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, ValidateClient2None) { // Client Already Initiated , Send Client Ready and wait getHelper()->cachePtr->readyForEvents(); - gemfire::millisleep(5000); + apache::geode::client::millisleep(5000); mon1C2->validate(true); LOG("Client 2 region 1 verified for no conflation setting"); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientContainsKeyOnServer.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientContainsKeyOnServer.cpp b/src/cppcache/integration-test/testThinClientContainsKeyOnServer.cpp index 37912ed..5ff29bc 100644 --- a/src/cppcache/integration-test/testThinClientContainsKeyOnServer.cpp +++ b/src/cppcache/integration-test/testThinClientContainsKeyOnServer.cpp @@ -22,7 +22,7 @@ #define CLIENT2 s1p2 #define SERVER1 s2p1 -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #include "locator_globals.hpp" http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCq.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCq.cpp b/src/cppcache/integration-test/testThinClientCq.cpp index bb5fec0..9f062ca 100644 --- a/src/cppcache/integration-test/testThinClientCq.cpp +++ b/src/cppcache/integration-test/testThinClientCq.cpp @@ -39,7 +39,7 @@ #include "ThinClientCQ.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace testData; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCqDelta.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCqDelta.cpp b/src/cppcache/integration-test/testThinClientCqDelta.cpp index e512920..e268714 100644 --- a/src/cppcache/integration-test/testThinClientCqDelta.cpp +++ b/src/cppcache/integration-test/testThinClientCqDelta.cpp @@ -31,7 +31,7 @@ #include <gfcpp/CqQuery.hpp> #include <gfcpp/CqServiceStatistics.hpp> -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace testobject; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCqDurable.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCqDurable.cpp b/src/cppcache/integration-test/testThinClientCqDurable.cpp index 5b5f779..3eb14c4 100644 --- a/src/cppcache/integration-test/testThinClientCqDurable.cpp +++ b/src/cppcache/integration-test/testThinClientCqDurable.cpp @@ -35,7 +35,7 @@ #include "ThinClientCQ.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace testData; @@ -216,7 +216,7 @@ void RunDurableCqClient() { // execute Cq Query qry->execute(); - gemfire::millisleep(10000); + apache::geode::client::millisleep(10000); LOGINFO("Executed new CqQuery"); @@ -227,7 +227,7 @@ void RunDurableCqClient() { LOGINFO("Sent ReadyForEvents message to server"); // wait for some time to recieve events - gemfire::millisleep(10000); + apache::geode::client::millisleep(10000); // Close the GemFire Cache with keepalive = true. Server will queue events // for @@ -263,7 +263,7 @@ void RunFeederClient() { regionPtr->put(keyPtr, valPtr); } - gemfire::millisleep(10000); + apache::geode::client::millisleep(10000); LOGINFO("put on 0-10 keys done."); // Close the GemFire Cache @@ -296,7 +296,7 @@ void RunFeederClient1() { regionPtr->put(keyPtr, valPtr); } - gemfire::millisleep(10000); + apache::geode::client::millisleep(10000); LOGINFO("put on 0-10 keys done."); // Close the GemFire Cache http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCqFailover.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCqFailover.cpp b/src/cppcache/integration-test/testThinClientCqFailover.cpp index f892bbd..47ee1b9 100644 --- a/src/cppcache/integration-test/testThinClientCqFailover.cpp +++ b/src/cppcache/integration-test/testThinClientCqFailover.cpp @@ -38,7 +38,7 @@ #include "ThinClientCQ.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace testobject; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCqHAFailover.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCqHAFailover.cpp b/src/cppcache/integration-test/testThinClientCqHAFailover.cpp index 189eb7e..1aa11ab 100644 --- a/src/cppcache/integration-test/testThinClientCqHAFailover.cpp +++ b/src/cppcache/integration-test/testThinClientCqHAFailover.cpp @@ -38,7 +38,7 @@ #include "ThinClientCQ.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace testobject; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientCqIR.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientCqIR.cpp b/src/cppcache/integration-test/testThinClientCqIR.cpp index 9c59732..992ebe3 100644 --- a/src/cppcache/integration-test/testThinClientCqIR.cpp +++ b/src/cppcache/integration-test/testThinClientCqIR.cpp @@ -38,7 +38,7 @@ #include "ThinClientCQ.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; using namespace testData; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientDeltaWithNotification.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientDeltaWithNotification.cpp b/src/cppcache/integration-test/testThinClientDeltaWithNotification.cpp index 4e65a26..c3c30df 100644 --- a/src/cppcache/integration-test/testThinClientDeltaWithNotification.cpp +++ b/src/cppcache/integration-test/testThinClientDeltaWithNotification.cpp @@ -26,7 +26,7 @@ #include "DeltaEx.hpp" #include "fw_dunit.hpp" #include <string> -using namespace gemfire; +using namespace apache::geode::client; using namespace test; CacheHelper* cacheHelper = NULL; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp b/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp index f2f00ff..8253159 100644 --- a/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp +++ b/src/cppcache/integration-test/testThinClientDisconnectionListioner.cpp @@ -31,7 +31,7 @@ static int numberOfLocators = 1; static int isDisconnected = false; const char* locatorsG = CacheHelper::getLocatorHostPort(isLocator, isLocalServer, numberOfLocators); -using namespace gemfire; +using namespace apache::geode::client; using namespace test; class DisconnectCacheListioner : public CacheListener { void afterRegionDisconnected(const RegionPtr& region) { http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp b/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp index 18147dc..eff5c9b 100644 --- a/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp +++ b/src/cppcache/integration-test/testThinClientFixedPartitionResolver.cpp @@ -35,7 +35,7 @@ const char* partitionRegionNames[] = {"R1", "R2", "R3"}; const char* partitionRegionName; -using namespace gemfire; +using namespace apache::geode::client; class CustomFixedPartitionResolver1 : public FixedPartitionResolver { public: CustomFixedPartitionResolver1() {} http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientGetInterests.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientGetInterests.cpp b/src/cppcache/integration-test/testThinClientGetInterests.cpp index e3a311d..51c8558 100644 --- a/src/cppcache/integration-test/testThinClientGetInterests.cpp +++ b/src/cppcache/integration-test/testThinClientGetInterests.cpp @@ -24,7 +24,7 @@ #include "locator_globals.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; const char* durableIds[] = {"DurableId1", "DurableId2"}; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientHADistOps.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientHADistOps.cpp b/src/cppcache/integration-test/testThinClientHADistOps.cpp index b8e5fc2..51d21a4 100644 --- a/src/cppcache/integration-test/testThinClientHADistOps.cpp +++ b/src/cppcache/integration-test/testThinClientHADistOps.cpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; #define CLIENT1 s1p1 http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp b/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp index 9bd30de..c3ed74c 100644 --- a/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp +++ b/src/cppcache/integration-test/testThinClientHAEventIDMap.cpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; class DupChecker : public CacheListener { @@ -485,21 +485,21 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateEntries) { for (int value = 1; value <= 100; value++) { createIntEntry(regionNames[0], keys[0], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[0], keys[1], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[0], keys[2], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[0], keys[3], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[1], keys[0], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[1], keys[1], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[1], keys[2], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); createIntEntry(regionNames[1], keys[3], value); - gemfire::millisleep(10); + apache::geode::client::millisleep(10); } } END_TASK_DEFINITION @@ -515,7 +515,8 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT2, VerifyClient2Entries) { - gemfire::millisleep(30000); // wait 30 sec for notifications to complete + apache::geode::client::millisleep( + 30000); // wait 30 sec for notifications to complete verifyIntEntry(regionNames[0], keys[0], 100); verifyIntEntry(regionNames[0], keys[1], 100); http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientHAFailover.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientHAFailover.cpp b/src/cppcache/integration-test/testThinClientHAFailover.cpp index 4bdbb19..8156d5b 100644 --- a/src/cppcache/integration-test/testThinClientHAFailover.cpp +++ b/src/cppcache/integration-test/testThinClientHAFailover.cpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp b/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp index c849c7f..9bcd6e1 100644 --- a/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp +++ b/src/cppcache/integration-test/testThinClientHAFailoverRegex.cpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp b/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp index 8379c94..3201b9a 100644 --- a/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp +++ b/src/cppcache/integration-test/testThinClientHAMixedRedundancy.cpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; bool isLocalServer = false; http://git-wip-us.apache.org/repos/asf/geode/blob/e4fd74fb/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp b/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp index fa4981b..43882e9 100644 --- a/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp +++ b/src/cppcache/integration-test/testThinClientHAPeriodicAck.cpp @@ -26,7 +26,7 @@ #include "CacheHelper.hpp" -using namespace gemfire; +using namespace apache::geode::client; using namespace test; class DupChecker : public CacheListener { @@ -489,21 +489,21 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateEntries) { for (int value = 1; value <= 100; value++) { createIntEntry(regionNames[0], keys[0], value); - gemfire::millisleep(50); + apache::geode::client::millisleep(50); createIntEntry(regionNames[0], keys[1], value); - gemfire::millisleep(50); + apache::geode::client::millisleep(50); createIntEntry(regionNames[0], keys[2], value); - gemfire::millisleep(50); + apache::geode::client::millisleep(50); createIntEntry(regionNames[0], keys[3], value); - gemfire::millisleep(50); + apache::geode::client::millisleep(50); createIntEntry(regionNames[1], keys[0], value); - gemfire::millisleep(50); + apache::geode::client::millisleep(50); createIntEntry(regionNames[1], keys[1], value); - gemfire::millisleep(50); + apache::geode::client::millisleep(50); createIntEntry(regionNames[1], keys[2], value); - gemfire::millisleep(50); + apache::geode::client::millisleep(50); createIntEntry(regionNames[1], keys[3], value); - gemfire::millisleep(50); + apache::geode::client::millisleep(50); } } END_TASK_DEFINITION
