geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [08/31] geode-native git commit: GEODE-2476: Replace gfcpp with geode.
Date Tue, 21 Feb 2017 17:40:21 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp b/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
deleted file mode 100644
index 07e535e..0000000
--- a/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#pragma once
-
-#ifndef GEODE_GFCPP_STATISTICS_STATISTICDESCRIPTOR_H_
-#define GEODE_GFCPP_STATISTICS_STATISTICDESCRIPTOR_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 <gfcpp/gfcpp_globals.hpp>
-
-using namespace apache::geode::client;
-
-/** @file
-*/
-
-namespace apache {
-namespace geode {
-namespace statistics {
-
-/**
- * Describes an individual statistic whose value is updated by an
- * application and may be archived by Geode.  These descriptions are
- * gathered together in a {@link StatisticsType}.
- *
- * <P>
- * To get an instance of this interface use an instance of
- * {@link StatisticsFactory}.
- * <P>
- * StatisticDescriptors are naturally ordered by their name.
- *
- */
-
-class CPPCACHE_EXPORT StatisticDescriptor {
- public:
-  /**
-    * Returns the id of this statistic in a {@link StatisticsType
-    * }. The id is initialized when its statistics
-    * type is created.
-    */
-  virtual int32 getId() = 0;
-
-  /**
-   * Returns the name of this statistic
-   */
-  virtual const char* getName() = 0;
-
-  /**
-   * Returns a description of this statistic
-   */
-  virtual const char* getDescription() = 0;
-
-  /**
-   * Returns true if this statistic is a counter; false if its a gauge.
-   * Counter statistics have values that always increase.
-   * Gauge statistics have unconstrained values.
-   */
-  virtual int8 isCounter() = 0;
-
-  /**
-   *  Returns true if a larger statistic value indicates better performance.
-   */
-  virtual int8 isLargerBetter() = 0;
-
-  /**
-   *  Returns the unit in which this statistic is measured
-   */
-  virtual const char* getUnit() = 0;
-
-  /*
-   * Destructor
-   */
-  virtual ~StatisticDescriptor() {}
-
-};  // class
-}  // namespace statistics
-}  // namespace geode
-}  // namespace apache
-
-#endif // GEODE_GFCPP_STATISTICS_STATISTICDESCRIPTOR_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/include/gfcpp/statistics/Statistics.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/statistics/Statistics.hpp b/src/cppcache/include/gfcpp/statistics/Statistics.hpp
deleted file mode 100644
index 8072f48..0000000
--- a/src/cppcache/include/gfcpp/statistics/Statistics.hpp
+++ /dev/null
@@ -1,532 +0,0 @@
-#pragma once
-
-#ifndef GEODE_GFCPP_STATISTICS_STATISTICS_H_
-#define GEODE_GFCPP_STATISTICS_STATISTICS_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 <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
-
-/** @file
-*/
-
-namespace apache {
-namespace geode {
-namespace statistics {
-/**
- * An instantiation of an existing <code>StatisticsType</code> object with
- * methods for
- * setting, incrementing and getting individual <code>StatisticDescriptor</code>
- * values.
- */
-class CPPCACHE_EXPORT Statistics {
- public:
-  /**
-   * Closes these statistics.  After statistics have been closed, they
-   * are no longer archived.
-   * A value access on a closed statistics always results in zero.
-   * A value modification on a closed statistics is ignored.
-   */
-  virtual void close() = 0;
-
-  ////////////////////////  accessor Methods  ///////////////////////
-
-  /**
-   * Returns the id of the statistic with the given name in this
-   * statistics instance.
-   *
-   * @param name statistic name
-   * @throws IllegalArgumentException
-   *         No statistic named <code>name</code> exists in this
-   *         statistics instance.
-   *
-   * @see StatisticsType#nameToDescriptor
-   */
-  virtual int32 nameToId(const char* name) = 0;
-
-  /**
-   * Returns the descriptor of the statistic with the given name in this
-   * statistics instance.
-   *
-   * @param name statistic name
-   * @throws IllegalArgumentException
-   *         No statistic named <code>name</code> exists in this
-   *         statistics instance.
-   *
-   * @see StatisticsType#nameToId
-   */
-  virtual StatisticDescriptor* nameToDescriptor(const char* name) = 0;
-
-  /**
-   * Gets a value that uniquely identifies this statistics.
-   */
-  virtual int64 getUniqueId() = 0;
-
-  /**
-   * Gets the {@link StatisticsType} of this instance.
-   */
-  virtual StatisticsType* getType() = 0;
-  /**
-   * Gets the text associated with this instance that helps identify it.
-   */
-  virtual const char* getTextId() = 0;
-  /**
-   * Gets the number associated with this instance that helps identify it.
-   */
-
-  virtual int64 getNumericId() = 0;
-  /**
-   * Returns true if modifications are atomic. This means that multiple threads
-   * can safely modify this instance without additional synchronization.
-   * <p>
-   * Returns false if modifications are not atomic. This means that
-   * modifications
-   * to this instance are cheaper but not thread safe.
-   * <P>
-   * Note that all instances that are {@link #isShared shared} are also atomic.
-   */
-  virtual bool isAtomic() = 0;
-  /**
-   * Returns true if the data for this instance is stored in shared memory.
-   * Returns false if the data is store in local memory.
-   * <P>
-   * Note that all instances that are {@link #isShared shared} are also atomic.
-   */
-  virtual bool isShared() = 0;
-  /**
-   * Returns true if the instance has been {@link #close closed}.
-   */
-  virtual bool isClosed() = 0;
-
-  ////////////////////////  set() Methods  ///////////////////////
-
-  /**
-    * Sets the value of a statistic with the given <code>id</code>
-   * whose type is <code>int</code>.
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @param value value to set
-   *
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-  virtual void setInt(int32 id, int32 value) = 0;
-
-  /**
-   * Sets the value of a named statistic of type <code>int</code>
-   *
-   * @param name statistic name
-   * @param value value to set
-   * @throws IllegalArgumentException
-   *         If no statistic exists named <code>name</code> or
-   *         if the statistic with name <code>name</code> is not of
-   *         type <code>int</code>.
-   */
-  virtual void setInt(char* name, int32 value) = 0;
-
-  /**
-   * Sets the value of a described statistic of type <code>int</code>
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @param value value to set
-   * @throws IllegalArgumentException
-   *         If no statistic exists for the given <code>descriptor</code> or
-   *         if the described statistic is not of
-   *         type <code>int</code>.
-   */
-  virtual void setInt(StatisticDescriptor* descriptor, int32 value) = 0;
-
-  /**
-   * Sets the value of a statistic with the given <code>id</code>
-   * whose type is <code>long</code>.
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @param value value to set
-   *
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-
-  virtual void setLong(int32 id, int64 value) = 0;
-  /**
-   * Sets the value of a described statistic of type <code>long</code>
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @param value value to set
-   * @throws IllegalArgumentException
-   *         If no statistic exists for the given <code>descriptor</code> or
-   *         if the described statistic is not of
-   *         type <code>long</code>.
-   */
-  virtual void setLong(StatisticDescriptor* descriptor, int64 value) = 0;
-
-  /**
-   * Sets the value of a named statistic of type <code>long</code>.
-   *
-   * @param name statistic name
-   * @param value value to set
-   * @throws IllegalArgumentException
-   *         If no statistic exists named <code>name</code> or
-   *         if the statistic with name <code>name</code> is not of
-   *         type <code>long</code>.
-   */
-  virtual void setLong(char* name, int64 value) = 0;
-
-  /**
-   * Sets the value of a statistic with the given <code>id</code>
-   * whose type is <code>double</code>.
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @param value value to set
-   *
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-  virtual void setDouble(int32 id, double value) = 0;
-
-  /**
-   * Sets the value of a described statistic of type <code>double</code>
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @param value value to set
-   * @throws IllegalArgumentException
-   *         If no statistic exists for the given <code>descriptor</code> or
-   *         if the described statistic is not of
-   *         type <code>double</code>.
-   */
-  virtual void setDouble(
-      apache::geode::statistics::StatisticDescriptor* descriptor,
-      double value) = 0;
-  /**
-   * Sets the value of a named statistic of type <code>double</code>.
-   *
-   * @param name statistic name
-   * @param value value to set
-   * @throws IllegalArgumentException
-   *         If no statistic exists named <code>name</code> or
-   *         if the statistic with name <code>name</code> is not of
-   *         type <code>double</code>.
-   */
-  virtual void setDouble(char* name, double value) = 0;
-
-  ///////////////////////  get() Methods  ///////////////////////
-
-  /**
-   * Returns the value of the identified statistic of type <code>int</code>.
-   *
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-  virtual int32 getInt(int32 id) = 0;
-
-  /**
-   * Returns the value of the described statistic of type <code>int</code>.
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @throws IllegalArgumentException
-   *         If no statistic exists with the specified <code>descriptor</code>
-   * or
-   *         if the described statistic is not of
-   *         type <code>int</code>.
-   */
-  virtual int32 getInt(
-      apache::geode::statistics::StatisticDescriptor* descriptor) = 0;
-  /**
-   * Returns the value of the statistic of type <code>int</code> at
-   * the given name.
-   * @param name statistic name
-   *
-   * @throws IllegalArgumentException
-   *         If no statistic exists with name <code>name</code> or
-   *         if the statistic named <code>name</code> is not of
-   *         type <code>int</code>.
-   */
-  virtual int32 getInt(char* name) = 0;
-
-  /**
-   * Returns the value of the identified statistic of type <code>long</code>.
-   *
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-  virtual int64 getLong(int32 id) = 0;
-
-  /**
-   * Returns the value of the described statistic of type <code>long</code>.
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @throws IllegalArgumentException
-   *         If no statistic exists with the specified <code>descriptor</code>
-   * or
-   *         if the described statistic is not of
-   *         type <code>long</code>.
-   */
-  virtual int64 getLong(StatisticDescriptor* descriptor) = 0;
-  /**
-   * Returns the value of the statistic of type <code>long</code> at
-   * the given name.
-   *
-   * @param name statistic name
-   * @throws IllegalArgumentException
-   *         If no statistic exists with name <code>name</code> or
-   *         if the statistic named <code>name</code> is not of
-   *         type <code>long</code>.
-   */
-  virtual int64 getLong(char* name) = 0;
-
-  /**
-   * Returns the value of the identified statistic of type <code>double</code>.
-   *
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-  virtual double getDouble(int32 id) = 0;
-
-  /**
-   * Returns the value of the described statistic of type <code>double</code>.
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @throws IllegalArgumentException
-   *         If no statistic exists with the specified <code>descriptor</code>
-   * or
-   *         if the described statistic is not of
-   *         type <code>double</code>.
-   */
-  virtual double getDouble(StatisticDescriptor* descriptor) = 0;
-  /**
-   * Returns the value of the statistic of type <code>double</code> at
-   * the given name.
-   * @param name statistic name
-   *
-   * @throws IllegalArgumentException
-   *         If no statistic exists with name <code>name</code> or
-   *         if the statistic named <code>name</code> is not of
-   *         type <code>double</code>.
-   */
-  virtual double getDouble(char* name) = 0;
-
-  /**
-   * Returns the value of the identified statistic.
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @throws IllegalArgumentException
-   *         If the described statistic does not exist
-   */
-  //   virtual Number get(StatisticDescriptor* descriptor)=0;
-
-  /**
-   * Returns the value of the named statistic.
-   *
-   * @throws IllegalArgumentException
-   *         If the named statistic does not exist
-   */
-  //   virtual Number get(char* name)=0;
-
-  /**
-   * Returns the bits that represent the raw value of the described statistic.
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @throws IllegalArgumentException
-   *         If the described statistic does not exist
-   */
-  virtual int64 getRawBits(StatisticDescriptor* descriptor) = 0;
-
-  /**
-   * Returns the bits that represent the raw value of the named statistic.
-   *
-   * @throws IllegalArgumentException
-   *         If the named statistic does not exist
-   */
-  // virtual double getRawBits(char* name)=0;
-
-  ////////////////////////  inc() Methods  ////////////////////////
-
-  /**
-   * Increments the value of the identified statistic of type <code>int</code>
-   * by the given amount.
-   *
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @param delta change value to be added
-   *
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-  virtual int32 incInt(int32 id, int32 delta) = 0;
-
-  /**
-   * Increments the value of the described statistic of type <code>int</code>
-   * by the given amount.
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @param delta change value to be added
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If no statistic exists with the given <code>descriptor</code> or
-   *         if the described statistic is not of
-   *         type <code>int</code>.
-   */
-  virtual int32 incInt(StatisticDescriptor* descriptor, int32 delta) = 0;
-
-  /**
-   * Increments the value of the statistic of type <code>int</code> with
-   * the given name by a given amount.
-   * @param name statistic name
-   * @param delta change value to be added
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If no statistic exists with name <code>name</code> or
-   *         if the statistic named <code>name</code> is not of
-   *         type <code>int</code>.
-   */
-  virtual int32 incInt(char* name, int32 delta) = 0;
-
-  /**
-   * Increments the value of the identified statistic of type <code>long</code>
-   * by the given amount.
-   *
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @param delta change value to be added
-   *
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-  virtual int64 incLong(int32 id, int64 delta) = 0;
-
-  /**
-   * Increments the value of the described statistic of type <code>long</code>
-   * by the given amount.
-   *
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @param delta change value to be added
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If no statistic exists with the given <code>descriptor</code> or
-   *         if the described statistic is not of
-   *         type <code>long</code>.
-   */
-  virtual int64 incLong(StatisticDescriptor* descriptor, int64 delta) = 0;
-  /**
-   * Increments the value of the statistic of type <code>long</code> with
-   * the given name by a given amount.
-   *
-   * @param name statistic name
-   * @param delta change value to be added
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If no statistic exists with name <code>name</code> or
-   *         if the statistic named <code>name</code> is not of
-   *         type <code>long</code>.
-   */
-  virtual int64 incLong(char* name, int64 delta) = 0;
-
-  /**
-   * Increments the value of the identified statistic of type
-   * <code>double</code>
-   * by the given amount.
-   *
-   * @param id a statistic id obtained with {@link #nameToId}
-   * or {@link StatisticsType#nameToId}.
-   * @param delta change value to be added
-   *
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If the id is invalid.
-   */
-  virtual double incDouble(int32 id, double delta) = 0;
-
-  /**
-   * Increments the value of the described statistic of type <code>double</code>
-   * by the given amount.
-   * @param descriptor a statistic descriptor obtained with {@link
-   * #nameToDescriptor}
-   * or {@link StatisticsType#nameToDescriptor}.
-   * @param delta change value to be added
-   *
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If no statistic exists with the given <code>descriptor</code> or
-   *         if the described statistic is not of
-   *         type <code>double</code>.
-   */
-  virtual double incDouble(StatisticDescriptor* descriptor, double delta) = 0;
-  /**
-   * Increments the value of the statistic of type <code>double</code> with
-   * the given name by a given amount.
-   * @param name statistic name
-   * @param delta change value to be added
-   *
-   * @return The value of the statistic after it has been incremented
-   *
-   * @throws IllegalArgumentException
-   *         If no statistic exists with name <code>name</code> or
-   *         if the statistic named <code>name</code> is not of
-   *         type <code>double</code>.
-   */
-  virtual double incDouble(char* name, double delta) = 0;
-
- protected:
-  /**
-  *  Destructor is protected to prevent direct deletion. Use close().
-  */
-  virtual ~Statistics() = 0;
-};  // class
-
-}  // namespace statistics
-}  // namespace geode
-}  // namespace apache
-
-#endif // GEODE_GFCPP_STATISTICS_STATISTICS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp b/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
deleted file mode 100644
index fa0c44a..0000000
--- a/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
+++ /dev/null
@@ -1,223 +0,0 @@
-#pragma once
-
-#ifndef GEODE_GFCPP_STATISTICS_STATISTICSFACTORY_H_
-#define GEODE_GFCPP_STATISTICS_STATISTICSFACTORY_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 <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
-#include <gfcpp/statistics/StatisticsType.hpp>
-#include "../ExceptionTypes.hpp"
-#include <gfcpp/statistics/Statistics.hpp>
-
-/** @file
-*/
-
-namespace apache {
-namespace geode {
-namespace statistics {
-
-/**
- * Instances of this interface provide methods that create instances
- * of {@link StatisticDescriptor} and {@link StatisticsType}.
- * Every {@link StatisticsFactory} is also a type factory.
- *
- * <P>
- *
- * A <code>StatisticsFactory</code> can create a {@link
- * StatisticDescriptor statistic} of three numeric types:
- * <code>int</code>, <code>long</code>, and <code>double</code>.  A
- * statistic (<code>StatisticDescriptor</code>) can either be a
- * <I>gauge</I> meaning that its value can increase and decrease or a
- * <I>counter</I> meaning that its value is strictly increasing.
- * Marking a statistic as a counter allows the Geode Manager Console
- * to properly display a statistics whose value "wraps around" (that
- * is, exceeds its maximum value).
- *
- */
-
-class CPPCACHE_EXPORT StatisticsFactory {
- protected:
-  StatisticsFactory() {}
-  StatisticsFactory(const StatisticsFactory&) {}
-
- public:
-  /**
-   * Return a pre-existing statistics factory. Typically configured through
-   * creation of a distributed system.
-   */
-  static StatisticsFactory* getExistingInstance();
-
-  virtual ~StatisticsFactory() {}
-
-  /**
-   * Creates and returns a long counter {@link StatisticDescriptor}
-   * with the given <code>name</code>, <code>description</code>,
-   * <code>units</code>,and with larger values indicating better performance.
-   */
-
-  virtual StatisticDescriptor* createIntCounter(const char* name,
-                                                const char* description,
-                                                const char* units,
-                                                int8 largerBetter = true) = 0;
-
-  /**
-   * Creates and returns a double counter {@link StatisticDescriptor}
-   * with the given <code>name</code>, <code>description</code>,
-   *<code>units</code>, and with larger values indicating better performance.
-   */
-
-  virtual StatisticDescriptor* createLongCounter(const char* name,
-                                                 const char* description,
-                                                 const char* units,
-                                                 int8 largerBetter = true) = 0;
-
-  /**
-    * Creates and returns an int gauge {@link StatisticDescriptor}
-    * with the given <code>name</code>, <code>description</code>,
-    * <code>units</code>,  and with smaller values indicating better
-   * performance.
-    */
-
-  virtual StatisticDescriptor* createDoubleCounter(
-      const char* name, const char* description, const char* units,
-      int8 largerBetter = true) = 0;
-
-  /**
-   * Creates and returns an int gauge {@link StatisticDescriptor}
-   * with the given <code>name</code>, <code>description</code>,
-   * <code>units</code>,  and with smaller values indicating better performance.
-   */
-  virtual StatisticDescriptor* createIntGauge(const char* name,
-                                              const char* description,
-                                              const char* units,
-                                              int8 largerBetter = false) = 0;
-
-  /**
-   * Creates and returns an long gauge {@link StatisticDescriptor}
-   * with the given <code>name</code>, <code>description</code>,
-   * <code>units</code>,  and with smaller values indicating better performance.
-   */
-  virtual StatisticDescriptor* createLongGauge(const char* name,
-                                               const char* description,
-                                               const char* units,
-                                               int8 largerBetter = false) = 0;
-
-  /**
-   * Creates and returns an double gauge {@link StatisticDescriptor}
-   * with the given <code>name</code>, <code>description</code>,
-   * <code>units</code>,  and with smaller values indicating better performance.
-   */
-  virtual StatisticDescriptor* createDoubleGauge(const char* name,
-                                                 const char* description,
-                                                 const char* units,
-                                                 int8 largerBetter = false) = 0;
-
-  /**
-   * Creates  and returns a {@link StatisticsType}
-   * with the given <code>name</code>, <code>description</code>,
-   * and {@link StatisticDescriptor}.
-   * @throws IllegalArgumentException
-   * if a type with the given <code>name</code> already exists.
-   */
-  virtual StatisticsType* createType(const char* name, const char* description,
-                                     StatisticDescriptor** stats,
-                                     int32 statsLength) = 0;
-
-  /**
-   * Finds and returns an already created {@link StatisticsType}
-   * with the given <code>name</code>.
-   * Returns <code>null</code> if the type does not exist.
-   */
-  virtual StatisticsType* findType(const char* name) = 0;
-
-  /**
-   * Creates and returns a {@link Statistics} instance of the given {@link
-   * StatisticsType type} with default ids.
-   * <p>
-   * The created instance may not be {@link Statistics#isAtomic atomic}.
-   */
-  virtual Statistics* createStatistics(StatisticsType* type) = 0;
-
-  /**
-   * Creates and returns a {@link Statistics} instance of the given {@link
-   * StatisticsType type}, <code>textId</code>, and with a default numeric id.
-   * <p>
-   * The created instance may not be {@link Statistics#isAtomic atomic}.
-   */
-  virtual Statistics* createStatistics(StatisticsType* type,
-                                       const char* textId) = 0;
-
-  /**
-   * Creates and returns a {@link Statistics} instance of the given {@link
-   * StatisticsType type}, <code>textId</code>, and <code>numericId</code>.
-   * <p>
-   * The created instance may not be {@link Statistics#isAtomic atomic}.
-   */
-  virtual Statistics* createStatistics(StatisticsType* type, const char* textId,
-                                       int64 numericId) = 0;
-
-  /**
-   * Creates and returns a {@link Statistics} instance of the given {@link
-   * StatisticsType type} with default ids.
-   * <p>
-   * The created instance will be {@link Statistics#isAtomic atomic}.
-   */
-  virtual Statistics* createAtomicStatistics(StatisticsType* type) = 0;
-
-  /**
-   * Creates and returns a {@link Statistics} instance of the given {@link
-   * StatisticsType type}, <code>textId</code>, and with a default numeric id.
-   * <p>
-   * The created instance will be {@link Statistics#isAtomic atomic}.
-   */
-  virtual Statistics* createAtomicStatistics(StatisticsType* type,
-                                             const char* textId) = 0;
-
-  /**
-   * Creates and returns a {@link Statistics} instance of the given {@link
-   * StatisticsType type}, <code>textId</code>, and <code>numericId</code>.
-   * <p>
-   * The created instance will be {@link Statistics#isAtomic atomic}.
-   */
-  virtual Statistics* createAtomicStatistics(StatisticsType* type,
-                                             const char* textId,
-                                             int64 numericId) = 0;
-
-  /** Return the first instance that matches the type, or NULL */
-  virtual Statistics* findFirstStatisticsByType(StatisticsType* type) = 0;
-
-  /**
-   * Returns a name that can be used to identify the manager
-   */
-  virtual const char* getName() = 0;
-
-  /**
-   * Returns a numeric id that can be used to identify the manager
-   */
-  virtual int64 getId() = 0;
-
- private:
-  const StatisticsFactory& operator=(const StatisticsFactory&);
-
-};  // class
-}  // namespace statistics
-}  // namespace geode
-}  // namespace apache
-
-#endif // GEODE_GFCPP_STATISTICS_STATISTICSFACTORY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp b/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp
deleted file mode 100644
index 365072d..0000000
--- a/src/cppcache/include/gfcpp/statistics/StatisticsType.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-#pragma once
-
-#ifndef GEODE_GFCPP_STATISTICS_STATISTICSTYPE_H_
-#define GEODE_GFCPP_STATISTICS_STATISTICSTYPE_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 <gfcpp/gfcpp_globals.hpp>
-#include <gfcpp/statistics/StatisticDescriptor.hpp>
-
-using namespace apache::geode::client;
-
-/** @file
-*/
-
-namespace apache {
-namespace geode {
-namespace statistics {
-
-/**
- * Used to describe a logical collection of StatisticDescriptors. These
- * descriptions
- * are used to create an instance of {@link Statistics}.
- *
- * <P>
- * To get an instance of this interface use an instance of
- * {@link StatisticsFactory}.
- *
- */
-
-class CPPCACHE_EXPORT StatisticsType {
- public:
-  /**
-   * Returns the name of this statistics type.
-   */
-  virtual const char* getName() = 0;
-
-  /**
-   * Returns a description of this statistics type.
-   */
-  virtual const char* getDescription() = 0;
-
-  /**
-   * Returns descriptions of the statistics that this statistics type
-   * gathers together.
-   */
-  virtual StatisticDescriptor** getStatistics() = 0;
-
-  /**
-   * Returns the id of the statistic with the given name in this
-   * statistics instance.
-   *
-   * @throws IllegalArgumentException
-   *         No statistic named <code>name</code> exists in this
-   *         statistics instance.
-   */
-  virtual int32 nameToId(const char* name) = 0;
-  /**
-   * Returns the descriptor of the statistic with the given name in this
-   * statistics instance.
-   *
-   * @throws IllegalArgumentException
-   *         No statistic named <code>name</code> exists in this
-   *         statistics instance.
-   */
-  virtual StatisticDescriptor* nameToDescriptor(const char* name) = 0;
-
-  /**
-   * Returns the total number of statistics descriptors in the type.
-   */
-  virtual int32 getDescriptorsCount() = 0;
-
-  // protected:
-  /**
-   * Destructor
-   */
-  virtual ~StatisticsType() {}
-
-};  // class
-
-}  // namespace statistics
-}  // namespace geode
-}  // namespace apache
-
-#endif // GEODE_GFCPP_STATISTICS_STATISTICSTYPE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/BBNamingContext.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/BBNamingContext.hpp b/src/cppcache/integration-test/BBNamingContext.hpp
index 969e809..d33d0d8 100644
--- a/src/cppcache/integration-test/BBNamingContext.hpp
+++ b/src/cppcache/integration-test/BBNamingContext.hpp
@@ -47,4 +47,4 @@ class BBNamingContextServer {
   ~BBNamingContextServer();
 };
 
