geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [5/5] geode git commit: GEODE-2422: Switch remaining GemFire strings to Geode.
Date Thu, 09 Feb 2017 17:33:57 GMT
GEODE-2422: Switch remaining GemFire strings to Geode.

  - includes rename GemFireCache.hpp to GeodeCache.hpp
  - GemFire, Gemfire, and gemfire replaced with Geode, Geode, geode
  - includes only source changes: .cs, .cpp, and .hpp
  - doesn't include guard statement changes

This closes #391


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

Branch: refs/heads/next-gen-native-client-software-grant
Commit: 04c534798395996183b80cda95c6f4f6af119490
Parents: d7a2a9d
Author: Mike Martell <mmartell@pivotal.io>
Authored: Sat Feb 4 11:22:38 2017 -0800
Committer: Anthony Baker <abaker@apache.org>
Committed: Thu Feb 9 09:21:22 2017 -0800

----------------------------------------------------------------------
 src/clicache/integration-test/CacheHelperN.cs   |   2 +-
 .../integration-test/SerializationTestsN.cs     |  48 ++++-----
 .../ThinClientAppDomainQueryTests.cs            |   2 +-
 .../integration-test/ThinClientPoolTestsN.cs    |   8 +-
 .../integration-test/ThinClientQueryTestsN.cs   |  20 ++--
 .../integration-test/ThinClientRegionTestsN.cs  |   2 +-
 src/clicache/src/CacheListenerAdapter.hpp       |   2 +-
 src/clicache/src/ExceptionTypes.cpp             |  20 ++--
 src/clicache/src/ExceptionTypes.hpp             | 104 +++++++++----------
 src/clicache/src/GeodeClassIds.hpp              |   2 +-
 src/clicache/src/QueryService.cpp               |  18 ++--
 src/clicache/src/Region.cpp                     |   4 +-
 src/clicache/src/Serializable.cpp               |   2 +-
 src/clicache/src/impl/ManagedAuthInitialize.cpp |   8 +-
 src/clicache/src/impl/ManagedCacheListener.cpp  |  40 +++----
 src/clicache/src/impl/ManagedCacheLoader.cpp    |   8 +-
 src/clicache/src/impl/ManagedCacheWriter.cpp    |  24 ++---
 src/clicache/src/impl/ManagedCacheableDelta.cpp |  44 ++++----
 .../src/impl/ManagedCacheableDeltaBytes.cpp     |  44 ++++----
 src/clicache/src/impl/ManagedCacheableKey.cpp   |  36 +++----
 .../src/impl/ManagedCacheableKeyBytes.cpp       |  36 +++----
 src/clicache/src/impl/ManagedCqListener.cpp     |   4 +-
 .../src/impl/ManagedCqStatusListener.cpp        |   8 +-
 .../src/impl/ManagedFixedPartitionResolver.cpp  |  12 +--
 .../src/impl/ManagedPartitionResolver.cpp       |   8 +-
 .../src/impl/ManagedResultCollector.cpp         |   8 +-
 .../src/impl/ManagedTransactionListener.cpp     |  16 +--
 .../src/impl/ManagedTransactionWriter.cpp       |   4 +-
 src/clicache/src/impl/ManagedVisitor.cpp        |   4 +-
 .../src/impl/PdxManagedCacheableKey.cpp         |  48 ++++-----
 .../src/impl/PdxManagedCacheableKeyBytes.cpp    |  48 ++++-----
 .../gemfire/plugins/sqlite/SqLiteImpl.cs        |   2 +-
 src/cppcache/include/gfcpp/Cache.hpp            |   4 +-
 src/cppcache/include/gfcpp/CacheFactory.hpp     |  12 +--
 src/cppcache/include/gfcpp/CacheListener.hpp    |   4 +-
 .../include/gfcpp/CacheTransactionManager.hpp   |   2 +-
 src/cppcache/include/gfcpp/CacheWriter.hpp      |   4 +-
 .../include/gfcpp/CacheableBuiltins.hpp         |  14 +++
 src/cppcache/include/gfcpp/CqOperation.hpp      |   2 +-
 src/cppcache/include/gfcpp/CqState.hpp          |   2 +-
 src/cppcache/include/gfcpp/Delta.hpp            |   8 +-
 .../include/gfcpp/DistributedSystem.hpp         |   6 +-
 src/cppcache/include/gfcpp/ExceptionTypes.hpp   |  12 +--
 src/cppcache/include/gfcpp/Execution.hpp        |   2 +-
 .../include/gfcpp/FixedPartitionResolver.hpp    |   2 +-
 src/cppcache/include/gfcpp/FunctionService.hpp  |   4 +-
 src/cppcache/include/gfcpp/GemFireCache.hpp     |  86 ---------------
 src/cppcache/include/gfcpp/GeodeCache.hpp       |  86 +++++++++++++++
 src/cppcache/include/gfcpp/GeodeCppCache.hpp    |   2 +-
 .../InternalCacheTransactionManager2PC.hpp      |   6 +-
 src/cppcache/include/gfcpp/Log.hpp              |  34 +++---
 .../include/gfcpp/PartitionResolver.hpp         |   4 +-
 src/cppcache/include/gfcpp/PdxInstance.hpp      |   2 +-
 src/cppcache/include/gfcpp/PdxSerializable.hpp  |   2 +-
 src/cppcache/include/gfcpp/PdxSerializer.hpp    |   2 +-
 src/cppcache/include/gfcpp/PdxUnreadFields.hpp  |   2 +-
 src/cppcache/include/gfcpp/PdxWrapper.hpp       |   2 +-
 src/cppcache/include/gfcpp/Pool.hpp             |   2 +-
 src/cppcache/include/gfcpp/PoolFactory.hpp      |   2 +-
 src/cppcache/include/gfcpp/Region.hpp           |  24 ++---
 src/cppcache/include/gfcpp/RegionService.hpp    |   2 +-
 src/cppcache/include/gfcpp/ResultCollector.hpp  |   8 +-
 src/cppcache/include/gfcpp/SystemProperties.hpp |   2 +-
 src/cppcache/include/gfcpp/TransactionId.hpp    |   2 +-
 .../gfcpp/UserFunctionExecutionException.hpp    |   6 +-
 src/cppcache/include/gfcpp/gf_base.hpp          |  16 +--
 src/cppcache/include/gfcpp/gf_types.hpp         |   2 +-
 .../gfcpp/statistics/StatisticDescriptor.hpp    |   2 +-
 .../gfcpp/statistics/StatisticsFactory.hpp      |   2 +-
 src/cppcache/integration-test/CacheHelper.cpp   |  41 ++++----
 src/cppcache/integration-test/CacheHelper.hpp   |   8 +-
 src/cppcache/integration-test/InitSmartHeap.cpp |   2 +-
 .../integration-test/ThinClientDistOps.hpp      |  12 +--
 .../ThinClientLocalCacheLoader.hpp              |   4 +-
 .../integration-test/ThinClientTransactions.hpp |  12 +--
 .../ThinClientTransactionsXA.hpp                |  12 +--
 src/cppcache/integration-test/testLinkage.cpp   |   4 +-
 .../integration-test/testThinClientCq.cpp       |   6 +-
 .../testThinClientCqDurable.cpp                 |  24 ++---
 .../testThinClientInterest1_Bug1001.cpp         |   8 +-
 .../testThinClientListenerEvents.cpp            |   2 +-
 .../integration-test/testThinClientPdxTests.cpp |   2 +-
 .../testThinClientPdxTestsWithAuto.cpp          |   2 +-
 .../testThinClientRemoveOps.cpp                 |   4 +-
 .../testThinClientSecurityDH.cpp                |  10 +-
 .../testThinClientSecurityDH_MU.cpp             |  10 +-
 .../testThinClientSecurityMultiUserTest.cpp     |   6 +-
 .../testThinClientSecurityPostAuthorization.cpp |  10 +-
 .../testThinClientStatistics.cpp                |   2 +-
 src/cppcache/src/CacheFactory.cpp               |   4 +-
 src/cppcache/src/CacheImpl.hpp                  |   2 +-
 .../src/CacheTransactionManagerImpl.cpp         |  26 ++---
 src/cppcache/src/ClientProxyMembershipID.cpp    |   6 +-
 src/cppcache/src/Connector.hpp                  |   6 +-
 src/cppcache/src/CppCacheLibrary.cpp            |   2 +-
 src/cppcache/src/CqService.cpp                  |   4 +-
 src/cppcache/src/DistributedSystem.cpp          |  11 +-
 src/cppcache/src/DistributedSystemImpl.hpp      |   2 +-
 src/cppcache/src/ExceptionTypes.cpp             |   4 +-
 src/cppcache/src/ExecutionImpl.cpp              |   2 +-
 .../InternalCacheTransactionManager2PCImpl.cpp  |   4 +-
 src/cppcache/src/LocalRegion.cpp                |  12 +--
 src/cppcache/src/LocalRegion.hpp                |   2 +-
 src/cppcache/src/Log.cpp                        |  28 ++---
 src/cppcache/src/PdxInstanceImpl.hpp            |   2 +-
 src/cppcache/src/PdxType.cpp                    |  12 +--
 src/cppcache/src/PdxType.hpp                    |   6 +-
 src/cppcache/src/ProxyRegion.hpp                |  24 ++---
 .../src/PutAllPartialResultServerException.hpp  |   4 +-
 src/cppcache/src/RemoteQueryService.cpp         |   4 +-
 src/cppcache/src/SerializationRegistry.cpp      |   2 +-
 src/cppcache/src/StackFrame.hpp                 |   2 +-
 src/cppcache/src/SystemProperties.cpp           |   4 +-
 src/cppcache/src/TSSTXStateWrapper.cpp          |   2 +-
 src/cppcache/src/TSSTXStateWrapper.hpp          |   2 +-
 src/cppcache/src/TXCleaner.cpp                  |   2 +-
 src/cppcache/src/TXState.cpp                    |   2 +-
 src/cppcache/src/TcpConn.cpp                    |   6 +-
 src/cppcache/src/TcpSslConn.cpp                 |   4 +-
 src/cppcache/src/TcrConnection.cpp              |  58 +++++------
 src/cppcache/src/TcrConnection.hpp              |  12 +--
 src/cppcache/src/TcrEndpoint.cpp                |   8 +-
 src/cppcache/src/TcrMessage.cpp                 |   2 +-
 src/cppcache/src/ThinClientBaseDM.cpp           |   4 +-
 src/cppcache/src/ThinClientPoolDM.cpp           |  10 +-
 src/cppcache/src/ThinClientPoolDM.hpp           |   4 +-
 src/cppcache/src/ThinClientPoolStickyDM.cpp     |   2 +-
 .../src/ThinClientRedundancyManager.cpp         |   2 +-
 src/cppcache/src/ThinClientRegion.cpp           |  10 +-
 src/cppcache/src/ThinClientStickyManager.cpp    |  36 +++----
 src/cppcache/src/TransactionSuspender.cpp       |   4 +-
 src/cppcache/src/TssConnectionWrapper.cpp       |   2 +-
 src/cppcache/src/TssConnectionWrapper.hpp       |   2 +-
 src/cppcache/src/UserAttributes.cpp             |   6 +-
 src/cppcache/src/UserAttributes.hpp             |   2 +-
 src/cppcache/src/Version.cpp                    |   3 +-
 .../src/statistics/GeodeStatisticsFactory.cpp   |   3 +-
 .../src/statistics/GeodeStatisticsFactory.hpp   |   2 +-
 .../src/statistics/HostStatHelperSolaris.cpp    |   2 +-
 src/cppcache/src/statistics/HostStatSampler.cpp |   2 +-
 .../src/statistics/LinuxProcessStats.cpp        |   2 +-
 .../src/statistics/LinuxProcessStats.hpp        |   2 +-
 .../src/statistics/NullProcessStats.cpp         |   2 +-
 .../src/statistics/NullProcessStats.hpp         |   2 +-
 .../src/statistics/PoolStatsSampler.cpp         |   2 +-
 src/cppcache/src/statistics/ProcessStats.hpp    |   2 +-
 .../src/statistics/SolarisProcessStats.cpp      |   2 +-
 .../src/statistics/SolarisProcessStats.hpp      |   2 +-
 .../src/statistics/StatArchiveWriter.cpp        |   4 +-
 .../src/statistics/StatisticDescriptorImpl.cpp  |   2 +-
 .../src/statistics/StatisticDescriptorImpl.hpp  |   4 +-
 .../src/statistics/StatisticsManager.cpp        |   2 +-
 .../src/statistics/WindowsProcessStats.hpp      |   2 +-
 src/cppcache/test/CacheXmlParserTest.cpp        |   2 +-
 src/cryptoimpl/DHImpl.cpp                       |   2 +-
 src/dhimpl/DHImpl.cpp                           |   2 +-
 src/executables/GacInstall/AssemblyInfo.cs      |   6 +-
 src/executables/GacInstall/Program.cs           |   6 +-
 src/pdxautoserializer/CodeGenerator.hpp         |   2 +-
 src/quickstart/csharp/BasicOperations.cs        |  16 +--
 src/quickstart/csharp/CqQuery.cs                |  16 +--
 src/quickstart/csharp/DataExpiration.cs         |  16 +--
 src/quickstart/csharp/Delta.cs                  |  22 ++--
 src/quickstart/csharp/DistributedSystem.cs      |  16 +--
 src/quickstart/csharp/DurableClient.cs          |  24 ++---
 src/quickstart/csharp/Exceptions.cs             |  16 +--
 src/quickstart/csharp/ExecuteFunctions.cs       |  14 +--
 src/quickstart/csharp/HACache.cs                |  18 ++--
 src/quickstart/csharp/LoaderListenerWriter.cs   |  18 ++--
 src/quickstart/csharp/MultiuserSecurity.cs      |  16 +--
 src/quickstart/csharp/PdxInstance.cs            |  18 ++--
 src/quickstart/csharp/PdxRemoteQuery.cs         |  18 ++--
 src/quickstart/csharp/PdxSerializer.cs          |  18 ++--
 src/quickstart/csharp/PoolCqQuery.cs            |  16 +--
 src/quickstart/csharp/PoolRemoteQuery.cs        |  18 ++--
 src/quickstart/csharp/PoolWithEndpoints.cs      |  16 +--
 src/quickstart/csharp/PutAllGetAllOperations.cs |  16 +--
 src/quickstart/csharp/RefIDExample.cs           |  14 +--
 src/quickstart/csharp/RegisterInterest.cs       |  16 +--
 src/quickstart/csharp/RemoteQuery.cs            |  16 +--
 src/quickstart/csharp/Security.cs               |  14 +--
 src/quickstart/csharp/Transactions.cs           |  14 +--
 src/quickstart/csharp/TransactionsXA.cs         |  14 +--
 src/sqliteimpl/SqLiteImpl.cpp                   |   2 +-
 src/templates/security/csharp/AssemblyInfo.cs   |   6 +-
 src/tests/cli/NewFwkLib/CacheServer.cs          |   4 +-
 src/tests/cli/NewFwkLib/Utils.cs                |  12 +--
 .../cli/SecurityUtil/CredentialGeneratorN.cs    |   8 +-
 .../SecurityUtil/LdapCredentialGeneratorN.cs    |   2 +-
 .../SecurityUtil/PKCSCredentialGeneratorN.cs    |  14 +--
 .../XmlAuthzCredentialGeneratorN.cs             |   2 +-
 src/tests/cpp/security/CredentialGenerator.hpp  |   2 +-
 .../security/LdapUserCredentialGenerator.hpp    |   8 +-
 .../cpp/security/PkcsCredentialGenerator.hpp    |   8 +-
 .../security/XmlAuthzCredentialGenerator.hpp    |   4 +-
 195 files changed, 1046 insertions(+), 1038 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/integration-test/CacheHelperN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/CacheHelperN.cs b/src/clicache/integration-test/CacheHelperN.cs
