geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [03/31] geode-native git commit: GEODE-2476: Replace gfcpp with geode.
Date Tue, 21 Feb 2017 17:40:16 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/dllmain.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/dllmain.cpp b/src/cppcache/src/dllmain.cpp
index ca446b0..d7d9854 100644
--- a/src/cppcache/src/dllmain.cpp
+++ b/src/cppcache/src/dllmain.cpp
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string>
 #include "Utils.hpp"
-#include <gfcpp/Exception.hpp>
+#include <geode/Exception.hpp>
 #include <ace/TSS_T.h>
 
 void initLibDllEntry(void);

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/geodeBanner.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/geodeBanner.cpp b/src/cppcache/src/geodeBanner.cpp
new file mode 100644
index 0000000..1a4c867
--- /dev/null
+++ b/src/cppcache/src/geodeBanner.cpp
@@ -0,0 +1,26 @@
+#include "geodeBanner.hpp"
+using namespace apache::geode::client;
+std::string geodeBanner::getBanner() {
+  std::string str =
+      "------------------------------------------------------------------------"
+      "---\n"
+      "Licensed to the Apache Software Foundation (ASF) under one or more\n"
+      "contributor license agreements.  See the NOTICE file distributed with\n"
+      "this work for additional information regarding copyright ownership.\n"
+      "The ASF licenses this file to You under the Apache License, Version "
+      "2.0\n"
+      "(the \"License\"); you may not use this file except in compliance with\n"
+      "the License.  You may obtain a copy of the License at\n"
+      "\n"
+      "     http://www.apache.org/licenses/LICENSE-2.0\n"
+      "\n"
+      "Unless required by applicable law or agreed to in writing, software\n"
+      "distributed under the License is distributed on an \"AS IS\" BASIS,\n"
+      "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or "
+      "implied.\n"
+      "See the License for the specific language governing permissions and\n"
+      "limitations under the License.\n"
+      "------------------------------------------------------------------------"
+      "---\n";
+  return str;
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/geodeBanner.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/geodeBanner.hpp b/src/cppcache/src/geodeBanner.hpp
new file mode 100644
index 0000000..1c2b0ec
--- /dev/null
+++ b/src/cppcache/src/geodeBanner.hpp
@@ -0,0 +1,35 @@
+#pragma once
+
+#ifndef GEODE_GFCPPBANNER_H_
+#define GEODE_GFCPPBANNER_H_
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <string>
+namespace apache {
+namespace geode {
+namespace client {
+class geodeBanner {
+ public:
+  static std::string getBanner();
+};
+}  // namespace client
+}  // namespace geode
+}  // namespace apache
+
+#endif  // GEODE_GFCPPBANNER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/gfcppBanner.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/gfcppBanner.cpp b/src/cppcache/src/gfcppBanner.cpp
deleted file mode 100644
index 46c7623..0000000
--- a/src/cppcache/src/gfcppBanner.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "gfcppBanner.hpp"
-using namespace apache::geode::client;
-std::string gfcppBanner::getBanner() {
-  std::string str =
-      "------------------------------------------------------------------------"
-      "---\n"
-      "Licensed to the Apache Software Foundation (ASF) under one or more\n"
-      "contributor license agreements.  See the NOTICE file distributed with\n"
-      "this work for additional information regarding copyright ownership.\n"
-      "The ASF licenses this file to You under the Apache License, Version "
-      "2.0\n"
-      "(the \"License\"); you may not use this file except in compliance with\n"
-      "the License.  You may obtain a copy of the License at\n"
-      "\n"
-      "     http://www.apache.org/licenses/LICENSE-2.0\n"
-      "\n"
-      "Unless required by applicable law or agreed to in writing, software\n"
-      "distributed under the License is distributed on an \"AS IS\" BASIS,\n"
-      "WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or "
-      "implied.\n"
-      "See the License for the specific language governing permissions and\n"
-      "limitations under the License.\n"
-      "------------------------------------------------------------------------"
-      "---\n";
-  return str;
-}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/gfcppBanner.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/gfcppBanner.hpp b/src/cppcache/src/gfcppBanner.hpp
deleted file mode 100644
index 9b9fdcc..0000000
--- a/src/cppcache/src/gfcppBanner.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#ifndef GEODE_GFCPPBANNER_H_
-#define GEODE_GFCPPBANNER_H_
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <string>
-namespace apache {
-namespace geode {
-namespace client {
-class gfcppBanner {
- public:
-  static std::string getBanner();
-};
-}  // namespace client
-}  // namespace geode
-}  // namespace apache
-
-#endif // GEODE_GFCPPBANNER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp b/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
index c237891..949e178 100644
--- a/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
+++ b/src/cppcache/src/statistics/AtomicStatisticsImpl.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <ace/Atomic_Op_T.h>
 #include <ace/Recursive_Thread_Mutex.h>
@@ -95,7 +95,7 @@ AtomicStatisticsImpl::AtomicStatisticsImpl(StatisticsType* typeArg,
 
     if (intCount > 0) {
       intStorage =
-          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, int32>[intCount];
+          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, int32>[ intCount ];
       for (int32 i = 0; i < intCount; i++) {
         intStorage[i] = 0;  // Un-initialized state
       }
@@ -105,7 +105,7 @@ AtomicStatisticsImpl::AtomicStatisticsImpl(StatisticsType* typeArg,
     }
     if (longCount > 0) {
       longStorage =
-          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, int64>[longCount];
+          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, int64>[ longCount ];
       for (int32 i = 0; i < longCount; i++) {
         longStorage[i] = 0;  // Un-initialized state
       }
@@ -115,7 +115,7 @@ AtomicStatisticsImpl::AtomicStatisticsImpl(StatisticsType* typeArg,
     }
     if (doubleCount > 0) {
       doubleStorage =
-          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, double>[doubleCount];
+          new ACE_Atomic_Op<ACE_Recursive_Thread_Mutex, double>[ doubleCount ];
       for (int32 i = 0; i < doubleCount; i++) {
         doubleStorage[i] = 0;  // Un-initialized state
       }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp b/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
index 5f11820..06c9c98 100644
--- a/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
+++ b/src/cppcache/src/statistics/AtomicStatisticsImpl.hpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <ace/Atomic_Op_T.h>
 #include <ace/Recursive_Thread_Mutex.h>
 #include <HostAsm.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
+#include <geode/statistics/Statistics.hpp>
 #include "StatisticsTypeImpl.hpp"
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include <string>
 
 #include <NonCopyable.hpp>
@@ -249,4 +249,4 @@ class AtomicStatisticsImpl : public Statistics, private NonCopyable {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_ATOMICSTATISTICSIMPL_H_
+#endif  // GEODE_STATISTICS_ATOMICSTATISTICSIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp
index df972a1..251873e 100644
--- a/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp
+++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <ace/Recursive_Thread_Mutex.h>
 #include <ace/OS.h>
 #include <ace/Thread_Mutex.h>
 #include <ace/Guard_T.h>
-#include <gfcpp/Exception.hpp>
+#include <geode/Exception.hpp>
 #include "GeodeStatisticsFactory.hpp"
-#include <gfcpp/Log.hpp>
+#include <geode/Log.hpp>
 #include <string>
 #include "AtomicStatisticsImpl.hpp"
 #include "OsStatisticsImpl.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
index 9a75543..fc0e198 100644
--- a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
+++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <sys/types.h>
 #ifndef WIN32
@@ -30,9 +30,9 @@
 #include <ace/Recursive_Thread_Mutex.h>
 #include <ace/Map_Manager.h>
 #include "StatisticsTypeImpl.hpp"
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include "StatisticsManager.hpp"
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/ExceptionTypes.hpp>
 
 using namespace apache::geode::client;
 
@@ -152,4 +152,4 @@ class GeodeStatisticsFactory : public StatisticsFactory {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_GEODESTATISTICSFACTORY_H_
+#endif  // GEODE_STATISTICS_GEODESTATISTICSFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelper.cpp b/src/cppcache/src/statistics/HostStatHelper.cpp
index 19802d3..015ea59 100644
--- a/src/cppcache/src/statistics/HostStatHelper.cpp
+++ b/src/cppcache/src/statistics/HostStatHelper.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <ace/OS_NS_sys_utsname.h>
 #include "HostStatHelper.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelper.hpp b/src/cppcache/src/statistics/HostStatHelper.hpp
index 9b6fcfe..6c5a2aa 100644
--- a/src/cppcache/src/statistics/HostStatHelper.hpp
+++ b/src/cppcache/src/statistics/HostStatHelper.hpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <string>
 #include "StatisticDescriptorImpl.hpp"
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
+#include <geode/statistics/StatisticsType.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
 #include "ProcessStats.hpp"
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include "OsStatisticsImpl.hpp"
 #include "LinuxProcessStats.hpp"
 #include "SolarisProcessStats.hpp"
@@ -82,4 +82,4 @@ class CPPCACHE_EXPORT HostStatHelper {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_HOSTSTATHELPER_H_
+#endif  // GEODE_STATISTICS_HOSTSTATHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelperLinux.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperLinux.cpp b/src/cppcache/src/statistics/HostStatHelperLinux.cpp
index e08f7f7..03c6286 100644
--- a/src/cppcache/src/statistics/HostStatHelperLinux.cpp
+++ b/src/cppcache/src/statistics/HostStatHelperLinux.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #if defined(_LINUX)
 
 #include <ace/OS_NS_sys_utsname.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelperLinux.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperLinux.hpp b/src/cppcache/src/statistics/HostStatHelperLinux.hpp
index 0ce2e2b..abf2257 100644
--- a/src/cppcache/src/statistics/HostStatHelperLinux.hpp
+++ b/src/cppcache/src/statistics/HostStatHelperLinux.hpp
@@ -21,7 +21,7 @@
  */
 
 #if defined(_LINUX)
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <string>
 #include <sys/sysinfo.h>
 #include "ProcessStats.hpp"
@@ -52,4 +52,4 @@ class HostStatHelperLinux {
 
 #endif  // if def(_LINUX)
 
-#endif // GEODE_STATISTICS_HOSTSTATHELPERLINUX_H_
+#endif  // GEODE_STATISTICS_HOSTSTATHELPERLINUX_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelperNull.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperNull.cpp b/src/cppcache/src/statistics/HostStatHelperNull.cpp
index 9e1394e..6e08077 100644
--- a/src/cppcache/src/statistics/HostStatHelperNull.cpp
+++ b/src/cppcache/src/statistics/HostStatHelperNull.cpp
@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelperNull.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperNull.hpp b/src/cppcache/src/statistics/HostStatHelperNull.hpp
index b5192cc..5d329e8 100644
--- a/src/cppcache/src/statistics/HostStatHelperNull.hpp
+++ b/src/cppcache/src/statistics/HostStatHelperNull.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 /** @file
  */
@@ -37,4 +37,4 @@ class HostStatHelperNull {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_HOSTSTATHELPERNULL_H_
+#endif  // GEODE_STATISTICS_HOSTSTATHELPERNULL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelperSolaris.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperSolaris.cpp b/src/cppcache/src/statistics/HostStatHelperSolaris.cpp
index f4f3f3f..26305ee 100644
--- a/src/cppcache/src/statistics/HostStatHelperSolaris.cpp
+++ b/src/cppcache/src/statistics/HostStatHelperSolaris.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #if defined(_SOLARIS)
 #include <ace/OS_NS_sys_utsname.h>
@@ -30,7 +30,7 @@
 #include <sys/proc.h>
 #include <sys/kstat.h>
 #include <glob.h>
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/ExceptionTypes.hpp>
 #include "SolarisProcessStats.hpp"
 #include <ace/OS.h>
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelperSolaris.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperSolaris.hpp b/src/cppcache/src/statistics/HostStatHelperSolaris.hpp
index 372f527..6da1ed8 100644
--- a/src/cppcache/src/statistics/HostStatHelperSolaris.hpp
+++ b/src/cppcache/src/statistics/HostStatHelperSolaris.hpp
@@ -21,7 +21,7 @@
  */
 
 #if defined(_SOLARIS)
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <string>
 #include <sys/sysinfo.h>
 #include "ProcessStats.hpp"
@@ -68,4 +68,4 @@ class HostStatHelperSolaris {
 
 #endif  // if def(_SOLARIS)
 
-#endif // GEODE_STATISTICS_HOSTSTATHELPERSOLARIS_H_
+#endif  // GEODE_STATISTICS_HOSTSTATHELPERSOLARIS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelperWin.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperWin.cpp b/src/cppcache/src/statistics/HostStatHelperWin.cpp
index f5c4926..1648efa 100644
--- a/src/cppcache/src/statistics/HostStatHelperWin.cpp
+++ b/src/cppcache/src/statistics/HostStatHelperWin.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
 #include <ace/OS.h>
+#include <geode/geode_globals.hpp>
 
 #include "HostStatHelperWin.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatHelperWin.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatHelperWin.hpp b/src/cppcache/src/statistics/HostStatHelperWin.hpp
index 1402d79..74ab3e2 100644
--- a/src/cppcache/src/statistics/HostStatHelperWin.hpp
+++ b/src/cppcache/src/statistics/HostStatHelperWin.hpp
@@ -22,7 +22,7 @@
 
 #if defined(_WIN32)
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <string>
 #include <Windows.h>
 #include <WinPerf.h>
@@ -303,4 +303,4 @@ class HostStatHelperWin {
 
 #endif  // (_WIN32)
 
-#endif // GEODE_STATISTICS_HOSTSTATHELPERWIN_H_
+#endif  // GEODE_STATISTICS_HOSTSTATHELPERWIN_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatSampler.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatSampler.cpp b/src/cppcache/src/statistics/HostStatSampler.cpp
index 765f8df..a7286e6 100644
--- a/src/cppcache/src/statistics/HostStatSampler.cpp
+++ b/src/cppcache/src/statistics/HostStatSampler.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <ace/ACE.h>
 #include <ace/Thread_Mutex.h>
@@ -32,9 +32,9 @@
 #include "HostStatHelper.hpp"
 #include "StatArchiveWriter.hpp"
 #include <NanoTimer.hpp>
-#include <gfcpp/DistributedSystem.hpp>
-#include <gfcpp/SystemProperties.hpp>
-#include <gfcpp/Log.hpp>
+#include <geode/DistributedSystem.hpp>
+#include <geode/SystemProperties.hpp>
+#include <geode/Log.hpp>
 #include "GeodeStatisticsFactory.hpp"
 #include <ClientHealthStats.hpp>
 #include <ClientProxyMembershipID.hpp>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/HostStatSampler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/HostStatSampler.hpp b/src/cppcache/src/statistics/HostStatSampler.hpp
index 66ea210..5d0b75c 100644
--- a/src/cppcache/src/statistics/HostStatSampler.hpp
+++ b/src/cppcache/src/statistics/HostStatSampler.hpp
@@ -24,14 +24,14 @@
 #include <vector>
 #include <ace/Task.h>
 #include <ace/Recursive_Thread_Mutex.h>
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
 #include "StatisticsManager.hpp"
-#include <gfcpp/statistics/StatisticsType.hpp>
+#include <geode/statistics/StatisticsType.hpp>
 #include "StatSamplerStats.hpp"
 #include "StatArchiveWriter.hpp"
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/ExceptionTypes.hpp>
 
 #include <NonCopyable.hpp>
 
@@ -253,4 +253,4 @@ class CPPCACHE_EXPORT HostStatSampler : public ACE_Task_Base,
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_HOSTSTATSAMPLER_H_
+#endif  // GEODE_STATISTICS_HOSTSTATSAMPLER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/LinuxProcessStats.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/LinuxProcessStats.cpp b/src/cppcache/src/statistics/LinuxProcessStats.cpp
index eb2501b..1ef0107 100644
--- a/src/cppcache/src/statistics/LinuxProcessStats.cpp
+++ b/src/cppcache/src/statistics/LinuxProcessStats.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <ace/Thread_Mutex.h>
 #include <ace/Singleton.h>
 #include "LinuxProcessStats.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/LinuxProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/LinuxProcessStats.hpp b/src/cppcache/src/statistics/LinuxProcessStats.hpp
index a3004ff..60162b8 100644
--- a/src/cppcache/src/statistics/LinuxProcessStats.hpp
+++ b/src/cppcache/src/statistics/LinuxProcessStats.hpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticsType.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
 #include "ProcessStats.hpp"
 #include "HostStatHelper.hpp"
 
@@ -83,4 +83,4 @@ class CPPCACHE_EXPORT LinuxProcessStats : public ProcessStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_LINUXPROCESSSTATS_H_
+#endif  // GEODE_STATISTICS_LINUXPROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/NullProcessStats.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/NullProcessStats.cpp b/src/cppcache/src/statistics/NullProcessStats.cpp
index 3731827..0a3769c 100644
--- a/src/cppcache/src/statistics/NullProcessStats.cpp
+++ b/src/cppcache/src/statistics/NullProcessStats.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <ace/Thread_Mutex.h>
 #include <ace/Singleton.h>
 #include "NullProcessStats.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/NullProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/NullProcessStats.hpp b/src/cppcache/src/statistics/NullProcessStats.hpp
index 1437ace..ded25b3 100644
--- a/src/cppcache/src/statistics/NullProcessStats.hpp
+++ b/src/cppcache/src/statistics/NullProcessStats.hpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticsType.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
 #include "ProcessStats.hpp"
 #include "HostStatHelper.hpp"
 
@@ -57,4 +57,4 @@ class CPPCACHE_EXPORT NullProcessStats : public ProcessStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_NULLPROCESSSTATS_H_
+#endif  // GEODE_STATISTICS_NULLPROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/OsStatisticsImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/OsStatisticsImpl.hpp b/src/cppcache/src/statistics/OsStatisticsImpl.hpp
index 0084471..6fda68b 100644
--- a/src/cppcache/src/statistics/OsStatisticsImpl.hpp
+++ b/src/cppcache/src/statistics/OsStatisticsImpl.hpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include <gfcpp/statistics/Statistics.hpp>
+#include <geode/statistics/Statistics.hpp>
 #include "StatisticsTypeImpl.hpp"
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include <NonCopyable.hpp>
 
 using namespace apache::geode::client;
@@ -260,4 +260,4 @@ class OsStatisticsImpl : public Statistics,
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_OSSTATISTICSIMPL_H_
+#endif  // GEODE_STATISTICS_OSSTATISTICSIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/PoolStatsSampler.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/PoolStatsSampler.hpp b/src/cppcache/src/statistics/PoolStatsSampler.hpp
index e421bbb..9ee2938 100644
--- a/src/cppcache/src/statistics/PoolStatsSampler.hpp
+++ b/src/cppcache/src/statistics/PoolStatsSampler.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include <ace/Task.h>
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 namespace apache {
 namespace geode {
 namespace client {
@@ -63,4 +63,4 @@ class CPPCACHE_EXPORT PoolStatsSampler : public ACE_Task_Base {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_POOLSTATSSAMPLER_H_
+#endif  // GEODE_STATISTICS_POOLSTATSSAMPLER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/ProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/ProcessStats.hpp b/src/cppcache/src/statistics/ProcessStats.hpp
index 750a948..34d9b57 100644
--- a/src/cppcache/src/statistics/ProcessStats.hpp
+++ b/src/cppcache/src/statistics/ProcessStats.hpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/statistics/Statistics.hpp>
 using namespace apache::geode::client;
 
 /** @file
@@ -80,4 +80,4 @@ class CPPCACHE_EXPORT ProcessStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_PROCESSSTATS_H_
+#endif  // GEODE_STATISTICS_PROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/SolarisProcessStats.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/SolarisProcessStats.cpp b/src/cppcache/src/statistics/SolarisProcessStats.cpp
index 1b76253..2654ded 100644
--- a/src/cppcache/src/statistics/SolarisProcessStats.cpp
+++ b/src/cppcache/src/statistics/SolarisProcessStats.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <ace/Thread_Mutex.h>
 #include <ace/Singleton.h>
 #include "SolarisProcessStats.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/SolarisProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/SolarisProcessStats.hpp b/src/cppcache/src/statistics/SolarisProcessStats.hpp
index 59df2f3..34ed742 100644
--- a/src/cppcache/src/statistics/SolarisProcessStats.hpp
+++ b/src/cppcache/src/statistics/SolarisProcessStats.hpp
@@ -19,10 +19,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticsType.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
 #include "ProcessStats.hpp"
 #include "HostStatHelper.hpp"
 
@@ -84,4 +84,4 @@ class CPPCACHE_EXPORT SolarisProcessStats : public ProcessStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_SOLARISPROCESSSTATS_H_
+#endif  // GEODE_STATISTICS_SOLARISPROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/StatArchiveWriter.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatArchiveWriter.cpp b/src/cppcache/src/statistics/StatArchiveWriter.cpp
index fdbd07b..6c3834a 100644
--- a/src/cppcache/src/statistics/StatArchiveWriter.cpp
+++ b/src/cppcache/src/statistics/StatArchiveWriter.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <ace/ACE.h>
 #include <ace/Thread_Mutex.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/StatArchiveWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatArchiveWriter.hpp b/src/cppcache/src/statistics/StatArchiveWriter.hpp
index 2c3a331..720fa1b 100644
--- a/src/cppcache/src/statistics/StatArchiveWriter.hpp
+++ b/src/cppcache/src/statistics/StatArchiveWriter.hpp
@@ -22,16 +22,16 @@
 
 #include <map>
 #include <list>
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/ExceptionTypes.hpp>
 #include "StatsDef.hpp"
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
 #include "StatisticDescriptorImpl.hpp"
-#include <gfcpp/statistics/StatisticsType.hpp>
+#include <geode/statistics/StatisticsType.hpp>
 #include "HostStatSampler.hpp"
-#include <gfcpp/Log.hpp>
-#include <gfcpp/DataOutput.hpp>
+#include <geode/Log.hpp>
+#include <geode/DataOutput.hpp>
 #include <NonCopyable.hpp>
 
 using namespace apache::geode::client;
@@ -268,4 +268,4 @@ class CPPCACHE_EXPORT StatArchiveWriter {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_STATARCHIVEWRITER_H_
+#endif  // GEODE_STATISTICS_STATARCHIVEWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/StatSamplerStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatSamplerStats.hpp b/src/cppcache/src/statistics/StatSamplerStats.hpp
index 309a172..24ebca4 100644
--- a/src/cppcache/src/statistics/StatSamplerStats.hpp
+++ b/src/cppcache/src/statistics/StatSamplerStats.hpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
+#include <geode/statistics/StatisticsType.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 
 using namespace apache::geode::client;
 
@@ -58,4 +58,4 @@ class CPPCACHE_EXPORT StatSamplerStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_STATSAMPLERSTATS_H_
+#endif  // GEODE_STATISTICS_STATSAMPLERSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp b/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
index 64ca93b..7a37e06 100644
--- a/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
+++ b/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
@@ -21,8 +21,8 @@
  */
 
 #include <string>
-#include <gfcpp/ExceptionTypes.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
+#include <geode/ExceptionTypes.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
 
 /** @file
 */
@@ -250,4 +250,4 @@ s
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_STATISTICDESCRIPTORIMPL_H_
+#endif  // GEODE_STATISTICS_STATISTICDESCRIPTORIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/Statistics.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/Statistics.cpp b/src/cppcache/src/statistics/Statistics.cpp
index aa37c77..4097062 100644
--- a/src/cppcache/src/statistics/Statistics.cpp
+++ b/src/cppcache/src/statistics/Statistics.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/statistics/Statistics.hpp>
+#include <geode/statistics/Statistics.hpp>
 using namespace apache::geode::statistics;
 
 void Statistics::close() {}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/StatisticsManager.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatisticsManager.cpp b/src/cppcache/src/statistics/StatisticsManager.cpp
index f1b020b..468be82 100644
--- a/src/cppcache/src/statistics/StatisticsManager.cpp
+++ b/src/cppcache/src/statistics/StatisticsManager.cpp
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <ace/Atomic_Op_T.h>
 #include <ace/Recursive_Thread_Mutex.h>
@@ -24,9 +24,9 @@
 #include <ace/Thread_Mutex.h>
 #include <ace/Time_Value.h>
 #include <ace/Guard_T.h>
-#include <gfcpp/Exception.hpp>
+#include <geode/Exception.hpp>
 #include "StatisticsManager.hpp"
-#include <gfcpp/Log.hpp>
+#include <geode/Log.hpp>
 #include "GeodeStatisticsFactory.hpp"
 #include <string>
 #include "AtomicStatisticsImpl.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/StatisticsManager.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatisticsManager.hpp b/src/cppcache/src/statistics/StatisticsManager.hpp
index ca815c0..faac703 100644
--- a/src/cppcache/src/statistics/StatisticsManager.hpp
+++ b/src/cppcache/src/statistics/StatisticsManager.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <sys/types.h>
 #ifndef WIN32
@@ -28,9 +28,9 @@
 #endif
 #include <vector>
 #include "HostStatSampler.hpp"
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/ExceptionTypes.hpp>
 #include "StatisticsTypeImpl.hpp"
-#include <gfcpp/statistics/Statistics.hpp>
+#include <geode/statistics/Statistics.hpp>
 #include <AdminRegion.hpp>
 
 /** @file
@@ -131,4 +131,4 @@ class StatisticsManager {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_STATISTICSMANAGER_H_
+#endif  // GEODE_STATISTICS_STATISTICSMANAGER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/StatisticsTypeImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatisticsTypeImpl.hpp b/src/cppcache/src/statistics/StatisticsTypeImpl.hpp
index 98854ef..0a0c32e 100644
--- a/src/cppcache/src/statistics/StatisticsTypeImpl.hpp
+++ b/src/cppcache/src/statistics/StatisticsTypeImpl.hpp
@@ -22,9 +22,9 @@
 
 #include <map>
 #include <string>
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include <gfcpp/statistics/StatisticsFactory.hpp>
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/statistics/StatisticsType.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
+#include <geode/ExceptionTypes.hpp>
 #include "StatsDef.hpp"
 
 /** @file
@@ -102,4 +102,4 @@ class StatisticsTypeImpl : public StatisticsType {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_STATISTICSTYPEIMPL_H_
+#endif  // GEODE_STATISTICS_STATISTICSTYPEIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/StatsDef.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/StatsDef.hpp b/src/cppcache/src/statistics/StatsDef.hpp
index 123a119..0229f01 100644
--- a/src/cppcache/src/statistics/StatsDef.hpp
+++ b/src/cppcache/src/statistics/StatsDef.hpp
@@ -54,4 +54,4 @@ typedef enum {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_STATSDEF_H_
+#endif  // GEODE_STATISTICS_STATSDEF_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/WindowsProcessStats.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/WindowsProcessStats.cpp b/src/cppcache/src/statistics/WindowsProcessStats.cpp
index d6b71f7..41790e1 100644
--- a/src/cppcache/src/statistics/WindowsProcessStats.cpp
+++ b/src/cppcache/src/statistics/WindowsProcessStats.cpp
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include <ace/Thread_Mutex.h>
 #include <ace/Singleton.h>
 #include "WindowsProcessStats.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/src/statistics/WindowsProcessStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/statistics/WindowsProcessStats.hpp b/src/cppcache/src/statistics/WindowsProcessStats.hpp
index ea993da..3c8b1d4 100644
--- a/src/cppcache/src/statistics/WindowsProcessStats.hpp
+++ b/src/cppcache/src/statistics/WindowsProcessStats.hpp
@@ -19,13 +19,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/Statistics.hpp>
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/geode_globals.hpp>
+#include <geode/statistics/Statistics.hpp>
+#include <geode/statistics/StatisticsType.hpp>
+#include <geode/statistics/StatisticDescriptor.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 #include "ProcessStats.hpp"
-#include <gfcpp/ExceptionTypes.hpp>
+#include <geode/ExceptionTypes.hpp>
 
 using namespace apache::geode::client;
 
@@ -87,4 +87,4 @@ class CPPCACHE_EXPORT WindowsProcessStats : public ProcessStats {
 }  // namespace geode
 }  // namespace apache
 
-#endif // GEODE_STATISTICS_WINDOWSPROCESSSTATS_H_
+#endif  // GEODE_STATISTICS_WINDOWSPROCESSSTATS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/AutoDeleteTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/AutoDeleteTest.cpp b/src/cppcache/test/AutoDeleteTest.cpp
index 59c6f38..a7ad195 100644
--- a/src/cppcache/test/AutoDeleteTest.cpp
+++ b/src/cppcache/test/AutoDeleteTest.cpp
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <gfcpp/SharedBase.hpp>
+#include <geode/SharedBase.hpp>
 #include <AutoDelete.hpp>
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/ByteArray.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/ByteArray.hpp b/src/cppcache/test/ByteArray.hpp
index 849a58e..af9972c 100644
--- a/src/cppcache/test/ByteArray.hpp
+++ b/src/cppcache/test/ByteArray.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_BYTEARRAY_H_
+#define GEODE_BYTEARRAY_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -15,8 +20,6 @@
  * limitations under the License.
  */
 
-#pragma once
-
 #include <cstdint>
 #include <memory>
 #include <string>
@@ -59,3 +62,5 @@ class ByteArray {
 }  // namespace client
 }  // namespace geode
 }  // namespace apache
+
+#endif  // GEODE_BYTEARRAY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/ByteArrayFixture.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/ByteArrayFixture.hpp b/src/cppcache/test/ByteArrayFixture.hpp
index 4767dc0..9f90148 100644
--- a/src/cppcache/test/ByteArrayFixture.hpp
+++ b/src/cppcache/test/ByteArrayFixture.hpp
@@ -1,3 +1,8 @@
+#pragma once
+
+#ifndef GEODE_BYTEARRAYFIXTURE_H_
+#define GEODE_BYTEARRAYFIXTURE_H_
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -30,3 +35,5 @@ class ByteArrayFixture {
       const char* expectedStr, const char* bytesStr, const char* expected,
       const apache::geode::client::ByteArray& bytes);
 };
+
+#endif  // GEODE_BYTEARRAYFIXTURE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/CacheableKeysTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/CacheableKeysTest.cpp b/src/cppcache/test/CacheableKeysTest.cpp
index 02dcd13..c6fded5 100644
--- a/src/cppcache/test/CacheableKeysTest.cpp
+++ b/src/cppcache/test/CacheableKeysTest.cpp
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <gfcpp/CacheableKeys.hpp>
+#include <geode/CacheableKeys.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/DataInputTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/DataInputTest.cpp b/src/cppcache/test/DataInputTest.cpp
index 6641e4e..0b9b034 100644
--- a/src/cppcache/test/DataInputTest.cpp
+++ b/src/cppcache/test/DataInputTest.cpp
@@ -23,9 +23,9 @@
 
 #include <gtest/gtest.h>
 
-#include <gfcpp/DataInput.hpp>
-#include <gfcpp/DataOutput.hpp>
-#include <gfcpp/SharedPtr.hpp>
+#include <geode/DataInput.hpp>
+#include <geode/DataOutput.hpp>
+#include <geode/SharedPtr.hpp>
 #include "ByteArrayFixture.hpp"
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/DataOutputTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/DataOutputTest.cpp b/src/cppcache/test/DataOutputTest.cpp
index f7dfa4c..6ef3e79 100644
--- a/src/cppcache/test/DataOutputTest.cpp
+++ b/src/cppcache/test/DataOutputTest.cpp
@@ -21,7 +21,7 @@
 
 #include <gtest/gtest.h>
 
-#include <gfcpp/DataOutput.hpp>
+#include <geode/DataOutput.hpp>
 #include "ByteArrayFixture.hpp"
 
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/DiskPolicyTypeTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/DiskPolicyTypeTest.cpp b/src/cppcache/test/DiskPolicyTypeTest.cpp
index b368828..146d402 100644
--- a/src/cppcache/test/DiskPolicyTypeTest.cpp
+++ b/src/cppcache/test/DiskPolicyTypeTest.cpp
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <gfcpp/DiskPolicyType.hpp>
+#include <geode/DiskPolicyType.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/ExpirationActionTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/ExpirationActionTest.cpp b/src/cppcache/test/ExpirationActionTest.cpp
index aa33fa3..96da5a8 100644
--- a/src/cppcache/test/ExpirationActionTest.cpp
+++ b/src/cppcache/test/ExpirationActionTest.cpp
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <gfcpp/ExpirationAction.hpp>
+#include <geode/ExpirationAction.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/SharedBaseTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/SharedBaseTest.cpp b/src/cppcache/test/SharedBaseTest.cpp
index 2b2a3d5..d9a739f 100644
--- a/src/cppcache/test/SharedBaseTest.cpp
+++ b/src/cppcache/test/SharedBaseTest.cpp
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <gfcpp/SharedBase.hpp>
+#include <geode/SharedBase.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/SharedPtrTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/SharedPtrTest.cpp b/src/cppcache/test/SharedPtrTest.cpp
index 99d3b9d..24e2546 100644
--- a/src/cppcache/test/SharedPtrTest.cpp
+++ b/src/cppcache/test/SharedPtrTest.cpp
@@ -19,7 +19,7 @@
 
 #include <gtest/gtest.h>
 
-#include <gfcpp/SharedPtr.hpp>
+#include <geode/SharedPtr.hpp>
 
 using namespace apache::geode::client;
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/geodeBannerTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/geodeBannerTest.cpp b/src/cppcache/test/geodeBannerTest.cpp
new file mode 100644
index 0000000..fb42efb
--- /dev/null
+++ b/src/cppcache/test/geodeBannerTest.cpp
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <gtest/gtest.h>
+
+#include <geodeBanner.hpp>
+
+using namespace apache::geode::client;
+
+TEST(geodeBannerTest, ValidateBanner) {
+  EXPECT_LT(0, geodeBanner::getBanner().size()) << "Non-empty banner";
+}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/test/gfcppBannerTest.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/test/gfcppBannerTest.cpp b/src/cppcache/test/gfcppBannerTest.cpp
deleted file mode 100644
index e3d7857..0000000
--- a/src/cppcache/test/gfcppBannerTest.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <gtest/gtest.h>
-
-#include <gfcppBanner.hpp>
-
-using namespace apache::geode::client;
-
-TEST(gfcppBannerTest, ValidateBanner) {
-  EXPECT_LT(0, gfcppBanner::getBanner().size()) << "Non-empty banner";
-}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cryptoimpl/DHImpl.cpp
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/DHImpl.cpp b/src/cryptoimpl/DHImpl.cpp
index 8d6fe24..982e742 100644
--- a/src/cryptoimpl/DHImpl.cpp
+++ b/src/cryptoimpl/DHImpl.cpp
@@ -30,7 +30,7 @@
 #include <cstring>
 #include <cctype>
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 /*
 static DH * m_dh = NULL;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cryptoimpl/DHImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/DHImpl.hpp b/src/cryptoimpl/DHImpl.hpp
index 0945d87..dd34d27 100644
--- a/src/cryptoimpl/DHImpl.hpp
+++ b/src/cryptoimpl/DHImpl.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_051947d883001c8686df187fe716cbd0
-#define APACHE_GEODE_GUARD_051947d883001c8686df187fe716cbd0
-
+#ifndef GEODE_CRYPTOIMPL_DHIMPL_H_
+#define GEODE_CRYPTOIMPL_DHIMPL_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,7 +27,7 @@
 #include <vector>
 #include <string.h>
 
-#include <gfcpp/gf_base.hpp>
+#include <geode/gf_base.hpp>
 
 #define DH_ERR_NO_ERROR 0
 #define DH_ERR_UNSUPPORTED_ALGO 1
@@ -97,5 +96,4 @@ class DHImpl {
 
 bool DHImpl::m_init = false;
 
-
-#endif // APACHE_GEODE_GUARD_051947d883001c8686df187fe716cbd0
+#endif  // GEODE_CRYPTOIMPL_DHIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cryptoimpl/GFSsl.hpp
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/GFSsl.hpp b/src/cryptoimpl/GFSsl.hpp
index 8c554a1..6fd3a81 100644
--- a/src/cryptoimpl/GFSsl.hpp
+++ b/src/cryptoimpl/GFSsl.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_66e094f2e630a8aefdce2e4d93340f13
-#define APACHE_GEODE_GUARD_66e094f2e630a8aefdce2e4d93340f13
+#ifndef GEODE_CRYPTOIMPL_GFSSL_H_
+#define GEODE_CRYPTOIMPL_GFSSL_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,7 +26,6 @@
  *      Author: ankurs
  */
 
-
 #include <ace/INET_Addr.h>
 #include <ace/OS.h>
 
@@ -42,5 +41,4 @@ class GFSsl {
   virtual void close() = 0;
 };
 
-
-#endif // APACHE_GEODE_GUARD_66e094f2e630a8aefdce2e4d93340f13
+#endif  // GEODE_CRYPTOIMPL_GFSSL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cryptoimpl/SSLImpl.hpp
----------------------------------------------------------------------
diff --git a/src/cryptoimpl/SSLImpl.hpp b/src/cryptoimpl/SSLImpl.hpp
index d31d8fa..6b49374 100644
--- a/src/cryptoimpl/SSLImpl.hpp
+++ b/src/cryptoimpl/SSLImpl.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_d7c8a71cb25b1a2fdc896009aee7509f
-#define APACHE_GEODE_GUARD_d7c8a71cb25b1a2fdc896009aee7509f
+#ifndef GEODE_CRYPTOIMPL_SSLIMPL_H_
+#define GEODE_CRYPTOIMPL_SSLIMPL_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gf_base.hpp>
+#include <geode/gf_base.hpp>
 #include "ace/ACE.h"
 #include "ace/OS.h"
 #include <ace/INET_Addr.h>
@@ -59,5 +59,4 @@ CPPCACHE_EXPORT void* gf_create_SslImpl(ACE_SOCKET sock, const char* pubkeyfile,
 CPPCACHE_EXPORT void gf_destroy_SslImpl(void* impl);
 }
 
-
-#endif // APACHE_GEODE_GUARD_d7c8a71cb25b1a2fdc896009aee7509f
+#endif  // GEODE_CRYPTOIMPL_SSLIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/defaultSystem/geode.properties
----------------------------------------------------------------------
diff --git a/src/defaultSystem/geode.properties b/src/defaultSystem/geode.properties
new file mode 100644
index 0000000..371e37d
--- /dev/null
+++ b/src/defaultSystem/geode.properties
@@ -0,0 +1,99 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# Default Gemfire C++ distributed system properties
+# Copy to current directory and uncomment to override defaults.
+#
+## Debugging support, enables stacktraces in apache::geode::client::Exception.
+#
+# The default is false, uncomment to enable stacktraces in exceptions.
+#stacktrace-enabled=true
+#crash-dump-enabled=true
+#
+#
+## Cache region configurtion
+#
+#cache-xml-file=cache.xml
+#
+## Log file config
+#
+#log-file=gemfire_cpp.log
+#log-level=config
+# zero indicates use no limit.
+#log-file-size-limit=0
+# zero indicates use no limit. 
+#log-disk-space-limit=0 
+#
+## Statistics values
+#
+# the rate is in seconds.
+#statistic-sample-rate=1
+#statistic-sampling-enabled=true
+#statistic-archive-file=statArchive.gfs
+# zero indicates use no limit.
+#archive-file-size-limit=0
+# zero indicates use no limit.
+#archive-disk-space-limit=0
+#enable-time-statistics=false 
+#
+## Heap based eviction configuration
+#
+# maximum amount of memory used by the cache for all regions, 0 disables this feature
+#heap-lru-limit=0
+# percentage over heap-lru-limit when LRU will be called. 
+#heap-lru-delta=10
+#
+## Durable client support
+#
+#durable-client-id=
+#durable-timeout=300
+#
+## SSL socket support
+#
+#ssl-enabled=false
+#ssl-keystore=
+#ssl-keystore-password=
+#ssl-truststore=
+#
+## .NET AppDomain support
+#
+#appdomain-enabled=false
+#
+## Misc
+#
+#conflate-events=server
+#disable-shuffling-of-endpoints=false
+#grid-client=false
+#max-fe-threads=
+#max-socket-buffer-size=66560
+# the units are in seconds.
+#connect-timeout=59
+#notify-ack-interval=10
+#notify-dupcheck-life=300
+#ping-interval=10 
+#redundancy-monitor-interval=10
+#auto-ready-for-events=true
+#suspended-tx-timeout=30
+#disable-chunk-handler-thread=false
+#tombstone-timeout=480000
+#
+## module name of the initializer pointing to sample
+## implementation from templates/security
+#security-client-auth-library=securityImpl
+## static method name of the library mentioned above
+#security-client-auth-factory=createUserPasswordAuthInitInstance
+## credential for Dummy Authenticator configured in server.
+## note: security-password property will be inserted by the initializer
+## mentioned in the above property.
+#security-username=root

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/defaultSystem/gfcpp.properties
----------------------------------------------------------------------
diff --git a/src/defaultSystem/gfcpp.properties b/src/defaultSystem/gfcpp.properties
deleted file mode 100644
index 371e37d..0000000
--- a/src/defaultSystem/gfcpp.properties
+++ /dev/null
@@ -1,99 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Default Gemfire C++ distributed system properties
-# Copy to current directory and uncomment to override defaults.
-#
-## Debugging support, enables stacktraces in apache::geode::client::Exception.
-#
-# The default is false, uncomment to enable stacktraces in exceptions.
-#stacktrace-enabled=true
-#crash-dump-enabled=true
-#
-#
-## Cache region configurtion
-#
-#cache-xml-file=cache.xml
-#
-## Log file config
-#
-#log-file=gemfire_cpp.log
-#log-level=config
-# zero indicates use no limit.
-#log-file-size-limit=0
-# zero indicates use no limit. 
-#log-disk-space-limit=0 
-#
-## Statistics values
-#
-# the rate is in seconds.
-#statistic-sample-rate=1
-#statistic-sampling-enabled=true
-#statistic-archive-file=statArchive.gfs
-# zero indicates use no limit.
-#archive-file-size-limit=0
-# zero indicates use no limit.
-#archive-disk-space-limit=0
-#enable-time-statistics=false 
-#
-## Heap based eviction configuration
-#
-# maximum amount of memory used by the cache for all regions, 0 disables this feature
-#heap-lru-limit=0
-# percentage over heap-lru-limit when LRU will be called. 
-#heap-lru-delta=10
-#
-## Durable client support
-#
-#durable-client-id=
-#durable-timeout=300
-#
-## SSL socket support
-#
-#ssl-enabled=false
-#ssl-keystore=
-#ssl-keystore-password=
-#ssl-truststore=
-#
-## .NET AppDomain support
-#
-#appdomain-enabled=false
-#
-## Misc
-#
-#conflate-events=server
-#disable-shuffling-of-endpoints=false
-#grid-client=false
-#max-fe-threads=
-#max-socket-buffer-size=66560
-# the units are in seconds.
-#connect-timeout=59
-#notify-ack-interval=10
-#notify-dupcheck-life=300
-#ping-interval=10 
-#redundancy-monitor-interval=10
-#auto-ready-for-events=true
-#suspended-tx-timeout=30
-#disable-chunk-handler-thread=false
-#tombstone-timeout=480000
-#
-## module name of the initializer pointing to sample
-## implementation from templates/security
-#security-client-auth-library=securityImpl
-## static method name of the library mentioned above
-#security-client-auth-factory=createUserPasswordAuthInitInstance
-## credential for Dummy Authenticator configured in server.
-## note: security-password property will be inserted by the initializer
-## mentioned in the above property.
-#security-username=root

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/dhimpl/DHImpl.hpp
----------------------------------------------------------------------
diff --git a/src/dhimpl/DHImpl.hpp b/src/dhimpl/DHImpl.hpp
index 92bdca9..34cb47b 100644
--- a/src/dhimpl/DHImpl.hpp
+++ b/src/dhimpl/DHImpl.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_0b4f257a1a4de03f53b0299148e95656
-#define APACHE_GEODE_GUARD_0b4f257a1a4de03f53b0299148e95656
-
+#ifndef GEODE_DHIMPL_DHIMPL_H_
+#define GEODE_DHIMPL_DHIMPL_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,7 +26,7 @@
 #include <string>
 #include <vector>
 
-#include <gfcpp/gf_base.hpp>
+#include <geode/gf_base.hpp>
 
 #define DH_ERR_NO_ERROR 0
 #define DH_ERR_UNSUPPORTED_ALGO 1
@@ -67,5 +66,4 @@ CPPCACHE_EXPORT bool gf_verifyDH(const char* subject,
                                  int* reason);
 }
 
-
-#endif // APACHE_GEODE_GUARD_0b4f257a1a4de03f53b0299148e95656
+#endif  // GEODE_DHIMPL_DHIMPL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/docs/cppcache/Doxyfile.in
----------------------------------------------------------------------
diff --git a/src/docs/cppcache/Doxyfile.in b/src/docs/cppcache/Doxyfile.in
index d147d15..4bd7357 100644
--- a/src/docs/cppcache/Doxyfile.in
+++ b/src/docs/cppcache/Doxyfile.in
@@ -70,7 +70,7 @@ This functionality is unsupported in the Native Client Product. \endif" \
 
 ALPHABETICAL_INDEX     = YES
 ENABLED_SECTIONS       = nativeclient 
-EXCLUDE_PATTERNS       = */impl/* AtomicBits.hpp AtomicInc.hpp AtomicOpT.hpp BridgeLoader.hpp CacheableToken.hpp Debug.hpp ExpirationAttributes.hpp gfcpp_globals.hpp Lock.hpp SpinLock.hpp Task.hpp Timecode.hpp 
+EXCLUDE_PATTERNS       = */impl/* AtomicBits.hpp AtomicInc.hpp AtomicOpT.hpp BridgeLoader.hpp CacheableToken.hpp Debug.hpp ExpirationAttributes.hpp geode_globals.hpp Lock.hpp SpinLock.hpp Task.hpp Timecode.hpp 
 EXTRACT_PRIVATE        = NO
 EXTRACT_STATIC         = NO
 FILE_PATTERNS          = *.h *.hpp statistics/*.hpp
@@ -80,7 +80,7 @@ HIDE_UNDOC_CLASSES     = YES
 HIDE_UNDOC_MEMBERS     = YES
 HTML_FOOTER            = @CMAKE_CURRENT_SOURCE_DIR@/footer.html
 IMAGE_PATH             = @CMAKE_CURRENT_SOURCE_DIR@
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/../../cppcache/include/gfcpp  @CMAKE_CURRENT_SOURCE_DIR@/../../cppcache/include/gfcpp/statistics
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/../../cppcache/include/geode  @CMAKE_CURRENT_SOURCE_DIR@/../../cppcache/include/geode/statistics
 JAVADOC_AUTOBRIEF      = YES
 MACRO_EXPANSION        = YES
 OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/gfcpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/gfcpp/CMakeLists.txt b/src/gfcpp/CMakeLists.txt
deleted file mode 100644
index 4c7a3d9..0000000
--- a/src/gfcpp/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-cmake_minimum_required(VERSION 3.4)
-project(gfcpp)
-
-file(GLOB_RECURSE SOURCES "*.cpp")
-
-add_executable(gfcpp ${SOURCES})
-
-target_link_libraries(gfcpp apache-geode c++11)
-
-install(TARGETS gfcpp DESTINATION bin)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/gfcpp/gfcpp.cpp
----------------------------------------------------------------------
diff --git a/src/gfcpp/gfcpp.cpp b/src/gfcpp/gfcpp.cpp
deleted file mode 100644
index 8384fa3..0000000
--- a/src/gfcpp/gfcpp.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define _GF_INCLUDE_ENCRYPT 1
-
-#include <gfcpp/gfcpp_globals.hpp>
-
-#include <gfcpp/ExceptionTypes.hpp>
-#include <gfcpp/CacheFactory.hpp>
-
-using namespace apache::geode::client;
-
-void doVersion() { printf("\n%s\n", CacheFactory::getProductDescription()); }
-
-int main(int argc, char** argv) {
-  Log::init(Log::Error, NULL);
-  try {
-    if (argc > 1) {
-      std::string command = argv[1];
-      if (command == "version") {
-        doVersion();
-      }
-    }
-  } catch (const Exception& ex) {
-    ex.printStackTrace();
-    fflush(stdout);
-    return 1;
-  }
-  fflush(stdout);
-  return 0;
-}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/ASBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/ASBuiltins.hpp b/src/pdxautoserializer/ASBuiltins.hpp
index 6134d7d..3fa34de 100644
--- a/src/pdxautoserializer/ASBuiltins.hpp
+++ b/src/pdxautoserializer/ASBuiltins.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_eb7690d50321df9f22960c0ceecdeea5
-#define APACHE_GEODE_GUARD_eb7690d50321df9f22960c0ceecdeea5
+#ifndef GEODE_PDXAUTOSERIALIZER_ASBUILTINS_H_
+#define GEODE_PDXAUTOSERIALIZER_ASBUILTINS_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include "DataOutput.hpp"
 #include "DataInput.hpp"
 #include "Serializer.hpp"
@@ -123,5 +122,4 @@ inline void readObject(apache::geode::client::DataInput& input,
 }
 }
 
-
-#endif // APACHE_GEODE_GUARD_eb7690d50321df9f22960c0ceecdeea5
+#endif  // GEODE_PDXAUTOSERIALIZER_ASBUILTINS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/ASCLIBuiltins.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/ASCLIBuiltins.hpp b/src/pdxautoserializer/ASCLIBuiltins.hpp
index ae3a207..c03ee0b 100644
--- a/src/pdxautoserializer/ASCLIBuiltins.hpp
+++ b/src/pdxautoserializer/ASCLIBuiltins.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_435faaccc293c5822dd1ce9185411ec7
-#define APACHE_GEODE_GUARD_435faaccc293c5822dd1ce9185411ec7
+#ifndef GEODE_PDXAUTOSERIALIZER_ASCLIBUILTINS_H_
+#define GEODE_PDXAUTOSERIALIZER_ASCLIBUILTINS_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #ifdef GEMFIRE_CLR
 
 #include "ASBuiltins.hpp"
@@ -460,5 +459,4 @@ inline void ReadObject(apache::geode::client::DataInput& input,
 
 #endif  // GEMFIRE_CLR
 
-
-#endif // APACHE_GEODE_GUARD_435faaccc293c5822dd1ce9185411ec7
+#endif  // GEODE_PDXAUTOSERIALIZER_ASCLIBUILTINS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/ASCPPInclude.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/ASCPPInclude.hpp b/src/pdxautoserializer/ASCPPInclude.hpp
index e7941e1..3127313 100644
--- a/src/pdxautoserializer/ASCPPInclude.hpp
+++ b/src/pdxautoserializer/ASCPPInclude.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_ce84784877faf1099879ab9252de0187
-#define APACHE_GEODE_GUARD_ce84784877faf1099879ab9252de0187
+#ifndef GEODE_PDXAUTOSERIALIZER_ASCPPINCLUDE_H_
+#define GEODE_PDXAUTOSERIALIZER_ASCPPINCLUDE_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #define GFINCLUDE
 #define GFEXCLUDE
 #define GFARRAYSIZE(x)
@@ -36,5 +35,4 @@
  #define __builtin_va_list int
  */
 
-
-#endif // APACHE_GEODE_GUARD_ce84784877faf1099879ab9252de0187
+#endif  // GEODE_PDXAUTOSERIALIZER_ASCPPINCLUDE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/CodeGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/CodeGenerator.hpp b/src/pdxautoserializer/CodeGenerator.hpp
index 820377d..6acc499 100644
--- a/src/pdxautoserializer/CodeGenerator.hpp
+++ b/src/pdxautoserializer/CodeGenerator.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_fb876ec7655e479e35df4a1cc2653f47
-#define APACHE_GEODE_GUARD_fb876ec7655e479e35df4a1cc2653f47
+#ifndef GEODE_PDXAUTOSERIALIZER_CODEGENERATOR_H_
+#define GEODE_PDXAUTOSERIALIZER_CODEGENERATOR_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include "base_types.hpp"
 
 namespace apache {
@@ -175,5 +174,4 @@ class CodeGenerator {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_fb876ec7655e479e35df4a1cc2653f47
+#endif  // GEODE_PDXAUTOSERIALIZER_CODEGENERATOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/CodeGeneratorFactory.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/CodeGeneratorFactory.hpp b/src/pdxautoserializer/CodeGeneratorFactory.hpp
index 3b2d6ac..f4fc35c 100644
--- a/src/pdxautoserializer/CodeGeneratorFactory.hpp
+++ b/src/pdxautoserializer/CodeGeneratorFactory.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_736109a2751770a130d751c8754e234c
-#define APACHE_GEODE_GUARD_736109a2751770a130d751c8754e234c
+#ifndef GEODE_PDXAUTOSERIALIZER_CODEGENERATORFACTORY_H_
+#define GEODE_PDXAUTOSERIALIZER_CODEGENERATORFACTORY_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include "CodeGenerator.hpp"
 
 namespace apache {
@@ -72,5 +71,4 @@ class CodeGeneratorFactory {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_736109a2751770a130d751c8754e234c
+#endif  // GEODE_PDXAUTOSERIALIZER_CODEGENERATORFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/InputParser.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/InputParser.hpp b/src/pdxautoserializer/InputParser.hpp
index 0ee39ff..bfb36db 100644
--- a/src/pdxautoserializer/InputParser.hpp
+++ b/src/pdxautoserializer/InputParser.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_906466ac6028b9eac9226aa77077245f
-#define APACHE_GEODE_GUARD_906466ac6028b9eac9226aa77077245f
+#ifndef GEODE_PDXAUTOSERIALIZER_INPUTPARSER_H_
+#define GEODE_PDXAUTOSERIALIZER_INPUTPARSER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include "base_types.hpp"
 #include "CodeGenerator.hpp"
 
@@ -182,5 +181,4 @@ class InputParser {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_906466ac6028b9eac9226aa77077245f
+#endif  // GEODE_PDXAUTOSERIALIZER_INPUTPARSER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/InputParserFactory.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/InputParserFactory.hpp b/src/pdxautoserializer/InputParserFactory.hpp
index 35a1dc3..75a3c94 100644
--- a/src/pdxautoserializer/InputParserFactory.hpp
+++ b/src/pdxautoserializer/InputParserFactory.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_6c288c7ce306f6376599e765eb252f29
-#define APACHE_GEODE_GUARD_6c288c7ce306f6376599e765eb252f29
+#ifndef GEODE_PDXAUTOSERIALIZER_INPUTPARSERFACTORY_H_
+#define GEODE_PDXAUTOSERIALIZER_INPUTPARSERFACTORY_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include "InputParser.hpp"
 #include <utility>
 
@@ -74,5 +73,4 @@ class InputParserFactory {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_6c288c7ce306f6376599e765eb252f29
+#endif  // GEODE_PDXAUTOSERIALIZER_INPUTPARSERFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/OutputFormatter.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/OutputFormatter.hpp b/src/pdxautoserializer/OutputFormatter.hpp
index 99d70ff..244973f 100644
--- a/src/pdxautoserializer/OutputFormatter.hpp
+++ b/src/pdxautoserializer/OutputFormatter.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_8157a8a77b151f9beadc02d24c462c34
-#define APACHE_GEODE_GUARD_8157a8a77b151f9beadc02d24c462c34
+#ifndef GEODE_PDXAUTOSERIALIZER_OUTPUTFORMATTER_H_
+#define GEODE_PDXAUTOSERIALIZER_OUTPUTFORMATTER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include <ostream>
 #include <streambuf>
 #include <fstream>
@@ -228,5 +227,4 @@ class OutputFormatter : public std::ostream {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_8157a8a77b151f9beadc02d24c462c34
+#endif  // GEODE_PDXAUTOSERIALIZER_OUTPUTFORMATTER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/base_types.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/base_types.hpp b/src/pdxautoserializer/base_types.hpp
index a806bf3..09f8b54 100644
--- a/src/pdxautoserializer/base_types.hpp
+++ b/src/pdxautoserializer/base_types.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_dbef31dd4224e58666543cc33c286150
-#define APACHE_GEODE_GUARD_dbef31dd4224e58666543cc33c286150
+#ifndef GEODE_PDXAUTOSERIALIZER_BASE_TYPES_H_
+#define GEODE_PDXAUTOSERIALIZER_BASE_TYPES_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include <string>
 #include <vector>
 #include <set>
@@ -254,5 +253,4 @@ typedef std::vector<VariableInfo>::const_iterator VariableVectorIterator;
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_dbef31dd4224e58666543cc33c286150
+#endif  // GEODE_PDXAUTOSERIALIZER_BASE_TYPES_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/impl/CPPCodeGenerator.cpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/CPPCodeGenerator.cpp b/src/pdxautoserializer/impl/CPPCodeGenerator.cpp
index 1474473..2206003 100644
--- a/src/pdxautoserializer/impl/CPPCodeGenerator.cpp
+++ b/src/pdxautoserializer/impl/CPPCodeGenerator.cpp
@@ -159,11 +159,11 @@ void CPPCodeGenerator::addReferences(const ReferenceVector& references) {
       *m_cppFormatter << "#include \"" << headerPath << "\"\n\n";
     }
   }
-  *m_cppFormatter << "#include <gfcpp/PdxWriter.hpp>"
+  *m_cppFormatter << "#include <geode/PdxWriter.hpp>"
                   << "\n";
-  *m_cppFormatter << "#include <gfcpp/PdxReader.hpp>"
+  *m_cppFormatter << "#include <geode/PdxReader.hpp>"
                   << "\n";
-  *m_cppFormatter << "#include <gfcpp/PdxAutoSerializer.hpp>"
+  *m_cppFormatter << "#include <geode/PdxAutoSerializer.hpp>"
                   << "\n\n";
 }
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/impl/CPPCodeGenerator.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/CPPCodeGenerator.hpp b/src/pdxautoserializer/impl/CPPCodeGenerator.hpp
index 6a351b7..7b28b35 100644
--- a/src/pdxautoserializer/impl/CPPCodeGenerator.hpp
+++ b/src/pdxautoserializer/impl/CPPCodeGenerator.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_571a5e03438f4ddbf05bf82f4b838736
-#define APACHE_GEODE_GUARD_571a5e03438f4ddbf05bf82f4b838736
+#ifndef GEODE_PDXAUTOSERIALIZER_IMPL_CPPCODEGENERATOR_H_
+#define GEODE_PDXAUTOSERIALIZER_IMPL_CPPCODEGENERATOR_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include "../CodeGenerator.hpp"
 #include "../OutputFormatter.hpp"
 
@@ -237,5 +236,4 @@ class CPPCodeGenerator : public CodeGenerator {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_571a5e03438f4ddbf05bf82f4b838736
+#endif  // GEODE_PDXAUTOSERIALIZER_IMPL_CPPCODEGENERATOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp b/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp
index 81f01c7..f09fb25 100644
--- a/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp
+++ b/src/pdxautoserializer/impl/CPPParser/CPPDictionary.hpp
@@ -52,7 +52,7 @@
 #ifndef CPPDictionary_hpp
 #define CPPDictionary_hpp
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 #include "Dictionary.hpp"
 
 class CPPDictionary : public Dictionary {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp b/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp
index 3bba77a..93a1d3f 100644
--- a/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp
+++ b/src/pdxautoserializer/impl/CPPParser/CPPInputParser.cpp
@@ -60,11 +60,11 @@ void CPPClassInfo::getReferences(ReferenceVector& references) const {
 
   // references.push_back(builtinHeader);
 
-  /*ReferenceInfo builtinHeaderWriter = { "gfcpp/PdxWriter.hpp",
+  /*ReferenceInfo builtinHeaderWriter = { "geode/PdxWriter.hpp",
   Reference::HEADER };
   references.push_back(builtinHeaderWriter);
 
-  ReferenceInfo builtinHeaderReader = { "gfcpp/PdxWriter.hpp",
+  ReferenceInfo builtinHeaderReader = { "geode/PdxWriter.hpp",
   Reference::HEADER };
   references.push_back(builtinHeaderReader);*/
 }
@@ -145,9 +145,9 @@ void CPPHeaderParser::endClassDefinition() {
       if (findMember != m_arraySizeRefMap.end()) {
         memberIterator->m_type.m_kind |= TypeKind::ARRAY;
         memberIterator->m_type.m_nameOrSize = findMember->second;
-        Log::info(ModuleName,
-                  "Using \"" + findMember->second + "\" as size of array \"" +
-                      memberIterator->m_name + '"');
+        Log::info(ModuleName, "Using \"" + findMember->second +
+                                  "\" as size of array \"" +
+                                  memberIterator->m_name + '"');
       }
 
       StringMap::const_iterator findMemberElem =
@@ -155,9 +155,9 @@ void CPPHeaderParser::endClassDefinition() {
       if (findMemberElem != m_arrayElemSizeRefMap.end()) {
         memberIterator->m_type.m_kind |= TypeKind::ARRAY;
         memberIterator->m_type.m_nameOfArrayElemSize = findMemberElem->second;
-        Log::info(ModuleName,
-                  "Using \"" + findMemberElem->second +
-                      "\" as size of array \"" + memberIterator->m_name + '"');
+        Log::info(ModuleName, "Using \"" + findMemberElem->second +
+                                  "\" as size of array \"" +
+                                  memberIterator->m_name + '"');
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/impl/Helper.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/Helper.hpp b/src/pdxautoserializer/impl/Helper.hpp
index bd292ed..a25ac06 100644
--- a/src/pdxautoserializer/impl/Helper.hpp
+++ b/src/pdxautoserializer/impl/Helper.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_debdc61f2b91c81fc06a894ab962375d
-#define APACHE_GEODE_GUARD_debdc61f2b91c81fc06a894ab962375d
+#ifndef GEODE_PDXAUTOSERIALIZER_IMPL_HELPER_H_
+#define GEODE_PDXAUTOSERIALIZER_IMPL_HELPER_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include "../InputParser.hpp"
 #include <algorithm>
 #include <cctype>
@@ -189,5 +188,4 @@ class Helper {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_debdc61f2b91c81fc06a894ab962375d
+#endif  // GEODE_PDXAUTOSERIALIZER_IMPL_HELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/pdxautoserializer/impl/Log.hpp
----------------------------------------------------------------------
diff --git a/src/pdxautoserializer/impl/Log.hpp b/src/pdxautoserializer/impl/Log.hpp
index e16ec56..e2e9a16 100644
--- a/src/pdxautoserializer/impl/Log.hpp
+++ b/src/pdxautoserializer/impl/Log.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#ifndef APACHE_GEODE_GUARD_ede048400be44f9dde5948f28b51fc23
-#define APACHE_GEODE_GUARD_ede048400be44f9dde5948f28b51fc23
+#ifndef GEODE_PDXAUTOSERIALIZER_IMPL_LOG_H_
+#define GEODE_PDXAUTOSERIALIZER_IMPL_LOG_H_
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include <string>
 #include <iosfwd>
 
@@ -91,5 +90,4 @@ class Log {
 }  // namespace geode
 }  // namespace apache
 
-
-#endif // APACHE_GEODE_GUARD_ede048400be44f9dde5948f28b51fc23
+#endif  // GEODE_PDXAUTOSERIALIZER_IMPL_LOG_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/quickstart/NativeClientConfig.cmake
----------------------------------------------------------------------
diff --git a/src/quickstart/NativeClientConfig.cmake b/src/quickstart/NativeClientConfig.cmake
index 3b65ab6..520cc2e 100644
--- a/src/quickstart/NativeClientConfig.cmake
+++ b/src/quickstart/NativeClientConfig.cmake
@@ -42,8 +42,6 @@ else()
     endif()
 endif()
 
-# run gfcpp.exe and make sure we get a version back
-
 #set( NATIVECLIENT_VERSION_STRING "9.0" )
 #set( NATIVECLIENT_FOUND "YES" )
 set( NATIVECLIENT_DIR ${NCProductDir} )

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/quickstart/cpp/BasicOperations.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/BasicOperations.cpp b/src/quickstart/cpp/BasicOperations.cpp
index 41743d7..21918c1 100644
--- a/src/quickstart/cpp/BasicOperations.cpp
+++ b/src/quickstart/cpp/BasicOperations.cpp
@@ -32,7 +32,7 @@
  */
 
 // Include the Geode library.
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 // Use the "geode" namespace.
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/quickstart/cpp/CqQuery.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/CqQuery.cpp b/src/quickstart/cpp/CqQuery.cpp
index 55043f3..4871b5b 100644
--- a/src/quickstart/cpp/CqQuery.cpp
+++ b/src/quickstart/cpp/CqQuery.cpp
@@ -30,7 +30,7 @@
  */
 
 // Include the Geode library.
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 // Include our Query objects, viz. Portfolio and Position.
 #include "queryobjects/Portfolio.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/quickstart/cpp/DataExpiration.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/DataExpiration.cpp b/src/quickstart/cpp/DataExpiration.cpp
index b93eb1a..004213d 100644
--- a/src/quickstart/cpp/DataExpiration.cpp
+++ b/src/quickstart/cpp/DataExpiration.cpp
@@ -35,7 +35,7 @@
  */
 
 // Include the Geode library.
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 // Include the SimpleCacheListener plugin.
 #include "plugins/SimpleCacheListener.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/quickstart/cpp/Delta.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/Delta.cpp b/src/quickstart/cpp/Delta.cpp
index 0cfe72e..3c95f67 100644
--- a/src/quickstart/cpp/Delta.cpp
+++ b/src/quickstart/cpp/Delta.cpp
@@ -34,7 +34,7 @@
  *
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 #include "deltaobjects/DeltaExample.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/quickstart/cpp/DistributedSystem.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/DistributedSystem.cpp b/src/quickstart/cpp/DistributedSystem.cpp
index fc01bf8..b399743 100644
--- a/src/quickstart/cpp/DistributedSystem.cpp
+++ b/src/quickstart/cpp/DistributedSystem.cpp
@@ -36,7 +36,7 @@
  */
 
 // Include the Geode library.
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 // Use the "geode" namespace.
 using namespace apache::geode::client;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/quickstart/cpp/DurableClient.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/DurableClient.cpp b/src/quickstart/cpp/DurableClient.cpp
index c83cd48..909172a 100644
--- a/src/quickstart/cpp/DurableClient.cpp
+++ b/src/quickstart/cpp/DurableClient.cpp
@@ -30,7 +30,7 @@
  */
 
 // Include the Geode library.
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 // Include cachelistener
 #include "plugins/DurableCacheListener.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/quickstart/cpp/Exceptions.cpp
----------------------------------------------------------------------
diff --git a/src/quickstart/cpp/Exceptions.cpp b/src/quickstart/cpp/Exceptions.cpp
index c4d5114..570322e 100644
--- a/src/quickstart/cpp/Exceptions.cpp
+++ b/src/quickstart/cpp/Exceptions.cpp
@@ -21,7 +21,7 @@
  * This example takes the following steps:
  *
  * 1. Create CacheFactory using the user specified settings or from the
- * gfcpp.properties file by default.
+ * geode.properties file by default.
  * 2. Create a Geode Cache.
  * 3. Get the example Regions from the Cache.
  * 4. Perform some operations which should cause exceptions.
@@ -31,7 +31,7 @@
  */
 
 // Include the Geode library.
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 // Use the "geode" namespace.
 using namespace apache::geode::client;
@@ -40,7 +40,7 @@ using namespace apache::geode::client;
 int main(int argc, char** argv) {
   try {
     // Create CacheFactory using the user specified settings or from the
-    // gfcpp.properties file by default.
+    // geode.properties file by default.
     PropertiesPtr prp = Properties::create();
     prp->insert("cache-xml-file", "XMLs/clientExceptions.xml");
 


Mime
View raw message