-#endif // GEODE_INTEGRATION_TEST_BBNAMINGCONTEXT_H_
+#endif  // GEODE_INTEGRATION_TEST_BBNAMINGCONTEXT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp b/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp
index 7004035..8743b35 100644
--- a/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp
+++ b/src/cppcache/integration-test/BuiltinCacheableWrappers.hpp
@@ -1314,5 +1314,4 @@ void registerBuiltins(bool isRegisterFileName = false) {
 }
 }  // namespace CacheableHelper
 
-
-#endif // GEODE_INTEGRATION_TEST_BUILTINCACHEABLEWRAPPERS_H_
+#endif  // GEODE_INTEGRATION_TEST_BUILTINCACHEABLEWRAPPERS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/CacheHelper.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheHelper.cpp b/src/cppcache/integration-test/CacheHelper.cpp
index 03d404e..bff021f 100644
--- a/src/cppcache/integration-test/CacheHelper.cpp
+++ b/src/cppcache/integration-test/CacheHelper.cpp
@@ -15,21 +15,20 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
 #include <stdlib.h>
-#include <gfcpp/SystemProperties.hpp>
 #include <ace/OS.h>
 #include <ace/INET_Addr.h>
 #include <ace/SOCK_Acceptor.h>
 #include <fstream>
 #include <regex>