index 5ca47bb..a268c2c 100644
--- a/src/clicache/integration-test/CacheHelperN.cs
+++ b/src/clicache/integration-test/CacheHelperN.cs
@@ -2389,7 +2389,7 @@ namespace Apache.Geode.Client.UnitTests
           string commandline = item["CommandLine"].ToString();
 
           Util.Log("processId:{0} name:{1}", item["ProcessId"], item["Name"]);
-          if (commandline.Contains("geode.jar"))
+          if (commandline.Contains("gemfire.jar"))
           {
             Util.Log("Killing geode process with id {0}", processId);
             Process proc = Process.GetProcessById(processId);

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/integration-test/SerializationTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/SerializationTestsN.cs b/src/clicache/integration-test/SerializationTestsN.cs
index 9a5dc2c..5b4268a 100644
--- a/src/clicache/integration-test/SerializationTestsN.cs
+++ b/src/clicache/integration-test/SerializationTestsN.cs
@@ -448,11 +448,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -476,11 +476,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -596,11 +596,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -624,11 +624,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -745,11 +745,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -773,11 +773,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -893,11 +893,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -921,11 +921,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -1042,11 +1042,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -1070,11 +1070,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -1191,11 +1191,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +
@@ -1219,11 +1219,11 @@ namespace Apache.Geode.Client.UnitTests
         case ExceptionType.None:
           break;
         case ExceptionType.Geode:
-          throw new GemFireIOException("Throwing an exception");
+          throw new GeodeIOException("Throwing an exception");
         case ExceptionType.System:
           throw new IOException("Throwing an exception");
         case ExceptionType.GeodeGeode:
-          throw new GemFireIOException("Throwing an exception with inner " +
+          throw new GeodeIOException("Throwing an exception with inner " +
             "exception", new CacheServerException("This is an inner exception"));
         case ExceptionType.GeodeSystem:
           throw new CacheServerException("Throwing an exception with inner " +

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
index 1f0d5e1..e2c5b50 100644
--- a/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
+++ b/src/clicache/integration-test/ThinClientAppDomainQueryTests.cs
@@ -228,7 +228,7 @@ namespace Apache.Geode.Client.UnitTests
           ErrorOccurred = true;
           qryIdx++;
         }
-        catch (GemFireException)
+        catch (GeodeException)
         {
           // ok, exception expected, do nothing.
           qryIdx++;

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/integration-test/ThinClientPoolTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientPoolTestsN.cs b/src/clicache/integration-test/ThinClientPoolTestsN.cs
index e8df8d6..e035086 100644
--- a/src/clicache/integration-test/ThinClientPoolTestsN.cs
+++ b/src/clicache/integration-test/ThinClientPoolTestsN.cs
@@ -298,7 +298,7 @@ namespace Apache.Geode.Client.UnitTests
             .Create();
         Assert.Fail("invalid_cache_pool.xml did not throw exception");
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Util.Log("Expected {0}: {1}", excp.GetType().Name, excp.Message);
       }
@@ -315,7 +315,7 @@ namespace Apache.Geode.Client.UnitTests
             .Create();
         Assert.Fail("invalid_cache_pool2.xml did not throw exception");
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Util.Log("Expected {0}: {1}", excp.GetType().Name, excp.Message);
       }
@@ -332,7 +332,7 @@ namespace Apache.Geode.Client.UnitTests
             .Create();
         Assert.Fail("invalid_cache_pool3.xml did not throw exception");
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Util.Log("Expected {0}: {1}", excp.GetType().Name, excp.Message);
       }