-
-#include "TimeBomb.hpp"
 #include <list>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/SystemProperties.hpp>
+#include <geode/PoolManager.hpp>
+#include <CacheRegionHelper.hpp>
 #include "DistributedSystemImpl.hpp"
+#include "TimeBomb.hpp"
 #include "Utils.hpp"
-#include <gfcpp/PoolManager.hpp>
-#include <CacheRegionHelper.hpp>
 
 #include "CacheHelper.hpp"
 #define __DUNIT_NO_MAIN__

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/CacheHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheHelper.hpp b/src/cppcache/integration-test/CacheHelper.hpp
index b7780be..7bad324 100644
--- a/src/cppcache/integration-test/CacheHelper.hpp
+++ b/src/cppcache/integration-test/CacheHelper.hpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <stdlib.h>
-#include <gfcpp/SystemProperties.hpp>
+#include <geode/SystemProperties.hpp>
 #include <ace/OS.h>
 #include <ace/INET_Addr.h>
 #include <ace/SOCK_Acceptor.h>
@@ -32,7 +32,7 @@
 #include <chrono>
 #include "DistributedSystemImpl.hpp"
 #include "Utils.hpp"
-#include <gfcpp/PoolManager.hpp>
+#include <geode/PoolManager.hpp>
 #ifndef ROOT_NAME
 #define ROOT_NAME "Root"
 #endif

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/CacheImplHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheImplHelper.hpp b/src/cppcache/integration-test/CacheImplHelper.hpp
index 44143eb..8978d36 100644
--- a/src/cppcache/integration-test/CacheImplHelper.hpp
+++ b/src/cppcache/integration-test/CacheImplHelper.hpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <stdlib.h>
-#include <gfcpp/SystemProperties.hpp>
+#include <geode/SystemProperties.hpp>
 #include <ace/OS.h>
 #include "testUtils.hpp"
 