@@ -349,7 +349,7 @@ namespace Apache.Geode.Client.UnitTests
             .Create();
         Assert.Fail("invalid_cache_pool4.xml did not throw exception");
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Util.Log("Expected {0}: {1}", excp.GetType().Name, excp.Message);
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/integration-test/ThinClientQueryTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientQueryTestsN.cs b/src/clicache/integration-test/ThinClientQueryTestsN.cs
index 2693ebb..b87f89d 100644
--- a/src/clicache/integration-test/ThinClientQueryTestsN.cs
+++ b/src/clicache/integration-test/ThinClientQueryTestsN.cs
@@ -509,7 +509,7 @@ namespace Apache.Geode.Client.UnitTests
           ErrorOccurred = true;
           qryIdx++;
         }
-        catch (GemFireException)
+        catch (GeodeException)
         {
           // ok, exception expected, do nothing.
           qryIdx++;
@@ -578,7 +578,7 @@ namespace Apache.Geode.Client.UnitTests
           ErrorOccurred = true;
           qryIdx++;
         }
-        catch (GemFireException)
+        catch (GeodeException)
         {
           // ok, exception expected, do nothing.
           qryIdx++;
@@ -792,7 +792,7 @@ namespace Apache.Geode.Client.UnitTests
           ErrorOccurred = true;
           qryIdx++;
         }
-        catch (GemFireException)
+        catch (GeodeException)
         {
           // ok, exception expected, do nothing.
           qryIdx++;
@@ -862,7 +862,7 @@ namespace Apache.Geode.Client.UnitTests
           ErrorOccurred = true;
           qryIdx++;
         }
-        catch (GemFireException)
+        catch (GeodeException)
         {
           // ok, exception expected, do nothing.
           qryIdx++;
@@ -1023,7 +1023,7 @@ namespace Apache.Geode.Client.UnitTests
         Util.Log("Result size is {0}", results.Size);
         Assert.Fail("Didnt get expected timeout exception for first execute");
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Util.Log("First execute expected exception: {0}", excp.Message);
       }
@@ -1044,7 +1044,7 @@ namespace Apache.Geode.Client.UnitTests
         Util.Log("EXECUTE 2 STOP");
         Util.Log("Result size is {0}", results.Size);
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Assert.Fail("Second execute unwanted exception: {0}", excp.Message);
       }
@@ -1066,7 +1066,7 @@ namespace Apache.Geode.Client.UnitTests
         Util.Log("Result size is {0}", results.Size);
         Assert.Fail("Didnt get expected timeout exception for third execute");
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Util.Log("Third execute expected exception: {0}", excp.Message);
       }
@@ -1086,7 +1086,7 @@ namespace Apache.Geode.Client.UnitTests
         Util.Log("EXECUTE 4 STOP");
         Util.Log("Result size is {0}", results.Size);
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Assert.Fail("Fourth execute unwanted exception: {0}", excp.Message);
       }
@@ -1129,7 +1129,7 @@ namespace Apache.Geode.Client.UnitTests
         Util.Log("Result size is {0}", results.Size);
         Assert.Fail("Didnt get expected timeout exception for Fifth execute");
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Util.Log("Fifth execute expected exception: {0}", excp.Message);
       }
@@ -1170,7 +1170,7 @@ namespace Apache.Geode.Client.UnitTests
         Util.Log("EXECUTE 6 STOP");
         Util.Log("Result size is {0}", results.Size);
       }
-      catch (GemFireException excp)
+      catch (GeodeException excp)
       {
         Assert.Fail("Sixth execute unwanted exception: {0}", excp.Message);
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/integration-test/ThinClientRegionTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/ThinClientRegionTestsN.cs b/src/clicache/integration-test/ThinClientRegionTestsN.cs
index a358d34..0a0e620 100644
--- a/src/clicache/integration-test/ThinClientRegionTestsN.cs
+++ b/src/clicache/integration-test/ThinClientRegionTestsN.cs
@@ -397,7 +397,7 @@ namespace Apache.Geode.Client.UnitTests
             Assert.Fail("Expected an exception in Put");
           }
         }