@@ -67,4 +67,4 @@ class CacheImplHelper : public CacheHelper {
   }
 };
 
-#endif // GEODE_INTEGRATION_TEST_CACHEIMPLHELPER_H_
+#endif  // GEODE_INTEGRATION_TEST_CACHEIMPLHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/CacheableWrapper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/CacheableWrapper.hpp b/src/cppcache/integration-test/CacheableWrapper.hpp
index cca0761..1ed5d03 100644
--- a/src/cppcache/integration-test/CacheableWrapper.hpp
+++ b/src/cppcache/integration-test/CacheableWrapper.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <string>
 #include <map>
 #include <vector>
@@ -132,5 +132,4 @@ std::string CacheableWrapperFactory::getTypeForId(int8_t typeId) {
   }
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_CACHEABLEWRAPPER_H_
+#endif  // GEODE_INTEGRATION_TEST_CACHEABLEWRAPPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/DeltaEx.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/DeltaEx.hpp b/src/cppcache/integration-test/DeltaEx.hpp
index 3843f90..e35217f 100644
--- a/src/cppcache/integration-test/DeltaEx.hpp
+++ b/src/cppcache/integration-test/DeltaEx.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include "CacheHelper.hpp"
 class DeltaEx : public Cacheable, public Delta {
@@ -151,4 +151,4 @@ class PdxDeltaEx : public PdxSerializable, public Delta {
 };
 typedef SharedPtr<PdxDeltaEx> PdxDeltaExPtr;
 
-#endif // GEODE_INTEGRATION_TEST_DELTAEX_H_
+#endif  // GEODE_INTEGRATION_TEST_DELTAEX_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/LibraryCallbacks.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/LibraryCallbacks.cpp b/src/cppcache/integration-test/LibraryCallbacks.cpp
index 7420236..be29690 100644
--- a/src/cppcache/integration-test/LibraryCallbacks.cpp
+++ b/src/cppcache/integration-test/LibraryCallbacks.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/gfcpp_globals.hpp>
+#include <geode/geode_globals.hpp>
 
 #include <ace/Time_Value.h>
 #include <ace/OS.h>

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/LocatorHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/LocatorHelper.hpp b/src/cppcache/integration-test/LocatorHelper.hpp
index 88245a5..f41913e 100644
--- a/src/cppcache/integration-test/LocatorHelper.hpp
+++ b/src/cppcache/integration-test/LocatorHelper.hpp
@@ -147,4 +147,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseLocator1)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_LOCATORHELPER_H_
+#endif  // GEODE_INTEGRATION_TEST_LOCATORHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/QueryHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/QueryHelper.hpp b/src/cppcache/integration-test/QueryHelper.hpp
index cb5fd3b..949a4a3 100644
--- a/src/cppcache/integration-test/QueryHelper.hpp
+++ b/src/cppcache/integration-test/QueryHelper.hpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <stdlib.h>
-#include <gfcpp/SystemProperties.hpp>
+#include <geode/SystemProperties.hpp>
 #include <ace/OS.h>
 
 #include "DistributedSystemImpl.hpp"
@@ -32,9 +32,9 @@
 #include "testobject/PdxType.hpp"
 #include "testobject/PortfolioPdx.hpp"
 #include "testobject/PositionPdx.hpp"
-#include <gfcpp/ResultSet.hpp>
-#include <gfcpp/StructSet.hpp>
-//#include <gfcpp/Struct.hpp>
+#include <geode/ResultSet.hpp>
+#include <geode/StructSet.hpp>
+//#include <geode/Struct.hpp>
 
 //#ifndef ROOT_NAME
 // ROOT_NAME+++ DEFINE ROOT_NAME before including QueryHelper.hpp
@@ -376,5 +376,4 @@ bool QueryHelper::verifySS(SelectResultsPtr& structSet, int expectedRows,
   return false;
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_QUERYHELPER_H_
+#endif  // GEODE_INTEGRATION_TEST_QUERYHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/QueryStrings.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/QueryStrings.hpp b/src/cppcache/integration-test/QueryStrings.hpp
index 618817d..01d53b6 100644
--- a/src/cppcache/integration-test/QueryStrings.hpp
+++ b/src/cppcache/integration-test/QueryStrings.hpp
@@ -729,5 +729,4 @@ const int constantExpectedRowsCQRS[1] = {35};
 
 }  // namespace testData
 
-
-#endif // GEODE_INTEGRATION_TEST_QUERYSTRINGS_H_
+#endif  // GEODE_INTEGRATION_TEST_QUERYSTRINGS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/TallyListener.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyListener.hpp b/src/cppcache/integration-test/TallyListener.hpp
index 20f8b1a..cdc6a72 100644
--- a/src/cppcache/integration-test/TallyListener.hpp
+++ b/src/cppcache/integration-test/TallyListener.hpp
@@ -20,8 +20,7 @@
  * limitations under the License.
  */
 
-
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <string>
 
 using namespace apache::geode::client;
@@ -223,5 +222,4 @@ void TallyListener::afterRegionClear(const EntryEvent& event) {
   checkcallbackArg(event);
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_TALLYLISTENER_H_
+#endif  // GEODE_INTEGRATION_TEST_TALLYLISTENER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/TallyLoader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyLoader.hpp b/src/cppcache/integration-test/TallyLoader.hpp
index 44acb60..cf7e84a 100644
--- a/src/cppcache/integration-test/TallyLoader.hpp
+++ b/src/cppcache/integration-test/TallyLoader.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 using namespace apache::geode::client;
 using namespace test;
@@ -72,5 +72,4 @@ class TallyLoader : virtual public CacheLoader {
   }
 };
 
-
-#endif // GEODE_INTEGRATION_TEST_TALLYLOADER_H_
+#endif  // GEODE_INTEGRATION_TEST_TALLYLOADER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/TallyWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/TallyWriter.hpp b/src/cppcache/integration-test/TallyWriter.hpp
index 85992f3..da3bc7b 100644
--- a/src/cppcache/integration-test/TallyWriter.hpp
+++ b/src/cppcache/integration-test/TallyWriter.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 
 using namespace apache::geode::client;
 using namespace test;
@@ -153,5 +153,4 @@ class TallyWriter : virtual public CacheWriter {
   }
 };
 
-
-#endif // GEODE_INTEGRATION_TEST_TALLYWRITER_H_
+#endif  // GEODE_INTEGRATION_TEST_TALLYWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientCQ.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientCQ.hpp b/src/cppcache/integration-test/ThinClientCQ.hpp
index 6d87d46..4067e6d 100644
--- a/src/cppcache/integration-test/ThinClientCQ.hpp
+++ b/src/cppcache/integration-test/ThinClientCQ.hpp
@@ -26,7 +26,6 @@
  *      Author: vrao
  */
 