-        catch (GemFireIOException ex)
+        catch (GeodeIOException ex)
         {
           if (exType == OtherType.ExceptionType.Geode)
           {

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/CacheListenerAdapter.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CacheListenerAdapter.hpp b/src/clicache/src/CacheListenerAdapter.hpp
index 9bbafca..146c6fd 100644
--- a/src/clicache/src/CacheListenerAdapter.hpp
+++ b/src/clicache/src/CacheListenerAdapter.hpp
@@ -73,7 +73,7 @@ namespace Apache
         virtual void Close(Apache::Geode::Client::IRegion<TKey, TValue>^ region)
         {
         }
-		virtual void AfterRegionDisconnected(Apache::Geode::Client::IRegion<TKey, TValue>^ region)
+		    virtual void AfterRegionDisconnected(Apache::Geode::Client::IRegion<TKey, TValue>^ region)
         {
         }
       };

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/ExceptionTypes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.cpp b/src/clicache/src/ExceptionTypes.cpp
index 805a62c..0d96457 100644
--- a/src/clicache/src/ExceptionTypes.cpp
+++ b/src/clicache/src/ExceptionTypes.cpp
@@ -31,7 +31,7 @@ namespace Apache
 #define _GF_MG_EXCEPTION_ADD3(x) { "apache::geode::client::" #x, gcnew CreateException2( x::Create ) }
 #define _GF_MG_EXCEPTION_ADD4(x,y) { "apache::geode::client::" #y, gcnew CreateException2( x::Create ) }
 
-      Dictionary<String^, CreateException2^>^ GemFireException::Init( )
+      Dictionary<String^, CreateException2^>^ GeodeException::Init( )
       {
         if (Native2ManagedExMap != nullptr)
         {
@@ -62,8 +62,8 @@ namespace Apache
           _GF_MG_EXCEPTION_ADD3( UnknownException ),
           _GF_MG_EXCEPTION_ADD3( ClassCastException ),
           _GF_MG_EXCEPTION_ADD3( EntryNotFoundException ),
-          _GF_MG_EXCEPTION_ADD4( GemFireIOException, GemfireIOException ),
-          _GF_MG_EXCEPTION_ADD4( GemFireConfigException, GemfireConfigException ),
+          _GF_MG_EXCEPTION_ADD4( GeodeIOException, GeodeIOException ),
+          _GF_MG_EXCEPTION_ADD4( GeodeConfigException, GeodeConfigException ),
           _GF_MG_EXCEPTION_ADD3( NullPointerException ),
           _GF_MG_EXCEPTION_ADD3( EntryExistsException ),
           _GF_MG_EXCEPTION_ADD3( NotConnectedException ),
@@ -110,12 +110,12 @@ namespace Apache
         return Native2ManagedExMap;
       }
 
-      System::Exception^ GemFireException::Get(const apache::geode::client::Exception& nativeEx)
+      System::Exception^ GeodeException::Get(const apache::geode::client::Exception& nativeEx)
       {
         Exception^ innerException = nullptr;
         const apache::geode::client::ExceptionPtr& cause = nativeEx.getCause();
         if (cause != NULLPTR) {
-          innerException = GemFireException::Get(*cause);
+          innerException = GeodeException::Get(*cause);
         }
         String^ exName = gcnew String( nativeEx.getName( ) );
         CreateException2^ exDelegate;
@@ -123,10 +123,10 @@ namespace Apache
           return exDelegate(nativeEx, innerException);
         }
         String^ exMsg = ManagedString::Get( nativeEx.getMessage( ) );
-        if ( exMsg->StartsWith( GemFireException::MgSysExPrefix ) ) {
+        if ( exMsg->StartsWith( GeodeException::MgSysExPrefix ) ) {
           // Get the exception type
           String^ mgExStr = exMsg->Substring(
-            GemFireException::MgSysExPrefix->Length );
+            GeodeException::MgSysExPrefix->Length );
           int32_t colonIndex = mgExStr->IndexOf( ':' );
           if ( colonIndex > 0 ) {
             String^ mgExName = mgExStr->Substring( 0, colonIndex )->Trim( );
@@ -147,11 +147,11 @@ namespace Apache
 
         }
         if (innerException == nullptr) {
-          return gcnew GemFireException(exName + ": " + exMsg,
-              gcnew GemFireException(GetStackTrace(nativeEx)));
+          return gcnew GeodeException(exName + ": " + exMsg,
+              gcnew GeodeException(GetStackTrace(nativeEx)));
         }
         else {
-          return gcnew GemFireException(exName + ": " + exMsg, innerException);
+          return gcnew GeodeException(exName + ": " + exMsg, innerException);
         }
       }
       } // end namespace generic

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/ExceptionTypes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/ExceptionTypes.hpp b/src/clicache/src/ExceptionTypes.hpp
index 8094619..c29bfef 100644
--- a/src/clicache/src/ExceptionTypes.hpp
+++ b/src/clicache/src/ExceptionTypes.hpp
@@ -33,24 +33,24 @@ namespace Apache
     namespace Client
     {
 
-      ref class GemFireException;
+      ref class GeodeException;
 
       /// <summary>
-      /// Factory delegate to create a managed GemFire exception.
+      /// Factory delegate to create a managed Geode exception.
       /// </summary>
       /// <remarks>
       /// For each managed exception class, its factory delegate is registered
       /// and maintained in a static dictionary mapped to its corresponding
-      /// native GemFire C++ exception name.
+      /// native Geode C++ exception name.
       /// </remarks>
-      delegate GemFireException^ CreateException2(
+      delegate GeodeException^ CreateException2(
         const apache::geode::client::Exception& nativeEx, System::Exception^ innerException);
 
       /// <summary>
-      /// The base exception class of all managed GemFire exceptions.
+      /// The base exception class of all managed Geode exceptions.
       /// </summary>
       [Serializable]
-      public ref class GemFireException
+      public ref class GeodeException
         : public System::Exception
       {
       private:
@@ -61,8 +61,8 @@ namespace Apache
         literal String^ MgSysExPrefix = "GFCLI_EXCEPTION:";
 
         /// <summary>
-        /// This contains a mapping of the native GemFire exception class
-        /// name to the factory delegate of the corresponding managed GemFire
+        /// This contains a mapping of the native Geode exception class
+        /// name to the factory delegate of the corresponding managed Geode
         /// exception class.
         /// </summary>
         static Dictionary<String^, CreateException2^>^ Native2ManagedExMap =
@@ -77,12 +77,12 @@ namespace Apache
         public:
 
           /// <summary>
-          /// The name of the native GemFire exception class.
+          /// The name of the native Geode exception class.
           /// </summary>
           String^ m_name;
 
           /// <summary>
-          /// The factory delegate of the managed GemFire exception class
+          /// The factory delegate of the managed Geode exception class
           /// corresponding to <c>m_name</c>
           /// </summary>
           CreateException2^ m_delegate;
@@ -101,29 +101,29 @@ namespace Apache
         static Dictionary<String^, CreateException2^>^ Init( );
 
         /// <summary>
-        /// Create the managed GemFire exception for a given native GemFire exception.
+        /// Create the managed Geode exception for a given native Geode exception.
         /// As a special case normal system exceptions are also created when the
         /// native exception is a wrapper of a managed system exception.
         /// </summary>
         /// <remarks>
-        /// Wherever the native GemFire C++ code raises a <c>apache::geode::client::Exception</c>,
+        /// Wherever the native Geode C++ code raises a <c>apache::geode::client::Exception</c>,
         /// the CLI wrapper code should have a catch-all for those and use
-        /// this function to create the corresponding managed GemFire exception.
-        /// If no managed GemFire exception has been defined (or has not been
+        /// this function to create the corresponding managed Geode exception.
+        /// If no managed Geode exception has been defined (or has not been
         /// added using _GF_MG_EXCEPTION_ADD3 in ExceptionTypesMN.cpp) then a
-        /// generic <c>GemFireException</c> exception is returned.
+        /// generic <c>GeodeException</c> exception is returned.
         /// </remarks>
-        /// <param name="nativeEx">The native GemFire exception object</param>
+        /// <param name="nativeEx">The native Geode exception object</param>
         /// <returns>
-        /// The managed GemFire exception object corresponding to the provided
-        /// native GemFire exception object.
+        /// The managed Geode exception object corresponding to the provided
+        /// native Geode exception object.
         /// </returns>
         static Exception^ Get(const apache::geode::client::Exception& nativeEx);
 
         /// <summary>
         /// Get the stack trace for the given native exception.
         /// </summary>
-        /// <param name="nativeEx">The native GemFire exception object</param>
+        /// <param name="nativeEx">The native Geode exception object</param>
         /// <returns>The stack trace of the native exception.</returns>
         inline static String^ GetStackTrace(
           const apache::geode::client::Exception& nativeEx )
@@ -141,8 +141,8 @@ namespace Apache
         /// <remarks>
         /// This method is to handle conversion of managed exceptions to
         /// C++ exception for those thrown by managed callbacks.
-        /// For non-Gemfire .NET exceptions we wrap it inside the generic
-        /// <c>GemfireException</c> with a special prefix in message.
+        /// For non-Geode .NET exceptions we wrap it inside the generic
+        /// <c>GeodeException</c> with a special prefix in message.
         /// While converting the exception back from C++ to .NET if the
         /// prefix is found in the message, then it tries to construct
         /// the original exception by reflection on the name of exception
@@ -152,14 +152,14 @@ namespace Apache
         inline static apache::geode::client::ExceptionPtr GetNative(Exception^ ex)
         {
           if (ex != nullptr) {
-            GemFireException^ gfEx = dynamic_cast<GemFireException^>(ex);
+            GeodeException^ gfEx = dynamic_cast<GeodeException^>(ex);
             if (gfEx != nullptr) {
               return gfEx->GetNative();
             }
             else {
               apache::geode::client::ExceptionPtr cause;
               if (ex->InnerException != nullptr) {
-                cause = GemFireException::GetNative(ex->InnerException);
+                cause = GeodeException::GetNative(ex->InnerException);
               }
               ManagedString mg_exStr(MgSysExPrefix + ex->ToString());
               return apache::geode::client::ExceptionPtr(new apache::geode::client::Exception(
@@ -171,7 +171,7 @@ namespace Apache
 
         /// <summary>
         /// Gets the C++ native exception object for this managed
-        /// <c>GemFireException</c>.
+        /// <c>GeodeException</c>.
         /// </summary>
         virtual apache::geode::client::ExceptionPtr GetNative()
         {
@@ -179,7 +179,7 @@ namespace Apache
           ManagedString mg_msg(msg);
           apache::geode::client::ExceptionPtr cause;
           if (this->InnerException != nullptr) {
-            cause = GemFireException::GetNative(this->InnerException);
+            cause = GeodeException::GetNative(this->InnerException);
           }
           return apache::geode::client::ExceptionPtr(new apache::geode::client::Exception(mg_msg.CharPtr,
               NULL, false, cause));
@@ -191,8 +191,8 @@ namespace Apache
         /// <remarks>
         /// This method is to handle conversion of managed exceptions to
         /// C++ exception for those thrown by managed callbacks.
-        /// For non-Gemfire .NET exceptions we wrap it inside the generic
-        /// <c>GemfireException</c> with a special prefix in message.
+        /// For non-Geode .NET exceptions we wrap it inside the generic
+        /// <c>GeodeException</c> with a special prefix in message.
         /// While converting the exception back from C++ to .NET if the
         /// prefix is found in the message, then it tries to construct
         /// the original exception by reflection on the name of exception
@@ -204,7 +204,7 @@ namespace Apache
           if (ex != nullptr) {
             apache::geode::client::ExceptionPtr cause;
             if (ex->InnerException != nullptr) {
-              cause = GemFireException::GetNative(ex->InnerException);
+              cause = GeodeException::GetNative(ex->InnerException);
             }
             ManagedString mg_exStr(MgSysExPrefix + ex->ToString());
             throw apache::geode::client::Exception(mg_exStr.CharPtr, NULL, false, cause);
@@ -213,7 +213,7 @@ namespace Apache
 
         /// <summary>
         /// Throws the C++ native exception object for this managed
-        /// <c>GemFireException</c>.
+        /// <c>GeodeException</c>.
         /// </summary>
         inline void ThrowNative()
         {
@@ -226,14 +226,14 @@ namespace Apache
         /// <summary>
         /// Default constructor.
         /// </summary>
-        inline GemFireException( )
+        inline GeodeException( )
           : Exception( ) { }
 
         /// <summary>
         /// Constructor to create an exception object with the given message.
         /// </summary>
         /// <param name="message">The exception message.</param>
-        inline GemFireException( String^ message )
+        inline GeodeException( String^ message )
           : Exception( message ) { }
 
         /// <summary>
@@ -242,13 +242,13 @@ namespace Apache
         /// </summary>
         /// <param name="message">The exception message.</param>
         /// <param name="innerException">The inner exception object.</param>
-        inline GemFireException( String^ message, System::Exception^ innerException )
+        inline GeodeException( String^ message, System::Exception^ innerException )
           : Exception( message, innerException ) { }
 
       protected:
 
         /// <summary>
-        /// Initializes a new instance of the <c>GemFireException</c> class with
+        /// Initializes a new instance of the <c>GeodeException</c> class with
         /// serialized data.
         /// This allows deserialization of this exception in .NET remoting.
         /// </summary>
@@ -260,18 +260,18 @@ namespace Apache
         /// contains contextual information about
         /// the source or destination
         /// </param>
-        inline GemFireException( SerializationInfo^ info, StreamingContext context )
+        inline GeodeException( SerializationInfo^ info, StreamingContext context )
           : Exception( info, context ) { }
       };
 
-/// Handle gemfire exceptions from native layer and convert to managed
+/// Handle geode exceptions from native layer and convert to managed
 /// exceptions.
 #define _GF_MG_EXCEPTION_TRY2        \
       try {
 #define _GF_MG_EXCEPTION_CATCH_ALL2  \
       } \
       catch (const apache::geode::client::Exception& ex) { \
-      throw Apache::Geode::Client::GemFireException::Get(ex); \
+      throw Apache::Geode::Client::GeodeException::Get(ex); \
       } \
       catch (System::AccessViolationException^ ex) { \
         throw ex; \
@@ -281,13 +281,13 @@ namespace Apache
 /// Creates a class <c>x</c> named for each exception <c>y</c>.
 #define _GF_MG_EXCEPTION_DEF4(x,y) \
       [Serializable] \
-      public ref class x: public GemFireException \
+      public ref class x: public GeodeException \
       { \
       public: \
       \
         /** <summary>Default constructor</summary> */ \
         x( ) \
-          : GemFireException( ) { } \
+          : GeodeException( ) { } \
         \
         /** <summary>
          *  Constructor to create an exception object with the given message.
@@ -295,7 +295,7 @@ namespace Apache
          *  <param name="message">The exception message.</param>
          */ \
         x( String^ message ) \
-          : GemFireException( message ) { } \
+          : GeodeException( message ) { } \
         \
         /** <summary>
          *  Constructor to create an exception object with the given message
@@ -305,7 +305,7 @@ namespace Apache
          *  <param name="innerException">The inner exception object.</param>
          */ \
         x( String^ message, System::Exception^ innerException ) \
-          : GemFireException( message, innerException ) { } \
+          : GeodeException( message, innerException ) { } \
         \
       protected: \
       \
@@ -321,19 +321,19 @@ namespace Apache
          *  </param>
          */ \
         x( SerializationInfo^ info, StreamingContext context ) \
-          : GemFireException( info, context ) { } \
+          : GeodeException( info, context ) { } \
       \
       internal: \
         x(const apache::geode::client::y& nativeEx) \
-          : GemFireException(ManagedString::Get(nativeEx.getMessage()), \
-              gcnew GemFireException(GemFireException::GetStackTrace( \
+          : GeodeException(ManagedString::Get(nativeEx.getMessage()), \
+              gcnew GeodeException(GeodeException::GetStackTrace( \
                 nativeEx))) { } \
         \
         x(const apache::geode::client::y& nativeEx, Exception^ innerException) \
-          : GemFireException(ManagedString::Get(nativeEx.getMessage()), \
+          : GeodeException(ManagedString::Get(nativeEx.getMessage()), \
               innerException) { } \
         \
-        static GemFireException^ Create(const apache::geode::client::Exception& ex, \
+        static GeodeException^ Create(const apache::geode::client::Exception& ex, \
             Exception^ innerException) \
         { \
           const apache::geode::client::y* nativeEx = dynamic_cast<const apache::geode::client::y*>( &ex ); \
@@ -353,7 +353,7 @@ namespace Apache
           ManagedString mg_msg(msg); \
           apache::geode::client::ExceptionPtr cause; \
           if (this->InnerException != nullptr) { \
-            cause = GemFireException::GetNative(this->InnerException); \
+            cause = GeodeException::GetNative(this->InnerException); \
           } \
           return apache::geode::client::ExceptionPtr(new apache::geode::client::y(mg_msg.CharPtr, \
               NULL, false, cause)); \
@@ -364,12 +364,12 @@ namespace Apache
 #define _GF_MG_EXCEPTION_DEF3(x) _GF_MG_EXCEPTION_DEF4(x,x)
 
 
-      // For all the native GemFire C++ exceptions, a corresponding definition
+      // For all the native Geode C++ exceptions, a corresponding definition
       // should be added below *AND* it should also be added to the static array
       // in ExceptionTypesMN.cpp using _GF_MG_EXCEPTION_ADD3( x )
 
       /// <summary>
-      /// A gemfire assertion exception.
+      /// A geode assertion exception.
       /// </summary>
       _GF_MG_EXCEPTION_DEF3( AssertionException );
 
@@ -494,12 +494,12 @@ namespace Apache
       /// <summary>
       /// Thrown when there is an input/output error.
       /// </summary>
-      _GF_MG_EXCEPTION_DEF4( GemFireIOException, GemfireIOException );
+      _GF_MG_EXCEPTION_DEF4( GeodeIOException, GeodeIOException );
 
       /// <summary>
-      /// Thrown when gemfire configuration file is incorrect.
+      /// Thrown when geode configuration file is incorrect.
       /// </summary>
-      _GF_MG_EXCEPTION_DEF4( GemFireConfigException, GemfireConfigException );
+      _GF_MG_EXCEPTION_DEF4( GeodeConfigException, GeodeConfigException );
 
       /// <summary>
       /// Thrown when a null argument is provided to a method
@@ -550,7 +550,7 @@ namespace Apache
       _GF_MG_EXCEPTION_DEF3( RegionCreationFailedException );
 
       /// <summary>
-      /// Thrown when there is a fatal internal exception in GemFire.
+      /// Thrown when there is a fatal internal exception in Geode.
       /// </summary>
       _GF_MG_EXCEPTION_DEF3( FatalInternalException );
 

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/GeodeClassIds.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/GeodeClassIds.hpp b/src/clicache/src/GeodeClassIds.hpp
index cd66d93..42cbdfb 100644
--- a/src/clicache/src/GeodeClassIds.hpp
+++ b/src/clicache/src/GeodeClassIds.hpp
@@ -329,7 +329,7 @@ namespace Apache
           literal Byte USERMAP = 94;
           literal Byte USERCOLLECTION = 95;
           literal Byte ARRAYOFBYTEARRAYS = 91;
-          literal Byte GEMFIREREGION =  98;
+          literal Byte GEODEREGION =  98;
 
           literal Byte BOOLEAN_TYPE = 17;
           literal Byte CHARACTER_TYPE = 18;

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/QueryService.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/QueryService.cpp b/src/clicache/src/QueryService.cpp
index 49978ff..38c7d6f 100644
--- a/src/clicache/src/QueryService.cpp
+++ b/src/clicache/src/QueryService.cpp
@@ -61,7 +61,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
 
@@ -78,7 +78,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
 
@@ -91,7 +91,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
 
@@ -112,7 +112,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
 
@@ -127,7 +127,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
 
@@ -140,7 +140,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
 
@@ -153,7 +153,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
 
@@ -166,7 +166,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
 
@@ -189,7 +189,7 @@ namespace Apache
         }
         catch (const apache::geode::client::Exception& ex)
         {
-          throw GemFireException::Get(ex);
+          throw GeodeException::Get(ex);
         }
       }
     }  // namespace Client

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/Region.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Region.cpp b/src/clicache/src/Region.cpp
index 5c50f8e..fcf3605 100644
--- a/src/clicache/src/Region.cpp
+++ b/src/clicache/src/Region.cpp
@@ -562,7 +562,7 @@ namespace Apache
             for (apache::geode::client::HashMapOfException::Iterator iter =
                   exceptionsPtr->begin(); iter != exceptionsPtr->end(); ++iter) {
               TKey key = Serializable::GetManagedValueGeneric<TKey>(iter.first());
-              System::Exception^ ex = GemFireException::Get(*iter.second());
+              System::Exception^ ex = GeodeException::Get(*iter.second());
               exceptions->Add(key, ex);
             }
           }
@@ -617,7 +617,7 @@ namespace Apache
             for (apache::geode::client::HashMapOfException::Iterator iter =
                   exceptionsPtr->begin(); iter != exceptionsPtr->end(); ++iter) {
               TKey key = Serializable::GetManagedValueGeneric<TKey>(iter.first());
-              System::Exception^ ex = GemFireException::Get(*iter.second());
+              System::Exception^ ex = GeodeException::Get(*iter.second());
               exceptions->Add(key, ex);
             }
           }

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/Serializable.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/Serializable.cpp b/src/clicache/src/Serializable.cpp
index 625309d..6ff74f0 100644
--- a/src/clicache/src/Serializable.cpp
+++ b/src/clicache/src/Serializable.cpp
@@ -591,7 +591,7 @@ namespace Apache
       {
         if (typeId < 0 || typeId > WrapperEndGeneric)
         {
-          throw gcnew GemFireException("The TypeID (" + typeId + ") being "
+          throw gcnew GeodeException("The TypeID (" + typeId + ") being "
                                        "registered is beyond acceptable range of 0-" + WrapperEndGeneric);
         }
         NativeWrappersGeneric[typeId] = wrapperMethod;

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/impl/ManagedAuthInitialize.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedAuthInitialize.cpp b/src/clicache/src/impl/ManagedAuthInitialize.cpp
index 7608cd8..39a1276 100644
--- a/src/clicache/src/impl/ManagedAuthInitialize.cpp
+++ b/src/clicache/src/impl/ManagedAuthInitialize.cpp
@@ -180,11 +180,11 @@ namespace apache
 
           return PropertiesPtr(m_managedptr->GetCredentials(mprops, mg_server)->NativePtr());
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return NULLPTR;
       }
@@ -194,11 +194,11 @@ namespace apache
         try {
           m_managedptr->Close();
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/impl/ManagedCacheListener.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheListener.cpp b/src/clicache/src/impl/ManagedCacheListener.cpp
index d95a25d..81bb8e6 100644
--- a/src/clicache/src/impl/ManagedCacheListener.cpp
+++ b/src/clicache/src/impl/ManagedCacheListener.cpp
@@ -222,11 +222,11 @@ namespace apache
           Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev);
           m_managedptr->AfterCreate(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -236,11 +236,11 @@ namespace apache
           Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev);
           m_managedptr->AfterUpdate(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -250,11 +250,11 @@ namespace apache
           Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev);
           m_managedptr->AfterInvalidate(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -264,11 +264,11 @@ namespace apache
           Apache::Geode::Client::EntryEvent<Object^, Object^> mevent(&ev);
           m_managedptr->AfterDestroy(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
       void ManagedCacheListenerGeneric::afterRegionClear(const apache::geode::client::RegionEvent& ev)
@@ -277,11 +277,11 @@ namespace apache
           Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev);
           m_managedptr->AfterRegionClear(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -291,11 +291,11 @@ namespace apache
           Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev);
           m_managedptr->AfterRegionInvalidate(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -305,11 +305,11 @@ namespace apache
           Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev);
           m_managedptr->AfterRegionDestroy(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -319,11 +319,11 @@ namespace apache
           Apache::Geode::Client::RegionEvent<Object^, Object^> mevent(&ev);
           m_managedptr->AfterRegionLive(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -335,11 +335,11 @@ namespace apache
 
           m_managedptr->Close(mregion);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
       void ManagedCacheListenerGeneric::afterRegionDisconnected(const apache::geode::client::RegionPtr& region)
@@ -349,11 +349,11 @@ namespace apache
             Apache::Geode::Client::Region<Object^, Object^>::Create(region.ptr());
           m_managedptr->AfterRegionDisconnected(mregion);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/impl/ManagedCacheLoader.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheLoader.cpp b/src/clicache/src/impl/ManagedCacheLoader.cpp
index e0ed72f..c6ec07e 100644
--- a/src/clicache/src/impl/ManagedCacheLoader.cpp
+++ b/src/clicache/src/impl/ManagedCacheLoader.cpp
@@ -233,11 +233,11 @@ namespace apache
           */
           return m_managedptr->load(region, key, aCallbackArgument);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return NULLPTR;
       }
@@ -252,11 +252,11 @@ namespace apache
 
           m_managedptr->close(region);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/impl/ManagedCacheWriter.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheWriter.cpp b/src/clicache/src/impl/ManagedCacheWriter.cpp
index 6cb2d07..f025147 100644
--- a/src/clicache/src/impl/ManagedCacheWriter.cpp
+++ b/src/clicache/src/impl/ManagedCacheWriter.cpp
@@ -222,11 +222,11 @@ namespace apache
 
           return m_managedptr->BeforeUpdate(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
       }
@@ -238,11 +238,11 @@ namespace apache
 
           return m_managedptr->BeforeCreate(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
       }
@@ -254,11 +254,11 @@ namespace apache
 
           return m_managedptr->BeforeDestroy(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
       }
@@ -269,11 +269,11 @@ namespace apache
 
           return m_managedptr->BeforeRegionClear(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
       }
@@ -285,11 +285,11 @@ namespace apache
 
           return m_managedptr->BeforeRegionDestroy(%mevent);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
       }
@@ -302,11 +302,11 @@ namespace apache
 
           m_managedptr->Close(reinterpret_cast<Apache::Geode::Client::Region<Object^, Object^>^>(mregion));
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/impl/ManagedCacheableDelta.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDelta.cpp b/src/clicache/src/impl/ManagedCacheableDelta.cpp
index e15ae26..6d0c7b2 100644
--- a/src/clicache/src/impl/ManagedCacheableDelta.cpp
+++ b/src/clicache/src/impl/ManagedCacheableDelta.cpp
@@ -45,11 +45,11 @@ namespace apache
           ManagedCacheableDeltaGeneric* tmp = const_cast<ManagedCacheableDeltaGeneric*>(this);
           tmp->m_objectSize = (int)(output.getBufferLength() - pos);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -69,11 +69,11 @@ namespace apache
             m_hashcode = m_managedptr->GetHashCode();
 
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return this;
       }
@@ -87,11 +87,11 @@ namespace apache
           else
             return m_objectSize;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }
@@ -102,11 +102,11 @@ namespace apache
         try {
           classId = m_managedSerializableptr->ClassId;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return (classId >= 0x80000000 ? 0 : classId);
       }
@@ -128,11 +128,11 @@ namespace apache
             return (int8_t)GeodeTypeIdsImpl::CacheableUserData4;
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }
@@ -165,11 +165,11 @@ namespace apache
           //this will move the cursor in c++ layer
           mg_output.WriteBytesToUMDataOutput();
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -184,11 +184,11 @@ namespace apache
 
           m_hashcode = m_managedptr->GetHashCode();
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -207,11 +207,11 @@ namespace apache
             return Delta::clone();
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return NULLPTR;
       }
@@ -228,11 +228,11 @@ namespace apache
           }
           return false;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
       }
@@ -242,11 +242,11 @@ namespace apache
         try {
           return m_managedptr->Equals(other.ptr());
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
 
@@ -267,11 +267,11 @@ namespace apache
             return snprintf(buffer, maxLength, "%s", mg_str.CharPtr);
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
index d356521..9ed604f 100644
--- a/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
+++ b/src/clicache/src/impl/ManagedCacheableDeltaBytes.cpp
@@ -40,11 +40,11 @@ namespace apache
         try {
           output.writeBytesOnly(m_bytes, m_size);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -69,11 +69,11 @@ namespace apache
           Apache::Geode::Client::Log::Debug("ManagedCacheableDeltaBytes::fromData: objectSize = " + m_size + " m_hashCode = " + m_hashCode);
           m_bytes = input.getBufferCopyFrom(objStartPos, m_size);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return this;
       }
@@ -83,11 +83,11 @@ namespace apache
         try {
           return m_size;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }
@@ -98,11 +98,11 @@ namespace apache
         try {
           classId = m_classId;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return (classId >= 0x80000000 ? 0 : classId);
       }
@@ -124,11 +124,11 @@ namespace apache
             return (int8_t)GeodeTypeIdsImpl::CacheableUserData4;
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }
@@ -164,11 +164,11 @@ namespace apache
           deltaObj->ToDelta(%mg_output);
           mg_output.WriteBytesToUMDataOutput();
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -201,11 +201,11 @@ namespace apache
             m_hashCode = managedptr->GetHashCode();
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -224,11 +224,11 @@ namespace apache
             return Delta::clone();
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return NULLPTR;
       }
@@ -269,11 +269,11 @@ namespace apache
             return ret;
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         Apache::Geode::Client::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal returns false");
         return false;
@@ -293,11 +293,11 @@ namespace apache
           return ret;
           //return obj->Equals(other.ptr());
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         Apache::Geode::Client::Log::Debug("ManagedCacheableDeltaBytesGeneric::equal return false");
         return false;
@@ -322,11 +322,11 @@ namespace apache
             }
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/impl/ManagedCacheableKey.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKey.cpp b/src/clicache/src/impl/ManagedCacheableKey.cpp
index 8661bb7..03aa357 100644
--- a/src/clicache/src/impl/ManagedCacheableKey.cpp
+++ b/src/clicache/src/impl/ManagedCacheableKey.cpp
@@ -47,11 +47,11 @@ namespace apache
           ManagedCacheableKeyGeneric* tmp = const_cast<ManagedCacheableKeyGeneric*>(this);
           tmp->m_objectSize = (int)(output.getBufferLength() - pos);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -71,11 +71,11 @@ namespace apache
 
 
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return this;
       }
@@ -89,11 +89,11 @@ namespace apache
           else
             return m_objectSize;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }
@@ -105,11 +105,11 @@ namespace apache
         try {
         classId = m_managedptr->ClassId;
         }
-        catch (GemFireException^ ex) {
+        catch (GeodeException^ ex) {
         ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-        GemFireException::ThrowNative(ex);
+        GeodeException::ThrowNative(ex);
         }*/
         return (m_classId >= 0x80000000 ? 0 : m_classId);
       }
@@ -154,11 +154,11 @@ namespace apache
             m_managedptr->ToString(), cStr);
           return cStr;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return NULLPTR;
       }
@@ -177,11 +177,11 @@ namespace apache
           }
           return false;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
       }
@@ -193,11 +193,11 @@ namespace apache
             (Apache::Geode::Client::IGFSerializable^)(Apache::Geode::Client::IGFSerializable^)m_managedptr)->Equals(
             static_cast<Apache::Geode::Client::ICacheableKey^>(other.ptr()));
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return false;
       }