-
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 #include "CacheImplHelper.hpp"
@@ -62,5 +61,4 @@ void createRegionForCQMU(const char* name, bool ackMode,
   createRegionAndAttachPool(name, ackMode, name, caching);
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTCQ_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTCQ_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientCallbackArg.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientCallbackArg.hpp b/src/cppcache/integration-test/ThinClientCallbackArg.hpp
index 619eb8d..0eb79b6 100644
--- a/src/cppcache/integration-test/ThinClientCallbackArg.hpp
+++ b/src/cppcache/integration-test/ThinClientCallbackArg.hpp
@@ -194,4 +194,4 @@ void runCallbackArg() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTCALLBACKARG_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTCALLBACKARG_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientDistOps.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDistOps.hpp b/src/cppcache/integration-test/ThinClientDistOps.hpp
index 455ad8f..028b463 100644
--- a/src/cppcache/integration-test/ThinClientDistOps.hpp
+++ b/src/cppcache/integration-test/ThinClientDistOps.hpp
@@ -26,9 +26,8 @@
  *      Author: abhaware
  */
 
-
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"
@@ -908,5 +907,4 @@ void runDistOpsDontUpdateLocatorList() {
   CALL_TASK(CloseLocator1);
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientDistOps2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDistOps2.hpp b/src/cppcache/integration-test/ThinClientDistOps2.hpp
index 041aeb4..f8dfbf1 100644
--- a/src/cppcache/integration-test/ThinClientDistOps2.hpp
+++ b/src/cppcache/integration-test/ThinClientDistOps2.hpp
@@ -20,9 +20,8 @@
  * limitations under the License.
  */
 
-
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 
 #include <string>
@@ -384,5 +383,4 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2)
   }
 END_TASK_DEFINITION
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS2_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTDISTOPS2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientDurable.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurable.hpp b/src/cppcache/integration-test/ThinClientDurable.hpp
index 7ddece8..4b08cbc 100644
--- a/src/cppcache/integration-test/ThinClientDurable.hpp
+++ b/src/cppcache/integration-test/ThinClientDurable.hpp
@@ -26,7 +26,6 @@
  *      Author: abhaware
  */
 
-
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 
@@ -494,5 +493,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServers)
   }
 END_TASK_DEFINITION
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLE_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTDURABLE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientDurableConnect.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableConnect.hpp b/src/cppcache/integration-test/ThinClientDurableConnect.hpp
index bd25053..878bca3 100644
--- a/src/cppcache/integration-test/ThinClientDurableConnect.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableConnect.hpp
@@ -26,7 +26,6 @@
  *      Author: abhaware
  */
 
-
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 #include "CacheImplHelper.hpp"
@@ -352,5 +351,4 @@ void doThinClientDurableConnect(bool poolConfig = true,
   CALL_TASK(CloseLocator);
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLECONNECT_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTDURABLECONNECT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientDurableFailover.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableFailover.hpp b/src/cppcache/integration-test/ThinClientDurableFailover.hpp
index 2786bce..f06510e 100644
--- a/src/cppcache/integration-test/ThinClientDurableFailover.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableFailover.hpp
@@ -26,7 +26,6 @@
  *      Author: abhaware
  */
 
-
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 
@@ -413,5 +412,4 @@ void doThinClientDurableFailoverClientClosedRedundancy() {
   CALL_TASK(CloseLocator);
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEFAILOVER_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEFAILOVER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientDurableInit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableInit.hpp b/src/cppcache/integration-test/ThinClientDurableInit.hpp
index d5275c5..5e8e8c9 100644
--- a/src/cppcache/integration-test/ThinClientDurableInit.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableInit.hpp
@@ -26,7 +26,6 @@
  *      Author: abhaware
  */
 
-
 bool isLocalServer = false;
 
 const char* durableIds[] = {"DurableId1", "DurableId2"};
@@ -111,4 +110,4 @@ void initClientAndTwoRegionsAndTwoPools(int ClientIdx, int redundancy,
   }
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINIT_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINIT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientDurableInterest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableInterest.hpp b/src/cppcache/integration-test/ThinClientDurableInterest.hpp
index 265ab20..24c75e4 100644
--- a/src/cppcache/integration-test/ThinClientDurableInterest.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableInterest.hpp
@@ -26,7 +26,6 @@
  *      Author: abhaware
  */
 
-
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 
@@ -363,5 +362,4 @@ DUNIT_TASK_DEFINITION(SERVER1, closeServer)
   }
 END_TASK_DEFINITION
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINTEREST_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTDURABLEINTEREST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientDurableReconnect.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientDurableReconnect.hpp b/src/cppcache/integration-test/ThinClientDurableReconnect.hpp
index d8a7ade..f68474e 100644
--- a/src/cppcache/integration-test/ThinClientDurableReconnect.hpp
+++ b/src/cppcache/integration-test/ThinClientDurableReconnect.hpp
@@ -26,7 +26,6 @@
  *      Author: abhaware
  */
 
-
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 
@@ -170,5 +169,4 @@ void doThinClientDurableReconnect() {
   closeLocator();
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTDURABLERECONNECT_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTDURABLERECONNECT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientFailover.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover.hpp b/src/cppcache/integration-test/ThinClientFailover.hpp
index 82580e0..ddc2a72 100644
--- a/src/cppcache/integration-test/ThinClientFailover.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>
@@ -424,4 +424,4 @@ void runThinClientFailover(bool isSticky = false) {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientFailover2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover2.hpp b/src/cppcache/integration-test/ThinClientFailover2.hpp
index d2a2361..e973542 100644
--- a/src/cppcache/integration-test/ThinClientFailover2.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover2.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>
@@ -548,4 +548,4 @@ void runThinClientFailover2() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER2_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientFailover3.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailover3.hpp b/src/cppcache/integration-test/ThinClientFailover3.hpp
index 189af12..c117f0c 100644
--- a/src/cppcache/integration-test/ThinClientFailover3.hpp
+++ b/src/cppcache/integration-test/ThinClientFailover3.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -373,4 +373,4 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2and3)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER3_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVER3_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverInterest.hpp b/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
index 6e4c3e2..687467f 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterest.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -428,4 +428,4 @@ void runThinClientFailoverInterest() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp b/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
index 8dd5f06..d84de3e 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterest2.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -457,4 +457,4 @@ void runThinClientFailoverInterest2() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST2_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTEREST2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp b/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
index 83cdf8a..a479dc3 100644
--- a/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverInterestAllWithCache.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -520,4 +520,4 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTERESTALLWITHCACHE_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERINTERESTALLWITHCACHE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientFailoverRegex.hpp b/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
index 5778b27..a281bf7 100644
--- a/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
+++ b/src/cppcache/integration-test/ThinClientFailoverRegex.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -507,4 +507,4 @@ void runThinClientFailOverRegex() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERREGEX_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTFAILOVERREGEX_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientGatewayTest.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientGatewayTest.hpp b/src/cppcache/integration-test/ThinClientGatewayTest.hpp
index 3f05ad8..7ecd39c 100644
--- a/src/cppcache/integration-test/ThinClientGatewayTest.hpp
+++ b/src/cppcache/integration-test/ThinClientGatewayTest.hpp
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 #include "TallyListener.hpp"
@@ -35,7 +34,7 @@
 using namespace apache::geode::client;
 using namespace test;
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <string>
 
 class MyListener : public CacheListener {
@@ -190,4 +189,4 @@ void runListenerInit(bool poolConfig = true, bool isLocator = true) {
   CALL_TASK(StopLocator2);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTGATEWAYTEST_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTGATEWAYTEST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientHeapLRU.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientHeapLRU.hpp b/src/cppcache/integration-test/ThinClientHeapLRU.hpp
index 6f280a9..ce4ec99 100644
--- a/src/cppcache/integration-test/ThinClientHeapLRU.hpp
+++ b/src/cppcache/integration-test/ThinClientHeapLRU.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "BuiltinCacheableWrappers.hpp"
@@ -255,4 +255,4 @@ void runHeapLRU(bool poolConfig = true, bool isLocator = true) {
   }
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTHEAPLRU_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTHEAPLRU_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientHelper.hpp b/src/cppcache/integration-test/ThinClientHelper.hpp
index 54fd205..49c9fc8 100644
--- a/src/cppcache/integration-test/ThinClientHelper.hpp
+++ b/src/cppcache/integration-test/ThinClientHelper.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testUtils.hpp"
@@ -705,5 +705,4 @@ class RegionOperations {
   RegionPtr m_regionPtr;
 };
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTHELPER_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientInterest1.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterest1.hpp b/src/cppcache/integration-test/ThinClientInterest1.hpp
index 80fdf8e..5d01278 100644
--- a/src/cppcache/integration-test/ThinClientInterest1.hpp
+++ b/src/cppcache/integration-test/ThinClientInterest1.hpp
@@ -107,4 +107,4 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST1_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST1_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientInterest2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterest2.hpp b/src/cppcache/integration-test/ThinClientInterest2.hpp
index b60941b..92ef6ab 100644
--- a/src/cppcache/integration-test/ThinClientInterest2.hpp
+++ b/src/cppcache/integration-test/ThinClientInterest2.hpp
@@ -98,4 +98,4 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST2_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientInterest3.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterest3.hpp b/src/cppcache/integration-test/ThinClientInterest3.hpp
index d6e5e51..cd42325 100644
--- a/src/cppcache/integration-test/ThinClientInterest3.hpp
+++ b/src/cppcache/integration-test/ThinClientInterest3.hpp
@@ -177,4 +177,4 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp b/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp
index 764bd93..0461fc8 100644
--- a/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp
+++ b/src/cppcache/integration-test/ThinClientInterest3Cacheless.hpp
@@ -150,4 +150,4 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3CACHELESS_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTINTEREST3CACHELESS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientInterestList.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterestList.hpp b/src/cppcache/integration-test/ThinClientInterestList.hpp
index c38e162..468e43a 100644
--- a/src/cppcache/integration-test/ThinClientInterestList.hpp
+++ b/src/cppcache/integration-test/ThinClientInterestList.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -420,4 +420,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientInterestList2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientInterestList2.hpp b/src/cppcache/integration-test/ThinClientInterestList2.hpp
index 1b311a8..1cdd14c 100644
--- a/src/cppcache/integration-test/ThinClientInterestList2.hpp
+++ b/src/cppcache/integration-test/ThinClientInterestList2.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -406,4 +406,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST2_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTINTERESTLIST2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientListenerInit.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientListenerInit.hpp b/src/cppcache/integration-test/ThinClientListenerInit.hpp
index 465e0f2..07ea409 100644
--- a/src/cppcache/integration-test/ThinClientListenerInit.hpp
+++ b/src/cppcache/integration-test/ThinClientListenerInit.hpp
@@ -253,5 +253,4 @@ DUNIT_TASK_DEFINITION(CLIENT1, CloseCache1)
   { cleanProc(); }
 END_TASK_DEFINITION
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTLISTENERINIT_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTLISTENERINIT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientListenerWriter.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientListenerWriter.hpp b/src/cppcache/integration-test/ThinClientListenerWriter.hpp
index 93a52b8..d0fbde4 100644
--- a/src/cppcache/integration-test/ThinClientListenerWriter.hpp
+++ b/src/cppcache/integration-test/ThinClientListenerWriter.hpp
@@ -503,5 +503,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTLISTENERWRITER_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTLISTENERWRITER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
index f0d0df0..aaa3b93 100644
--- a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
+++ b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
@@ -265,4 +265,4 @@ void runCacheLoaderTest() {
   CALL_TASK(StopServer)
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTLOCALCACHELOADER_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTLOCALCACHELOADER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientNotification.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientNotification.hpp b/src/cppcache/integration-test/ThinClientNotification.hpp
index ac076cb..1094697 100644
--- a/src/cppcache/integration-test/ThinClientNotification.hpp
+++ b/src/cppcache/integration-test/ThinClientNotification.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -494,4 +494,4 @@ void doThinClientNotification() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTNOTIFICATION_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTNOTIFICATION_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPdxSerializer.hpp b/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
index 7a5d3b2..335a8c4 100644
--- a/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
+++ b/src/cppcache/integration-test/ThinClientPdxSerializer.hpp
@@ -27,7 +27,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -384,4 +384,4 @@ DUNIT_TASK_DEFINITION(LOCATOR, CloseLocator)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZER_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientPdxSerializers.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPdxSerializers.hpp b/src/cppcache/integration-test/ThinClientPdxSerializers.hpp
index 887fcf2..834c8bf 100644
--- a/src/cppcache/integration-test/ThinClientPdxSerializers.hpp
+++ b/src/cppcache/integration-test/ThinClientPdxSerializers.hpp
@@ -298,5 +298,4 @@ class TestPdxSerializer : public PdxSerializer {
   }
 };
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZERS_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTPDXSERIALIZERS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientPutAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutAll.hpp b/src/cppcache/integration-test/ThinClientPutAll.hpp
index 7a8d529..9db38ee 100644
--- a/src/cppcache/integration-test/ThinClientPutAll.hpp
+++ b/src/cppcache/integration-test/ThinClientPutAll.hpp
@@ -20,9 +20,8 @@
  * limitations under the License.
  */
 
-
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"
@@ -839,4 +838,4 @@ void runPutAll1(bool concurrencyCheckEnabled = true) {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTPUTALL_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTPUTALL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp b/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp
index 16f0d1a..57c475e 100644
--- a/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp
+++ b/src/cppcache/integration-test/ThinClientPutAllTimeout.hpp
@@ -247,4 +247,4 @@ DUNIT_TASK_DEFINITION(SERVER1, StopServer)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTPUTALLTIMEOUT_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTPUTALLTIMEOUT_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp b/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
index 95ad493..dffb51f 100644
--- a/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
+++ b/src/cppcache/integration-test/ThinClientPutAllWithCallBack.hpp
@@ -20,9 +20,8 @@
  * limitations under the License.
  */
 
-
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"
@@ -798,5 +797,4 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2)
   }
 END_TASK_DEFINITION
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTPUTALLWITHCALLBACK_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTPUTALLWITHCALLBACK_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientPutGetAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientPutGetAll.hpp b/src/cppcache/integration-test/ThinClientPutGetAll.hpp
index 60fb109..e7a74f8 100644
--- a/src/cppcache/integration-test/ThinClientPutGetAll.hpp
+++ b/src/cppcache/integration-test/ThinClientPutGetAll.hpp
@@ -20,9 +20,8 @@
  * limitations under the License.
  */
 
-
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -613,4 +612,4 @@ void runPutGetAll() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTPUTGETALL_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTPUTGETALL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
index 8e1f0d1..39d2da2 100644
--- a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
+++ b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -500,4 +500,4 @@ void testSubregionForLocalRegionDestroy() {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTRIWITHLOCALREGIONDESTROY_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTRIWITHLOCALREGIONDESTROY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientRegex.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex.hpp b/src/cppcache/integration-test/ThinClientRegex.hpp
index 44d9edb..fe4debe 100644
--- a/src/cppcache/integration-test/ThinClientRegex.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -425,4 +425,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTREGEX_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTREGEX_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientRegex2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex2.hpp b/src/cppcache/integration-test/ThinClientRegex2.hpp
index 079d3cd..4d93d56 100644
--- a/src/cppcache/integration-test/ThinClientRegex2.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex2.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -462,4 +462,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTREGEX2_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTREGEX2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientRegex3.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRegex3.hpp b/src/cppcache/integration-test/ThinClientRegex3.hpp
index 22e5561..ed4b287 100644
--- a/src/cppcache/integration-test/ThinClientRegex3.hpp
+++ b/src/cppcache/integration-test/ThinClientRegex3.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -413,4 +413,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTREGEX3_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTREGEX3_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientRemoveAll.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientRemoveAll.hpp b/src/cppcache/integration-test/ThinClientRemoveAll.hpp
index a03704f..b112f2e 100644
--- a/src/cppcache/integration-test/ThinClientRemoveAll.hpp
+++ b/src/cppcache/integration-test/ThinClientRemoveAll.hpp
@@ -20,9 +20,8 @@
  * limitations under the License.
  */
 
-
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include "testobject/PdxType.hpp"
@@ -31,7 +30,7 @@
 
 #include "BuiltinCacheableWrappers.hpp"
 #include <Utils.hpp>
-#include <gfcpp/statistics/StatisticsFactory.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
 
 #define ROOT_NAME "ThinClientRemoveAll"
 #define ROOT_SCOPE DISTRIBUTED_ACK
@@ -425,5 +424,4 @@ DUNIT_TASK_DEFINITION(SERVER2, CloseServer2)
   }
 END_TASK_DEFINITION
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTREMOVEALL_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTREMOVEALL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientSSL.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSSL.hpp b/src/cppcache/integration-test/ThinClientSSL.hpp
index 1c5f8bc..0dc8cc4 100644
--- a/src/cppcache/integration-test/ThinClientSSL.hpp
+++ b/src/cppcache/integration-test/ThinClientSSL.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -506,4 +506,4 @@ void doThinClientSSL(bool poolConfig = true, bool poolLocators = true) {
   CALL_TASK(CloseLocator1_With_SSL);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTSSL_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTSSL_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
index 6023147..b4fef02 100644
--- a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
+++ b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
 #include <string>
@@ -520,4 +520,4 @@ void doThinClientSSLWithPassword() {
   CALL_TASK(CloseLocator1_With_SSL);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTSSLWITHPASSWORD_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTSSLWITHPASSWORD_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientSecurity.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSecurity.hpp b/src/cppcache/integration-test/ThinClientSecurity.hpp
index 220d437..c0e726c 100644
--- a/src/cppcache/integration-test/ThinClientSecurity.hpp
+++ b/src/cppcache/integration-test/ThinClientSecurity.hpp
@@ -26,7 +26,6 @@
  *      Author: vrao
  */
 
-
 #include "fw_dunit.hpp"
 #include "ThinClientHelper.hpp"
 #include "CacheImplHelper.hpp"
@@ -79,5 +78,4 @@ RegionServicePtr getVirtualCache(PropertiesPtr creds, PoolPtr pool) {
   return cachePtr->createAuthenticatedView(creds, pool->getName());
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTSECURITY_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTSECURITY_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
index 08974aa..28b3e4b 100644
--- a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
+++ b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include "ThinClientHelper.hpp"
 #include "ace/Process.h"
 
@@ -259,4 +259,4 @@ class putThread : public ACE_Task_Base {
   int m_waitTime;
 };
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTSECURITYHELPER_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTSECURITYHELPER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientTXFailover.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTXFailover.hpp b/src/cppcache/integration-test/ThinClientTXFailover.hpp
index aa6680c..d30cdb0 100644
--- a/src/cppcache/integration-test/ThinClientTXFailover.hpp
+++ b/src/cppcache/integration-test/ThinClientTXFailover.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/High_Res_Timer.h>
 
 #include <ace/OS.h>
@@ -430,4 +430,4 @@ void runThinClientFailover(bool isSticky = false) {
   CALL_TASK(CloseLocator1);
 }
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTTXFAILOVER_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTTXFAILOVER_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp b/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp
index a063080..45d52be 100644
--- a/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp
+++ b/src/cppcache/integration-test/ThinClientTasks_C2S2.hpp
@@ -26,7 +26,6 @@
  *      Author: abhaware
  */
 
-
 // define our own names for the 4 test processes
 #define PROCESS1 s1p1
 #define PROCESS2 s1p2
@@ -94,5 +93,4 @@ void startServer() { CALL_TASK(startServerWithLocator); }
 
 void closeLocator() { CALL_TASK(CloseLocator); }
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTTASKS_C2S2_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTTASKS_C2S2_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientTransactions.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTransactions.hpp b/src/cppcache/integration-test/ThinClientTransactions.hpp
index 7674b2f..d8f4c46 100644
--- a/src/cppcache/integration-test/ThinClientTransactions.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactions.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/Auto_Event.h>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
@@ -1110,5 +1110,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServer1)
   }
 END_TASK_DEFINITION
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONS_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONS_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
index cba8bcc..be0437b 100644
--- a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
@@ -21,7 +21,7 @@
  */
 
 #include "fw_dunit.hpp"
-#include <gfcpp/GeodeCppCache.hpp>
+#include <geode/GeodeCppCache.hpp>
 #include <ace/Auto_Event.h>
 #include <ace/OS.h>
 #include <ace/High_Res_Timer.h>
@@ -1166,5 +1166,4 @@ void runTransactionOps(bool poolConfig = true, bool isLocator = true,
   CALL_TASK(CloseLocator1);
 }
 
-
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONSXA_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTTRANSACTIONSXA_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/fd58b100/src/cppcache/integration-test/ThinClientVersionedOps.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/ThinClientVersionedOps.hpp b/src/cppcache/integration-test/ThinClientVersionedOps.hpp
index a1152a1..2794022 100644
--- a/src/cppcache/integration-test/ThinClientVersionedOps.hpp
+++ b/src/cppcache/integration-test/ThinClientVersionedOps.hpp
@@ -587,4 +587,4 @@ DUNIT_TASK_DEFINITION(SERVER1, CloseServers_With_Locator)
   }
 END_TASK_DEFINITION
 
-#endif // GEODE_INTEGRATION_TEST_THINCLIENTVERSIONEDOPS_H_
+#endif  // GEODE_INTEGRATION_TEST_THINCLIENTVERSIONEDOPS_H_


Mime
View raw message