@@ -214,11 +214,11 @@ namespace apache
                              ->GetHashCode();
           return m_hashcode;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }
@@ -233,11 +233,11 @@ namespace apache
             return snprintf(buffer, maxLength, "%s", mg_str.CharPtr);
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }

http://git-wip-us.apache.org/repos/asf/geode/blob/04c53479/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
index ec792db..f03b9a7 100644
--- a/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
+++ b/src/clicache/src/impl/ManagedCacheableKeyBytes.cpp
@@ -41,11 +41,11 @@ namespace apache
           //TODO: I think this should work as it is
           output.writeBytesOnly(m_bytes, m_size);
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
       }
 
@@ -72,11 +72,11 @@ namespace apache
           m_bytes = input.getBufferCopyFrom(objStartPos, m_size);
 
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return this;
       }
@@ -87,11 +87,11 @@ namespace apache
           //return m_managedptr->ObjectSize;
           return m_size;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }
@@ -103,11 +103,11 @@ namespace apache
           //classId = m_managedptr->ClassId;
           classId = m_classId;
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return (classId >= 0x80000000 ? 0 : classId);
       }
@@ -130,11 +130,11 @@ namespace apache
             return (int8_t)apache::geode::client::GeodeTypeIdsImpl::CacheableUserData4;
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }
@@ -167,11 +167,11 @@ namespace apache
             return cStr;
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return NULLPTR;
       }
@@ -195,11 +195,11 @@ namespace apache
             return ret;
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         Apache::Geode::Client::Log::Debug("ManagedCacheableKeyBytesGeneric::equal returns false");
         return false;
@@ -219,11 +219,11 @@ namespace apache
           return ret;
           //return obj->Equals(other.ptr());
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         Apache::Geode::Client::Log::Debug("ManagedCacheableKeyBytesGeneric::equal return false");
         return false;
@@ -248,11 +248,11 @@ namespace apache
             }
           }
         }
-        catch (Apache::Geode::Client::GemFireException^ ex) {
+        catch (Apache::Geode::Client::GeodeException^ ex) {
           ex->ThrowNative();
         }
         catch (System::Exception^ ex) {
-          Apache::Geode::Client::GemFireException::ThrowNative(ex);
+          Apache::Geode::Client::GeodeException::ThrowNative(ex);
         }
         return 0;
       }


Mime
View raw message