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
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 @@
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);
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 " +
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 @@
ErrorOccurred = true;
qryIdx++;
}
- catch (GemFireException)
+ catch (GeodeException)
{
// ok, exception expected, do nothing.
qryIdx++;
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 @@
.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 @@
.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 @@
.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 @@
.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);
}
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 @@
ErrorOccurred = true;
qryIdx++;
}
- catch (GemFireException)
+ catch (GeodeException)
{
// ok, exception expected, do nothing.
qryIdx++;
@@ -578,7 +578,7 @@
ErrorOccurred = true;
qryIdx++;
}
- catch (GemFireException)
+ catch (GeodeException)
{
// ok, exception expected, do nothing.
qryIdx++;
@@ -792,7 +792,7 @@
ErrorOccurred = true;
qryIdx++;
}
- catch (GemFireException)
+ catch (GeodeException)
{
// ok, exception expected, do nothing.
qryIdx++;
@@ -862,7 +862,7 @@
ErrorOccurred = true;
qryIdx++;
}
- catch (GemFireException)
+ catch (GeodeException)
{
// ok, exception expected, do nothing.
qryIdx++;
@@ -1023,7 +1023,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
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 @@
Assert.Fail("Expected an exception in Put");
}
}
- catch (GemFireIOException ex)
+ catch (GeodeIOException ex)
{
if (exType == OtherType.ExceptionType.Geode)
{
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 @@
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)
{
}
};
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 @@
#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 @@
_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 @@
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 @@
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 @@
}
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
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 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 @@
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 @@
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 @@
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 @@
/// <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 @@
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 @@
/// <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 @@
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 @@
/// <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 @@
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 @@
/// <summary>
/// Throws the C++ native exception object for this managed
- /// <c>GemFireException</c>.
+ /// <c>GeodeException</c>.
/// </summary>
inline void ThrowNative()
{
@@ -226,14 +226,14 @@
/// <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 @@
/// </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 @@
/// 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 @@
/// 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 @@
* <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 @@
* <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 @@
* </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 @@
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 @@
#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 @@
/// <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 @@
_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 );
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 @@
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;
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 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
@@ -78,7 +78,7 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
@@ -91,7 +91,7 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
@@ -112,7 +112,7 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
@@ -127,7 +127,7 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
@@ -140,7 +140,7 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
@@ -153,7 +153,7 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
@@ -166,7 +166,7 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
@@ -189,7 +189,7 @@
}
catch (const apache::geode::client::Exception& ex)
{
- throw GemFireException::Get(ex);
+ throw GeodeException::Get(ex);
}
}
} // namespace Client
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 @@
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 @@
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);
}
}
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 @@
{
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;
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 @@
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 @@
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);
}
}
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
}
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 @@
*/
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 @@
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);
}
}
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
}
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
//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 @@
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 @@
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 @@
}
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 @@
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 @@
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;
}
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
}
}
- 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;
}
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 @@
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 @@
}
- 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 @@
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 @@
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 @@
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 @@
}
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 @@
(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 @@
->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 @@
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;
}
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 @@
//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 @@
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 @@
//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 @@
//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 @@
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 @@
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 @@
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 @@
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 @@
}
}
}
- 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;
}
diff --git a/src/clicache/src/impl/ManagedCqListener.cpp b/src/clicache/src/impl/ManagedCqListener.cpp
index 6cb9603..1d07294 100644
--- a/src/clicache/src/impl/ManagedCqListener.cpp
+++ b/src/clicache/src/impl/ManagedCqListener.cpp
@@ -148,7 +148,7 @@
Apache::Geode::Client::CqEvent<Object^, Object^> mevent(&ev);
m_managedptr->OnEvent(%mevent);
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
@@ -171,7 +171,7 @@
try {
m_managedptr->Close();
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
diff --git a/src/clicache/src/impl/ManagedCqStatusListener.cpp b/src/clicache/src/impl/ManagedCqStatusListener.cpp
index 9524de9..26fc920 100644
--- a/src/clicache/src/impl/ManagedCqStatusListener.cpp
+++ b/src/clicache/src/impl/ManagedCqStatusListener.cpp
@@ -146,7 +146,7 @@
Apache::Geode::Client::CqEvent<Object^, Object^> mevent(&ev);
m_managedptr->OnEvent(%mevent);
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
@@ -169,7 +169,7 @@
try {
m_managedptr->Close();
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
@@ -186,7 +186,7 @@
try {
m_managedptr->OnCqDisconnected();
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
@@ -203,7 +203,7 @@
try {
m_managedptr->OnCqConnected();
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
diff --git a/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp b/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
index 936e354..d0bf46c 100644
--- a/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
+++ b/src/clicache/src/impl/ManagedFixedPartitionResolver.cpp
@@ -219,11 +219,11 @@
try {
return m_managedptr->getRoutingObject(key);
}
- 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;
}
@@ -233,11 +233,11 @@
try {
return m_managedptr->getName();
}
- 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 NULL;
}
@@ -247,11 +247,11 @@
try {
return m_managedptr->getPartitionName(opDetails);
}
- 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 NULL;
}
diff --git a/src/clicache/src/impl/ManagedPartitionResolver.cpp b/src/clicache/src/impl/ManagedPartitionResolver.cpp
index 921db75..f32005d 100644
--- a/src/clicache/src/impl/ManagedPartitionResolver.cpp
+++ b/src/clicache/src/impl/ManagedPartitionResolver.cpp
@@ -223,11 +223,11 @@
try {
return m_managedptr->getRoutingObject(key);
}
- 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;
}
@@ -237,11 +237,11 @@
try {
return m_managedptr->getName();
}
- 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 NULL;
}
diff --git a/src/clicache/src/impl/ManagedResultCollector.cpp b/src/clicache/src/impl/ManagedResultCollector.cpp
index 27f50fb..84921ff 100644
--- a/src/clicache/src/impl/ManagedResultCollector.cpp
+++ b/src/clicache/src/impl/ManagedResultCollector.cpp
@@ -154,7 +154,7 @@
m_managedptr->AddResult(rs);
//m_managedptr->AddResult( SafeUMSerializableConvert( result.ptr( ) ) );
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
@@ -180,7 +180,7 @@
//return rsptr;
throw apache::geode::client::IllegalStateException("This should not be get callled.");
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
@@ -197,7 +197,7 @@
try {
m_managedptr->EndResults();
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
@@ -213,7 +213,7 @@
try {
m_managedptr->ClearResults(/*false*/);
}
- catch (Apache::Geode::Client::GemFireException^ ex) {
+ catch (Apache::Geode::Client::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
diff --git a/src/clicache/src/impl/ManagedTransactionListener.cpp b/src/clicache/src/impl/ManagedTransactionListener.cpp
index 857ba7b..5763b37 100644
--- a/src/clicache/src/impl/ManagedTransactionListener.cpp
+++ b/src/clicache/src/impl/ManagedTransactionListener.cpp
@@ -209,11 +209,11 @@
Apache::Geode::Client::Log::Error("ManagedTransactionListenerGeneric::afterCommit in");
}
- 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 ManagedTransactionListenerGeneric::afterFailedCommit(apache::geode::client::TransactionEventPtr& te)
@@ -222,11 +222,11 @@
Apache::Geode::Client::TransactionEvent mevent(te.ptr());
m_managedptr->AfterFailedCommit(%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 ManagedTransactionListenerGeneric::afterRollback(apache::geode::client::TransactionEventPtr& te)
@@ -235,11 +235,11 @@
Apache::Geode::Client::TransactionEvent mevent(te.ptr());
m_managedptr->AfterRollback(%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 ManagedTransactionListenerGeneric::close()
@@ -247,11 +247,11 @@
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);
}
}
diff --git a/src/clicache/src/impl/ManagedTransactionWriter.cpp b/src/clicache/src/impl/ManagedTransactionWriter.cpp
index 19bdf8d..a28bced 100644
--- a/src/clicache/src/impl/ManagedTransactionWriter.cpp
+++ b/src/clicache/src/impl/ManagedTransactionWriter.cpp
@@ -207,11 +207,11 @@
Apache::Geode::Client::TransactionEvent mevent(te.ptr());
m_managedptr->BeforeCommit(%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);
}
}
diff --git a/src/clicache/src/impl/ManagedVisitor.cpp b/src/clicache/src/impl/ManagedVisitor.cpp
index c67cf1e..2d73c63 100644
--- a/src/clicache/src/impl/ManagedVisitor.cpp
+++ b/src/clicache/src/impl/ManagedVisitor.cpp
@@ -39,11 +39,11 @@
m_visitor->Invoke(mg_key, (Apache::Geode::Client::IGFSerializable^)mg_value);
}
- catch (GemFireException^ ex) {
+ catch (GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
- GemFireException::ThrowNative(ex);
+ GeodeException::ThrowNative(ex);
}
}
diff --git a/src/clicache/src/impl/PdxManagedCacheableKey.cpp b/src/clicache/src/impl/PdxManagedCacheableKey.cpp
index 0512b89..70fbb1f 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKey.cpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKey.cpp
@@ -46,11 +46,11 @@
PdxManagedCacheableKey* tmp = const_cast<PdxManagedCacheableKey*>(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 @@
m_objectSize = input.getBytesRead() - pos;
// 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;
}
@@ -83,11 +83,11 @@
try {
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;
}
@@ -98,11 +98,11 @@
try {
classId = m_managedptr->ClassId;
}
- catch (Com::Vmware::Cache::GemFireException^ ex) {
+ catch (Com::Vmware::Cache::GeodeException^ ex) {
ex->ThrowNative();
}
catch (System::Exception^ ex) {
- Apache::Geode::Client::GemFireException::ThrowNative(ex);
+ Apache::Geode::Client::GeodeException::ThrowNative(ex);
}*/
//return (m_classId >= 0x80000000 ? 0 : m_classId);
return 0;
@@ -147,11 +147,11 @@
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;
}
@@ -168,11 +168,11 @@
}
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;
}
@@ -182,11 +182,11 @@
try {
return ((Apache::Geode::Client::IPdxSerializable^)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;
}
@@ -202,11 +202,11 @@
->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;
}
@@ -221,11 +221,11 @@
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;
}
@@ -247,11 +247,11 @@
//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);
}
}
@@ -266,11 +266,11 @@
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);
}
}
@@ -289,11 +289,11 @@
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;
}
diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
index 112d92d..cfa6977 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.cpp
@@ -41,11 +41,11 @@
//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);
}
}
@@ -74,11 +74,11 @@
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;
}
@@ -89,11 +89,11 @@
//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;
}
@@ -105,11 +105,11 @@
// //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);
return 0;
@@ -133,11 +133,11 @@
// 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 (int8_t)GeodeTypeIdsImpl::PDX;
}
@@ -170,11 +170,11 @@
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;
}
@@ -199,11 +199,11 @@
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("PdxManagedCacheableKeyBytes::equal returns false");
return false;
@@ -224,11 +224,11 @@
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("PdxManagedCacheableKeyBytes::equal return false");
return false;
@@ -253,11 +253,11 @@
}
}
}
- 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;
}
@@ -295,11 +295,11 @@
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);
}
}
@@ -335,11 +335,11 @@
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);
}
}
@@ -358,11 +358,11 @@
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;
}
diff --git a/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs b/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
index ef971cb..1b9d9d7 100644
--- a/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
+++ b/src/com/gemstone/gemfire/plugins/sqlite/SqLiteImpl.cs
@@ -154,7 +154,7 @@
public static readonly string PersistenceDir = "PersistenceDirectory";
public static readonly string MaxPageCount = "max_page_count";
public static readonly string PageSize = "page_size";
- public static readonly string DefaultPersistenceDir = "GemFireRegionData";
+ public static readonly string DefaultPersistenceDir = "GeodeRegionData";
public static readonly string DefaultMaxPageCount = "2147483646";
public static readonly string DefaultPageSize = "65536";
#endregion
diff --git a/src/cppcache/include/gfcpp/Cache.hpp b/src/cppcache/include/gfcpp/Cache.hpp
index 697750c..00ed79d 100644
--- a/src/cppcache/include/gfcpp/Cache.hpp
+++ b/src/cppcache/include/gfcpp/Cache.hpp
@@ -21,7 +21,7 @@
*/
#include "gfcpp_globals.hpp"
#include "gf_types.hpp"
-#include "GemFireCache.hpp"
+#include "GeodeCache.hpp"
#include "gf_types.hpp"
#include "Region.hpp"
#include "DistributedSystem.hpp"
@@ -56,7 +56,7 @@
* <p>A cache can have multiple root regions, each with a different name.
*
*/
-class CPPCACHE_EXPORT Cache : public GemFireCache {
+class CPPCACHE_EXPORT Cache : public GeodeCache {
/**
* @brief public methods
*/
diff --git a/src/cppcache/include/gfcpp/CacheFactory.hpp b/src/cppcache/include/gfcpp/CacheFactory.hpp
index 59d4c1c..471692a 100644
--- a/src/cppcache/include/gfcpp/CacheFactory.hpp
+++ b/src/cppcache/include/gfcpp/CacheFactory.hpp
@@ -30,7 +30,7 @@
* @file
*/
-#define DEFAULT_POOL_NAME "default_gemfireClientPool"
+#define DEFAULT_POOL_NAME "default_geodeClientPool"
namespace apache {
namespace geode {
@@ -39,7 +39,7 @@
class CppCacheLibrary;
/**
* @class CacheFactory CacheFactory.hpp
- * Top level class for configuring and using GemFire on a client.This should be
+ * Top level class for configuring and using Geode on a client.This should be
*called once to create {@link Cache}.
*<p>
* For the default values for the pool attributes see {@link PoolFactory}.
@@ -93,7 +93,7 @@
static CachePtr getAnyInstance();
/** Returns the version of the cache implementation.
- * For the 1.0 release of GemFire, the string returned is <code>1.0</code>.
+ * For the 1.0 release of Geode, the string returned is <code>1.0</code>.
* @return the version of the cache implementation as a <code>String</code>
*/
static const char* getVersion();
@@ -450,9 +450,9 @@
CacheFactoryPtr setPdxReadSerialized(bool pdxReadSerialized);
/**
- * Sets a gemfire property that will be used when creating the {link @Cache}.
- * @param name the name of the gemfire property
- * @param value the value of the gemfire property
+ * Sets a geode property that will be used when creating the {link @Cache}.
+ * @param name the name of the geode property
+ * @param value the value of the geode property
* @return a reference to <code>this</code>
* @since 3.5
*/
diff --git a/src/cppcache/include/gfcpp/CacheListener.hpp b/src/cppcache/include/gfcpp/CacheListener.hpp
index 95ebf28..dc76022 100644
--- a/src/cppcache/include/gfcpp/CacheListener.hpp
+++ b/src/cppcache/include/gfcpp/CacheListener.hpp
@@ -45,7 +45,7 @@
* of <code>CacheListener</code> methods. If event A occurs before event B,
* there is no guarantee that their corresponding <code>CacheListener</code>
* method invocations will occur in the same order. Any exceptions thrown by
- * the listener are caught by GemFire and logged. If the exception is due to
+ * the listener are caught by Geode and logged. If the exception is due to
* listener invocation on the same thread where a region operation has been
* performed, then a <code>CacheListenerException</code> is thrown back to
* the application. If the exception is for a notification received from
@@ -55,7 +55,7 @@
* There are two cases in which listeners are invoked. The first is when a
* region modification operation (e.g. put, create, destroy, invalidate)
* is performed. For this case it is important to ensure that minimal work is
- * done in the listener before returning control back to Gemfire since the
+ * done in the listener before returning control back to Geode since the
* operation will block till the listener has not completed. For example,
* a listener implementation may choose to hand off the event to a thread pool
* that then processes the event on its thread rather than the listener thread.
diff --git a/src/cppcache/include/gfcpp/CacheTransactionManager.hpp b/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
index 6ffe9e9..10b84d4 100644
--- a/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
+++ b/src/cppcache/include/gfcpp/CacheTransactionManager.hpp
@@ -69,7 +69,7 @@
* node. This can only happen if rebalancing/recovery happens during a
* transaction that involves a PartitionedRegion.
*
- * @throws TransactionInDoubtException when GemFire cannot tell which nodes
+ * @throws TransactionInDoubtException when Geode cannot tell which nodes
* have applied the transaction and which have not. This only occurs if nodes
* fail mid-commit, and only then in very rare circumstances.
*/
diff --git a/src/cppcache/include/gfcpp/CacheWriter.hpp b/src/cppcache/include/gfcpp/CacheWriter.hpp
index 0a1a615..fc5e430 100644
--- a/src/cppcache/include/gfcpp/CacheWriter.hpp
+++ b/src/cppcache/include/gfcpp/CacheWriter.hpp
@@ -65,13 +65,13 @@
* application-specific behavior before the cache is modified.
*
* <p>Before the region is updated via a put, create, or destroy operation,
- * GemFire will call a <code>CacheWriter</code> that is installed anywhere in
+ * Geode will call a <code>CacheWriter</code> that is installed anywhere in
* any
* participating cache for that region, preferring a local
* <code>CacheWriter</code>
* if there is one. Usually there will be only one <code>CacheWriter</code> in
* the distributed system. If there are multiple <code>CacheWriter</code>s
- * available in the distributed system, the GemFire
+ * available in the distributed system, the Geode
* implementation always prefers one that is stored locally, or else picks one
* arbitrarily. In any case, only one <code>CacheWriter</code> will be invoked.
*
diff --git a/src/cppcache/include/gfcpp/CacheableBuiltins.hpp b/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
index d37ce48..d3dd75c 100644
--- a/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
+++ b/src/cppcache/include/gfcpp/CacheableBuiltins.hpp
@@ -447,12 +447,26 @@
return (value != NULL ? c##Ptr(new c(value, length, true)) : NULLPTR); \
} \
/** \ \
+ * \ \
+ * \ \ \
* Create a cacheable array taking ownership of the given array \ \
+ * \ \
+ * \ \ \
* without creating a copy. \ \
+ * \ \
+ * \ \ \
* \ \
+ * \ \
+ * \ \ \
* Note that the application has to ensure that the given array is \ \
+ * \ \
+ * \ \ \
* not deleted (apart from this class) and is allocated on the heap \ \
+ * \ \
+ * \ \ \
* using the "new" operator. \ \
+ * \ \
+ * \ \ \
*/ \
inline static c##Ptr createNoCopy(p* value, int32_t length) { \
return (value != NULL ? c##Ptr(new c(value, length)) : NULLPTR); \
diff --git a/src/cppcache/include/gfcpp/CqOperation.hpp b/src/cppcache/include/gfcpp/CqOperation.hpp
index b1b4a9a..b1976f2 100644
--- a/src/cppcache/include/gfcpp/CqOperation.hpp
+++ b/src/cppcache/include/gfcpp/CqOperation.hpp
@@ -36,7 +36,7 @@
class CPPCACHE_EXPORT CqOperation {
// public static methods
public:
- // types of operation CORESPONDING TO THE ONES in gemfire.cache.Operation
+ // types of operation CORESPONDING TO THE ONES in geode.cache.Operation
typedef enum {
OP_TYPE_INVALID = -1,
diff --git a/src/cppcache/include/gfcpp/CqState.hpp b/src/cppcache/include/gfcpp/CqState.hpp
index d7dafcd..ed79b83 100644
--- a/src/cppcache/include/gfcpp/CqState.hpp
+++ b/src/cppcache/include/gfcpp/CqState.hpp
@@ -39,7 +39,7 @@
*/
class CPPCACHE_EXPORT CqState {
public:
- // corresponding to gemfire.cache.query.internal.CqStateImpl
+ // corresponding to geode.cache.query.internal.CqStateImpl
typedef enum {
STOPPED = 0,
RUNNING = 1,
diff --git a/src/cppcache/include/gfcpp/Delta.hpp b/src/cppcache/include/gfcpp/Delta.hpp
index ebbc7d5..2d6ee6f 100644
--- a/src/cppcache/include/gfcpp/Delta.hpp
+++ b/src/cppcache/include/gfcpp/Delta.hpp
@@ -38,7 +38,7 @@
* Delta</code> as well as <code>class Cacheable</code> publicly.
* The methods <code>hasDelta( ), toDelta( )</code> and <code>fromDelta(
* )</code> must be implemented by the class, as these methods are used by
- * GemFire
+ * Geode
* to detect the presence of delta in an object, to serialize the delta, and to
* apply a serialized delta to an existing object
* of the class.
@@ -47,7 +47,7 @@
class Delta {
public:
/**
- * <code>hasDelta( )</code> is invoked by GemFire during <code>Region::put(
+ * <code>hasDelta( )</code> is invoked by Geode during <code>Region::put(
* CacheableKeyPtr, CacheablePtr )</code> to determine if the object contains
* a delta.
* If <code>hasDelta( )</code> returns true, the delta in the object is
@@ -59,7 +59,7 @@
/**
* Writes out delta information to out in a user-defined format. This is
- * invoked on an application object after GemFire determines the presence
+ * invoked on an application object after Geode determines the presence
* of delta in it by calling <code>hasDelta()</code> on the object.
*
* @throws IOException
@@ -68,7 +68,7 @@
/**
* Reads in delta information to this object in a user-defined format. This is
- * invoked on an existing application object after GemFire determines the
+ * invoked on an existing application object after Geode determines the
* presence of delta in <code>DataInput</code> instance.
*
* @throws IOException
diff --git a/src/cppcache/include/gfcpp/DistributedSystem.hpp b/src/cppcache/include/gfcpp/DistributedSystem.hpp
index ad0c311..de8c870 100644
--- a/src/cppcache/include/gfcpp/DistributedSystem.hpp
+++ b/src/cppcache/include/gfcpp/DistributedSystem.hpp
@@ -36,8 +36,8 @@
/**
* @class DistributedSystem DistributedSystem.hpp
* DistributedSystem encapsulates this applications "connection" into the
- * GemFire Java servers distributed system. In order to participate in the
- * GemFire Java servers distributed system, each application needs to connect to
+ * Geode Java servers distributed system. In order to participate in the
+ * Geode Java servers distributed system, each application needs to connect to
* the DistributedSystem.
* Each application can only be connected to one DistributedSystem.
*/
@@ -54,7 +54,7 @@
public:
/**
* Initializes the Native Client system to be able to connect to the
- * GemFire Java servers. If the name string is empty, then the default
+ * Geode Java servers. If the name string is empty, then the default
* "NativeDS" is used as the name of distributed system.
* @throws LicenseException if no valid license is found.
* @throws IllegalStateException if GFCPP variable is not set and
diff --git a/src/cppcache/include/gfcpp/ExceptionTypes.hpp b/src/cppcache/include/gfcpp/ExceptionTypes.hpp
index f4e5485..1c3e9a7 100644
--- a/src/cppcache/include/gfcpp/ExceptionTypes.hpp
+++ b/src/cppcache/include/gfcpp/ExceptionTypes.hpp
@@ -65,7 +65,7 @@
*/
/**
- *@brief A gemfire assertion exception.
+ *@brief A geode assertion exception.
**/
_GF_EXCEPTION_DEF(AssertionException);
@@ -184,12 +184,12 @@
/**
*@brief Thrown when there is an input/output error.
**/
-_GF_EXCEPTION_DEF(GemfireIOException);
+_GF_EXCEPTION_DEF(GeodeIOException);
/**
- *@brief Thrown when gemfire configuration file is incorrect.
+ *@brief Thrown when geode configuration file is incorrect.
**/
-_GF_EXCEPTION_DEF(GemfireConfigException);
+_GF_EXCEPTION_DEF(GeodeConfigException);
/**
*@brief Thrown when a null argument is provided to a method
@@ -240,7 +240,7 @@
_GF_EXCEPTION_DEF(RegionCreationFailedException);
/**
- *@brief Thrown when there is a fatal internal exception in gemfire.
+ *@brief Thrown when there is a fatal internal exception in geode.
*/
_GF_EXCEPTION_DEF(FatalInternalException);
@@ -359,7 +359,7 @@
_GF_EXCEPTION_DEF(KeyNotFoundException);
/**
* @brief This is for all Exceptions that may be thrown
-* by a GemFire transaction.
+* by a Geode transaction.
**/
_GF_EXCEPTION_DEF(TransactionException);
/**
diff --git a/src/cppcache/include/gfcpp/Execution.hpp b/src/cppcache/include/gfcpp/Execution.hpp
index a514fcb..f967e95 100644
--- a/src/cppcache/include/gfcpp/Execution.hpp
+++ b/src/cppcache/include/gfcpp/Execution.hpp
@@ -48,7 +48,7 @@
class CPPCACHE_EXPORT Execution : public SharedBase {
public:
/**
- * Specifies a data filter of routing objects for selecting the GemFire
+ * Specifies a data filter of routing objects for selecting the Geode
* members
* to execute the function.
* <p>
diff --git a/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp b/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
index 10057ae..e84a6f5 100644
--- a/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
+++ b/src/cppcache/include/gfcpp/FixedPartitionResolver.hpp
@@ -33,7 +33,7 @@
* Implementers of interface <code>FixedPartitionResolver</code> helps to
* achieve explicit mapping of a "user defined" partition to a data member node.
* <p>
- * GemFire uses the partition name returned by
+ * Geode uses the partition name returned by
* {@link FixedPartitionResolver#getPartitionName(EntryEvent,
* CacheableHashSetPtr)}
* to determine on which member the data is being managed. Say, for example, you
diff --git a/src/cppcache/include/gfcpp/FunctionService.hpp b/src/cppcache/include/gfcpp/FunctionService.hpp
index d929e63..1243c56 100644
--- a/src/cppcache/include/gfcpp/FunctionService.hpp
+++ b/src/cppcache/include/gfcpp/FunctionService.hpp
@@ -54,10 +54,10 @@
/**
* Returns a {@link Execution} object that can be used to execute a data
* dependent function on the specified Region.<br>
- * When invoked from a GemFire client, the method returns an Execution
+ * When invoked from a Geode client, the method returns an Execution
* instance that sends a message to one of the connected servers as specified
* by the {@link Pool} for the region. Depending on the filters setup on the
- * {@link Execution}, the function is executed on all GemFire members that
+ * {@link Execution}, the function is executed on all Geode members that
* define the data region, or a subset of members.
* {@link Execution::withFilter(filter)}).
*
diff --git a/src/cppcache/include/gfcpp/GemFireCache.hpp b/src/cppcache/include/gfcpp/GeodeCache.hpp
similarity index 92%
rename from src/cppcache/include/gfcpp/GemFireCache.hpp
rename to src/cppcache/include/gfcpp/GeodeCache.hpp
index 506d0be..e603052 100644
--- a/src/cppcache/include/gfcpp/GemFireCache.hpp
+++ b/src/cppcache/include/gfcpp/GeodeCache.hpp
@@ -33,8 +33,8 @@
namespace client {
/**
- * GemFireCache represents the singleton cache that must be created
- * in order to connect to Gemfire server.
+ * GeodeCache represents the singleton cache that must be created
+ * in order to connect to Geode server.
* Users must create a {@link Cache}.
* Instances of this interface are created using one of the following methods:
* <ul>
@@ -44,7 +44,7 @@
*
*/
-class CPPCACHE_EXPORT GemFireCache : public RegionService {
+class CPPCACHE_EXPORT GeodeCache : public RegionService {
/**
* @brief public methods
*/
diff --git a/src/cppcache/include/gfcpp/GeodeCppCache.hpp b/src/cppcache/include/gfcpp/GeodeCppCache.hpp
index 66e8f11..98fefab 100644
--- a/src/cppcache/include/gfcpp/GeodeCppCache.hpp
+++ b/src/cppcache/include/gfcpp/GeodeCppCache.hpp
@@ -35,7 +35,7 @@
#include "CacheableUndefined.hpp"
#include "CacheFactory.hpp"
#include "Cache.hpp"
-#include "GemFireCache.hpp"
+#include "GeodeCache.hpp"
#include "CacheAttributes.hpp"
#include "CacheStatistics.hpp"
#include "CqAttributesFactory.hpp"
diff --git a/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp b/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
index a6c171d..ca7f705 100644
--- a/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
+++ b/src/cppcache/include/gfcpp/InternalCacheTransactionManager2PC.hpp
@@ -31,7 +31,7 @@
* Extension of the apache::geode::client::CacheTransactionManager that enables
* client
* application
- * to use Gemfire transaction as part of the global XA transaction.
+ * to use Geode transaction as part of the global XA transaction.
*
* The prepare method of this class corresponds to the prepare phases of the
* 2 phase commit protocol driven by a global transaction manager.
@@ -43,7 +43,7 @@
*
* Methods of this class are expected to be called by a custom XA Resource
* Manager
- * that is wrapping and adapting Gemfire client to XA specification
+ * that is wrapping and adapting Geode client to XA specification
* requirements.
*
* @since 8.3
@@ -60,7 +60,7 @@
* Calls to subsequent commit() or rollback() methods overridden by this class
* are
* expected to succeed after prepare() has returned successfully.
- * Gemfire commits internal transaction irreversibly on commit() call.
+ * Geode commits internal transaction irreversibly on commit() call.
*
*/
virtual void prepare() = 0;
diff --git a/src/cppcache/include/gfcpp/Log.hpp b/src/cppcache/include/gfcpp/Log.hpp
index fd60422..4644451 100644
--- a/src/cppcache/include/gfcpp/Log.hpp
+++ b/src/cppcache/include/gfcpp/Log.hpp
@@ -32,16 +32,16 @@
/******************************************************************************/
-#ifndef GEMFIRE_HIGHEST_LOG_LEVEL
-#define GEMFIRE_HIGHEST_LOG_LEVEL All
+#ifndef GEODE_HIGHEST_LOG_LEVEL
+#define GEODE_HIGHEST_LOG_LEVEL All
#endif
-#ifndef GEMFIRE_MAX_LOG_FILE_LIMIT
-#define GEMFIRE_MAX_LOG_FILE_LIMIT (1024 * 1024 * 1024)
+#ifndef GEODE_MAX_LOG_FILE_LIMIT
+#define GEODE_MAX_LOG_FILE_LIMIT (1024 * 1024 * 1024)
#endif
-#ifndef GEMFIRE_MAX_LOG_DISK_LIMIT
-#define GEMFIRE_MAX_LOG_DISK_LIMIT (1024ll * 1024ll * 1024ll * 1024ll)
+#ifndef GEODE_MAX_LOG_DISK_LIMIT
+#define GEODE_MAX_LOG_DISK_LIMIT (1024ll * 1024ll * 1024ll * 1024ll)
#endif
#define _GF_MSG_LIMIT 8192
@@ -68,7 +68,7 @@
apache::geode::client::Log::log(level, expr)
/** Defines methods available to clients that want to write a log message
- * to their GemFire system's shared log file.
+ * to their Geode system's shared log file.
* <p>
* This class must be initialized prior to its use:
* @ref Log::init
@@ -228,7 +228,7 @@
* enough space left to hold the formatted log-line (around 70 chars).
*
* This is provided so that applications wishing to use the same format
- * as GemFire log-lines can do so easily. A log-line starts with the prefix
+ * as Geode log-lines can do so easily. A log-line starts with the prefix
* given below which is filled in by this method:
* [<level> <date> <time> <timezone> <host>:<process ID> <thread ID>]
*
@@ -245,7 +245,7 @@
*/
static bool enabled(LogLevel level) {
return (((s_doingDebug && level == Debug) ||
- GEMFIRE_HIGHEST_LOG_LEVEL >= level) &&
+ GEODE_HIGHEST_LOG_LEVEL >= level) &&
s_logLevel >= level);
}
@@ -276,7 +276,7 @@
* Returns whether "error" log messages are enabled.
*/
static bool errorEnabled() {
- return GEMFIRE_HIGHEST_LOG_LEVEL >= Error && s_logLevel >= Error;
+ return GEODE_HIGHEST_LOG_LEVEL >= Error && s_logLevel >= Error;
}
/**
@@ -309,7 +309,7 @@
* Returns whether "warning" log messages are enabled.
*/
static bool warningEnabled() {
- return GEMFIRE_HIGHEST_LOG_LEVEL >= Warning && s_logLevel >= Warning;
+ return GEODE_HIGHEST_LOG_LEVEL >= Warning && s_logLevel >= Warning;
}
/**
@@ -342,7 +342,7 @@
* Returns whether "info" log messages are enabled.
*/
static bool infoEnabled() {
- return GEMFIRE_HIGHEST_LOG_LEVEL >= Info && s_logLevel >= Info;
+ return GEODE_HIGHEST_LOG_LEVEL >= Info && s_logLevel >= Info;
}
/**
@@ -375,7 +375,7 @@
* Returns whether "config" log messages are enabled.
*/
static bool configEnabled() {
- return GEMFIRE_HIGHEST_LOG_LEVEL >= Config && s_logLevel >= Config;
+ return GEODE_HIGHEST_LOG_LEVEL >= Config && s_logLevel >= Config;
}
/**
@@ -408,7 +408,7 @@
* Returns whether "fine" log messages are enabled.
*/
static bool fineEnabled() {
- return GEMFIRE_HIGHEST_LOG_LEVEL >= Fine && s_logLevel >= Fine;
+ return GEODE_HIGHEST_LOG_LEVEL >= Fine && s_logLevel >= Fine;
}
/**
@@ -441,7 +441,7 @@
* Returns whether "finer" log messages are enabled.
*/
static bool finerEnabled() {
- return GEMFIRE_HIGHEST_LOG_LEVEL >= Finer && s_logLevel >= Finer;
+ return GEODE_HIGHEST_LOG_LEVEL >= Finer && s_logLevel >= Finer;
}
/**
@@ -474,7 +474,7 @@
* Returns whether "finest" log messages are enabled.
*/
static bool finestEnabled() {
- return GEMFIRE_HIGHEST_LOG_LEVEL >= Finest && s_logLevel >= Finest;
+ return GEODE_HIGHEST_LOG_LEVEL >= Finest && s_logLevel >= Finest;
}
/**
@@ -507,7 +507,7 @@
* Returns whether "debug" log messages are enabled.
*/
static bool debugEnabled() {
- return (s_doingDebug || GEMFIRE_HIGHEST_LOG_LEVEL >= Debug) &&
+ return (s_doingDebug || GEODE_HIGHEST_LOG_LEVEL >= Debug) &&
s_logLevel >= Debug;
}
diff --git a/src/cppcache/include/gfcpp/PartitionResolver.hpp b/src/cppcache/include/gfcpp/PartitionResolver.hpp
index c1de6e3..81c4e4c 100644
--- a/src/cppcache/include/gfcpp/PartitionResolver.hpp
+++ b/src/cppcache/include/gfcpp/PartitionResolver.hpp
@@ -41,10 +41,10 @@
* class equals method so it properly verifies equality for the
* PartitionResolver implementation. This might mean verifying that class names
* are the same or that the returned routing objects are the same etc.. When you
-* initiate the partitioned region on multiple nodes, GemFire uses the equals
+* initiate the partitioned region on multiple nodes, Geode uses the equals
* method to ensure you are using the same PartitionResolver implementation for
* all of the nodes for the region.
-* GemFire uses the routing object's hashCode to determine where the data is
+* Geode uses the routing object's hashCode to determine where the data is
* being managed. Say, for example, you want to colocate all Trades by month and
* year.The key is implemented by TradeKey class which also implements the
* PartitionResolver interface.
diff --git a/src/cppcache/include/gfcpp/PdxInstance.hpp b/src/cppcache/include/gfcpp/PdxInstance.hpp
index 465ea28..60ac0d9 100644
--- a/src/cppcache/include/gfcpp/PdxInstance.hpp
+++ b/src/cppcache/include/gfcpp/PdxInstance.hpp
@@ -567,7 +567,7 @@
// From PdxSerializable
/**
- * @brief serialize this object in gemfire PDX format. This is an internal
+ * @brief serialize this object in geode PDX format. This is an internal
* method.
* @param PdxWriter to serialize the PDX object
*/
diff --git a/src/cppcache/include/gfcpp/PdxSerializable.hpp b/src/cppcache/include/gfcpp/PdxSerializable.hpp
index 8f83a0c..2c53d47 100644
--- a/src/cppcache/include/gfcpp/PdxSerializable.hpp
+++ b/src/cppcache/include/gfcpp/PdxSerializable.hpp
@@ -46,7 +46,7 @@
// using Serializable::fromData;
/**
- *@brief serialize this object in gemfire PDX format
+ *@brief serialize this object in geode PDX format
*@param PdxWriter to serialize the PDX object
**/
virtual void toData(PdxWriterPtr output) /*const*/ = 0;
diff --git a/src/cppcache/include/gfcpp/PdxSerializer.hpp b/src/cppcache/include/gfcpp/PdxSerializer.hpp
index 064f289..5af4439 100644
--- a/src/cppcache/include/gfcpp/PdxSerializer.hpp
+++ b/src/cppcache/include/gfcpp/PdxSerializer.hpp
@@ -64,7 +64,7 @@
virtual void* fromData(const char* className, PdxReaderPtr pr) = 0;
/**
- * Serializes this object in gemfire PDX format.
+ * Serializes this object in geode PDX format.
* @param userObject the object which need to serialize
* @param pw the PdxWriter object to use for serializing the object
*/
diff --git a/src/cppcache/include/gfcpp/PdxUnreadFields.hpp b/src/cppcache/include/gfcpp/PdxUnreadFields.hpp
index bc75400..bd5abd2 100644
--- a/src/cppcache/include/gfcpp/PdxUnreadFields.hpp
+++ b/src/cppcache/include/gfcpp/PdxUnreadFields.hpp
@@ -28,7 +28,7 @@
namespace client {
/**
- * Marker interface for an object that GemFire creates and returns
+ * Marker interface for an object that Geode creates and returns
* from {@link PdxReader#readUnreadFields() readUnreadFields}.
* If you call readUnreadFields then you must also call
* {@link PdxWriter#writeUnreadFields(PdxUnreadFields) writeUnreadFields} when
diff --git a/src/cppcache/include/gfcpp/PdxWrapper.hpp b/src/cppcache/include/gfcpp/PdxWrapper.hpp
index 3351a0e..79d4a94 100644
--- a/src/cppcache/include/gfcpp/PdxWrapper.hpp
+++ b/src/cppcache/include/gfcpp/PdxWrapper.hpp
@@ -69,7 +69,7 @@
uint32_t hashcode() const;
/**
- *@brief serialize this object in gemfire PDX format
+ *@brief serialize this object in geode PDX format
*@param PdxWriter to serialize the PDX object
**/
void toData(PdxWriterPtr output);
diff --git a/src/cppcache/include/gfcpp/Pool.hpp b/src/cppcache/include/gfcpp/Pool.hpp
index 95259a9..88a34e1 100644
--- a/src/cppcache/include/gfcpp/Pool.hpp
+++ b/src/cppcache/include/gfcpp/Pool.hpp
@@ -37,7 +37,7 @@
class CacheFactory;
class PoolAttributes;
/**
- * A pool of connections to connect from a client to a set of GemFire Cache
+ * A pool of connections to connect from a client to a set of Geode Cache
* Servers.
* <p>Instances of this interface are created using
* {@link PoolFactory#create}.
diff --git a/src/cppcache/include/gfcpp/PoolFactory.hpp b/src/cppcache/include/gfcpp/PoolFactory.hpp
index 34d3b04..b472486 100644
--- a/src/cppcache/include/gfcpp/PoolFactory.hpp
+++ b/src/cppcache/include/gfcpp/PoolFactory.hpp
@@ -484,7 +484,7 @@
void reset();
/**
- * Creates a new Pool for connecting a client to a set of GemFire Cache
+ * Creates a new Pool for connecting a client to a set of Geode Cache
* Servers.
* using this factory's settings for attributes.
*
diff --git a/src/cppcache/include/gfcpp/Region.hpp b/src/cppcache/include/gfcpp/Region.hpp
index 833f5d3..b043d71 100644
--- a/src/cppcache/include/gfcpp/Region.hpp
+++ b/src/cppcache/include/gfcpp/Region.hpp
@@ -181,7 +181,7 @@
* @throws CacheServerException If an exception is received from the Java cache
* server.
* Only for Native Client regions.
- * @throws NotConnectedException if not connected to the gemfire system because
+ * @throws NotConnectedException if not connected to the geode system because
* the client
* cannot establish usable connections to any of the servers given to
* it.
@@ -580,7 +580,7 @@
* and provides a user-defined argument to the <code>CacheListener</code>.
* Invalidate only removes the value from the entry, the key is kept intact.
* To completely remove the entry, destroy should be used.
- * The invalidate is not propogated to the Gemfire cache server to which it is
+ * The invalidate is not propogated to the Geode cache server to which it is
* connected with.
* <p>Updates the {@link CacheStatistics::getLastAccessedTime} and
* {@link CacheStatistics::getLastModifiedTime} for this region and the entry.
@@ -645,7 +645,7 @@
* Destroy removes
* not only the value, but also the key and entry from this region.
*
- * The destroy is propogated to the Gemfire cache server to which it is
+ * The destroy is propogated to the Geode cache server to which it is
* connected with. If the destroy fails due to an exception on server
* throwing back <code>CacheServerException</code> or security exception,
* then the local entry is still destroyed.
@@ -661,7 +661,7 @@
* @throws IllegalArgumentException if key is NULLPTR
* @throws CacheWriterException if CacheWriter aborts the operation
* @throws CacheListenerException if CacheListener throws an exception
- * @throws CacheServerException If an exception is received from the Gemfire
+ * @throws CacheServerException If an exception is received from the Geode
* cache server.
* Only for Native Client regions.
* @throws NotConnectedException if it is not connected to the cache because
@@ -734,7 +734,7 @@
* remove removes
* not only the value, but also the key and entry from this region.
*
- * The remove is propogated to the Gemfire cache server to which it is
+ * The remove is propogated to the Geode cache server to which it is
* connected with. If the destroy fails due to an exception on server
* throwing back <code>CacheServerException</code> or security exception,
* then the local entry is still removed.
@@ -751,7 +751,7 @@
* @throws IllegalArgumentException if key is NULLPTR
* @throws CacheWriterException if CacheWriter aborts the operation
* @throws CacheListenerException if CacheListener throws an exception
- * @throws CacheServerException If an exception is received from the Gemfire
+ * @throws CacheServerException If an exception is received from the Geode
* cache server.
* Only for Native Client regions.
* @throws NotConnectedException if it is not connected to the cache because
@@ -813,7 +813,7 @@
* remove removes
* not only the value, but also the key and entry from this region.
*
- * The remove is propogated to the Gemfire cache server to which it is
+ * The remove is propogated to the Geode cache server to which it is
* connected with. If the destroy fails due to an exception on server
* throwing back <code>CacheServerException</code> or security exception,
* then the local entry is still removed.
@@ -829,7 +829,7 @@
* @throws IllegalArgumentException if key is NULLPTR
* @throws CacheWriterException if CacheWriter aborts the operation
* @throws CacheListenerException if CacheListener throws an exception
- * @throws CacheServerException If an exception is received from the Gemfire
+ * @throws CacheServerException If an exception is received from the Geode
* cache server.
* Only for Native Client regions.
* @throws NotConnectedException if it is not connected to the cache because
@@ -962,7 +962,7 @@
* distributed system.
* The vector v will contain only the server keys. Any prior contents in the
* vector will be removed.
- * @throws CacheServerException If an exception is received from the Gemfire
+ * @throws CacheServerException If an exception is received from the Geode
* cache server.
* Only for Native Client regions.
* @throws NotConnectedException if it is not connected to the cache because
@@ -1000,7 +1000,7 @@
/**
* This operations checks for the value in the local cache .
- * It is not propagated to the Gemfire cache server
+ * It is not propagated to the Geode cache server
* to which it is connected.
*/
virtual bool containsValueForKey(const CacheableKeyPtr& keyPtr) const = 0;
@@ -1008,7 +1008,7 @@
/**
* Convenience method allowing key to be a const char*
* This operations checks for the value in the local cache .
- * It is not propagated to the Gemfire cache server
+ * It is not propagated to the Geode cache server
* to which it is connected.
*/
template <class KEYTYPE>
@@ -1046,7 +1046,7 @@
/**
* Convenience method allowing key to be a const char*
* This operations checks for the key in the local cache .
- * It is not propagated to the Gemfire cache server
+ * It is not propagated to the Geode cache server
* to which it is connected.
*/
template <class KEYTYPE>
diff --git a/src/cppcache/include/gfcpp/RegionService.hpp b/src/cppcache/include/gfcpp/RegionService.hpp
index 5b800d4..9fc3309 100644
--- a/src/cppcache/include/gfcpp/RegionService.hpp
+++ b/src/cppcache/include/gfcpp/RegionService.hpp
@@ -37,7 +37,7 @@
/**
* A RegionService provides access to existing {@link Region regions} that exist
- * in a {@link GemFireCache GemFire cache}.
+ * in a {@link GeodeCache Geode cache}.
* Regions can be obtained using {@link #getRegion}
* and queried using {@link #getQueryService}.
* The service should be {@link #close closed} to free up resources
diff --git a/src/cppcache/include/gfcpp/ResultCollector.hpp b/src/cppcache/include/gfcpp/ResultCollector.hpp
index 7cdae0f..b0edf5c 100644
--- a/src/cppcache/include/gfcpp/ResultCollector.hpp
+++ b/src/cppcache/include/gfcpp/ResultCollector.hpp
@@ -37,7 +37,7 @@
* @class ResultCollector ResultCollector.hpp
* Defines the interface for a container that gathers results from function
* execution.<br>
- * GemFire provides a default implementation for ResultCollector.
+ * Geode provides a default implementation for ResultCollector.
* Applications can choose to implement their own custom ResultCollector.
* A custom ResultCollector facilitates result sorting or aggregation.
* Aggregation
@@ -70,7 +70,7 @@
/**
* Returns the result of function execution, potentially blocking until all
* the results are available.
- * If gemfire sendException is called then {@link ResultCollector.getResult}
+ * If geode sendException is called then {@link ResultCollector.getResult}
* will not
* throw exception but will have exception {@link
* UserFunctionExecutionException} as a part of results received.
@@ -90,13 +90,13 @@
*/
virtual void addResult(CacheablePtr& resultOfSingleExecution);
/**
- * GemFire will invoke this method when function execution has completed
+ * Geode will invoke this method when function execution has completed
* and all results for the execution have been obtained and added to the
* ResultCollector}
*/
virtual void endResults();
/**
- * GemFire will invoke this method before re-executing function (in case of
+ * Geode will invoke this method before re-executing function (in case of
* Function Execution HA) This is to clear the previous execution results from
* the result collector
* @since 6.5
diff --git a/src/cppcache/include/gfcpp/SystemProperties.hpp b/src/cppcache/include/gfcpp/SystemProperties.hpp
index c24b8e4..aa8ba76 100644
--- a/src/cppcache/include/gfcpp/SystemProperties.hpp
+++ b/src/cppcache/include/gfcpp/SystemProperties.hpp
@@ -224,7 +224,7 @@
* By default crash dumps are created in the current working directory.
* If log-file has been specified then they are created in the same
* directory as the log file, and having the same prefix as log file.
- * The default prefix is "gemfire_cpp".
+ * The default prefix is "geode_cpp".
* The actual dump file will have timestamp and process ID in the full name.
*/
inline const bool crashDumpEnabled() const { return m_crashDumpEnabled; }
diff --git a/src/cppcache/include/gfcpp/TransactionId.hpp b/src/cppcache/include/gfcpp/TransactionId.hpp
index ba933fe..00d5bfe 100644
--- a/src/cppcache/include/gfcpp/TransactionId.hpp
+++ b/src/cppcache/include/gfcpp/TransactionId.hpp
@@ -34,7 +34,7 @@
namespace client {
/** The TransactionId interface is a "marker" interface that
-* represents a unique GemFire transaction.
+* represents a unique Geode transaction.
* @see Cache#getCacheTransactionManager
* @see CacheTransactionManager#getTransactionId
*/
diff --git a/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp b/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp
index 7eb6176..418b800 100644
--- a/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp
+++ b/src/cppcache/include/gfcpp/UserFunctionExecutionException.hpp
@@ -31,7 +31,7 @@
UserFunctionExecutionExceptionPtr;
/**
-* @brief UserFunctionExecutionException class is used to encapsulate gemfire
+* @brief UserFunctionExecutionException class is used to encapsulate geode
*sendException in case of Function execution.
**/
class UserFunctionExecutionException : public Serializable {
@@ -97,12 +97,12 @@
/**
*@brief return as CacheableStringPtr the Exception message returned from
- *gemfire sendException api.
+ *geode sendException api.
**/
CacheableStringPtr getMessage() { return m_message; }
/**
- *@brief return as CacheableStringPtr the Exception name returned from gemfire
+ *@brief return as CacheableStringPtr the Exception name returned from geode
*sendException api.
**/
CacheableStringPtr getName() {
diff --git a/src/cppcache/include/gfcpp/gf_base.hpp b/src/cppcache/include/gfcpp/gf_base.hpp
index 9e70eca..ae1df5a 100644
--- a/src/cppcache/include/gfcpp/gf_base.hpp
+++ b/src/cppcache/include/gfcpp/gf_base.hpp
@@ -40,14 +40,14 @@
#define LIBEXPORT(type) type
#endif
-/** Defines a GemFire C extern */
+/** Defines a Geode C extern */
#ifdef BUILD_GEMFIRE
#define GFCEXTERN(type) LIBEXP type LIBCALL
#else
#define GFCEXTERN(type) LIBIMP type LIBCALL
#endif /* BUILD_GEMFIRE */
-/** Defines a GemFire CPPCACHE export */
+/** Defines a Geode CPPCACHE export */
#if defined(_WIN32)
#ifdef BUILD_CPPCACHE
#define CPPCACHE_EXPORT LIBEXP
@@ -193,11 +193,11 @@
#endif
#endif /* _WIN32*/
-/**@namespace gemfire This namespace contains all the GemFire
+/**@namespace geode This namespace contains all the Geode
* C++ API classes, enumerations and globals.
*/
-/**@namespace gemfire_statistics This namespace contains all the GemFire
+/**@namespace geode_statistics This namespace contains all the Geode
* C++ statistics API classes.
*/
@@ -210,7 +210,7 @@
/**
* @file
*
- * Definitions of types and functions supported in the GemFire C++ interface
+ * Definitions of types and functions supported in the Geode C++ interface
*/
/** default timeout for query response */
@@ -218,7 +218,7 @@
/**
* @enum GfErrType
- *Error codes returned by GemFire C++ interface functions
+ *Error codes returned by Geode C++ interface functions
*/
typedef enum {
GF_NOERR = 0, /**< success - no error */
@@ -231,7 +231,7 @@
GF_ERANGE = 7, /**< index out of range */
GF_ETYPE = 8, /**< type mismatch */
GF_NOTOBJ = 9, /**< invalid object reference */
- GF_NOTCON = 10, /**< not connected to GemFire */
+ GF_NOTCON = 10, /**< not connected to Geode */
GF_NOTOWN = 11, /**< lock not owned by process/thread */
GF_NOTSUP = 12, /**< operation not supported */
GF_SCPGBL = 13, /**< attempt to exit global scope */
@@ -239,7 +239,7 @@
GF_TIMOUT = 15, /**< operation timed out */
GF_OVRFLW = 16, /**< arithmetic overflow */
GF_IOERR = 17, /**< paging file I/O error */
- GF_EINTR = 18, /**< interrupted GemFire call */
+ GF_EINTR = 18, /**< interrupted Geode call */
GF_MSG = 19, /**< message could not be handled */
GF_DISKFULL = 20, /**< disk full */
GF_NOSERVER_FOUND = 21, /** NoServer found */
diff --git a/src/cppcache/include/gfcpp/gf_types.hpp b/src/cppcache/include/gfcpp/gf_types.hpp
index 6e1a16a..9bc035c 100644
--- a/src/cppcache/include/gfcpp/gf_types.hpp
+++ b/src/cppcache/include/gfcpp/gf_types.hpp
@@ -39,7 +39,7 @@
_GF_PTR_DEF_(DistributedSystem, DistributedSystemPtr);
_GF_PTR_DEF_(CacheFactory, CacheFactoryPtr);
_GF_PTR_DEF_(RegionService, RegionServicePtr);
-_GF_PTR_DEF_(GemFireCache, GemFireCachePtr);
+_GF_PTR_DEF_(GeodeCache, GeodeCachePtr);
_GF_PTR_DEF_(Cache, CachePtr);
_GF_PTR_DEF_(RegionFactory, RegionFactoryPtr);
_GF_PTR_DEF_(AttributesFactory, AttributesFactoryPtr);
diff --git a/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp b/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
index 72f720e..07e535e 100644
--- a/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
+++ b/src/cppcache/include/gfcpp/statistics/StatisticDescriptor.hpp
@@ -33,7 +33,7 @@
/**
* Describes an individual statistic whose value is updated by an
- * application and may be archived by GemFire. These descriptions are
+ * application and may be archived by Geode. These descriptions are
* gathered together in a {@link StatisticsType}.
*
* <P>
diff --git a/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp b/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
index d0549ef..fa0c44a 100644
--- a/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
+++ b/src/cppcache/include/gfcpp/statistics/StatisticsFactory.hpp
@@ -45,7 +45,7 @@
* 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 GemFire Manager Console
+ * 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).
*
diff --git a/src/cppcache/integration-test/CacheHelper.cpp b/src/cppcache/integration-test/CacheHelper.cpp
index 9c22916..2e8890e 100644
--- a/src/cppcache/integration-test/CacheHelper.cpp
+++ b/src/cppcache/integration-test/CacheHelper.cpp
@@ -151,7 +151,7 @@
cachePtr = CacheFactory::createCacheFactory(pp)->create();
m_doDisconnect = false;
} catch (const Exception& excp) {
- LOG("GemFire exception while creating cache, logged in following line");
+ LOG("Geode exception while creating cache, logged in following line");
LOG(excp.getMessage());
} catch (...) {
LOG("Throwing exception while creating cache....");
@@ -174,7 +174,7 @@
cachePtr = cfPtr->create();
m_doDisconnect = false;
} catch (const Exception& excp) {
- LOG("GemFire exception while creating cache, logged in following line");
+ LOG("Geode exception while creating cache, logged in following line");
LOG(excp.getMessage());
} catch (...) {
LOG("Throwing exception while creating cache....");
@@ -222,7 +222,7 @@
cachePtr = cacheFac->create();
} catch (const Exception& excp) {
- LOG("GemFire exception while creating cache, logged in following line");
+ LOG("Geode exception while creating cache, logged in following line");
LOG(excp.getMessage());
} catch (...) {
LOG("Throwing exception while creating cache....");
@@ -1281,7 +1281,7 @@
printf(" creating dir = %s \n", sname.c_str());
ACE_OS::mkdir(sname.c_str());
- // sprintf( cmd, "/bin/cp %s/../test.gemfire.properties
+ // sprintf( cmd, "/bin/cp %s/../test.geode.properties
// %s/",currDir.c_str(),
// currDir.c_str() );
// LOG( cmd );
@@ -1308,7 +1308,7 @@
}
if (locHostport != NULL) { // check number of locator host port.
- std::string gemfireProperties = generateGemfireProperties(currDir, ssl);
+ std::string geodeProperties = generateGeodeProperties(currDir, ssl);
sprintf(
cmd,
@@ -1319,7 +1319,7 @@
"--J=-Dgemfire.tombstone-gc-hreshold=%ld "
"--J=-Dgemfire.security-log-level=%s --J=-Xmx1024m --J=-Xms128m 2>&1",
gfjavaenv, GFSH, classpath, sname.c_str(), xmlFile.c_str(),
- currDir.c_str(), portNum, gfLogLevel, gemfireProperties.c_str(),
+ currDir.c_str(), portNum, gfLogLevel, geodeProperties.c_str(),
authParam, deltaProperty.c_str(),
testServerGC ? userTombstone_timeout : defaultTombstone_timeout,
testServerGC ? userTombstone_gc_threshold
@@ -1514,7 +1514,7 @@
terminate_process_file(currDir + "/vf.gf.locator.pid",
std::chrono::seconds(10));
- sprintf(cmd, "%s .%stest.gemfire.properties", DELETE_COMMAND, PATH_SEP);
+ sprintf(cmd, "%s .%stest.geode.properties", DELETE_COMMAND, PATH_SEP);
LOG(cmd);
ACE_OS::system(cmd);
@@ -1651,11 +1651,11 @@
ACE_OS::mkdir(locDirname.c_str());
- std::string gemfireFile =
- generateGemfireProperties(currDir, ssl, dsId, remoteLocator);
+ std::string geodeFile =
+ generateGeodeProperties(currDir, ssl, dsId, remoteLocator);
sprintf(cmd, "%s/bin/%s stop locator --dir=%s --properties-file=%s ",
- gfjavaenv, GFSH, currDir.c_str(), gemfireFile.c_str());
+ gfjavaenv, GFSH, currDir.c_str(), geodeFile.c_str());
LOG(cmd);
ACE_OS::system(cmd);
@@ -1664,7 +1664,7 @@
"%s/bin/%s start locator --name=%s --port=%d --dir=%s "
"--properties-file=%s ",
gfjavaenv, GFSH, locDirname.c_str(), portnum, currDir.c_str(),
- gemfireFile.c_str());
+ geodeFile.c_str());
LOG(cmd);
ACE_OS::system(cmd);
@@ -1769,21 +1769,20 @@
return numMatched;
}
-std::string CacheHelper::generateGemfireProperties(const std::string& path,
- const bool ssl,
- const int dsId,
- const int remoteLocator) {
+std::string CacheHelper::generateGeodeProperties(const std::string& path,
+ const bool ssl, const int dsId,
+ const int remoteLocator) {
char cmd[2048];
std::string keystore = std::string(ACE_OS::getenv("TESTSRC")) + "/keystore";
- std::string gemfireFile = path;
- gemfireFile += "/test.gemfire.properties";
- sprintf(cmd, "%s %s%stest.gemfire.properties", DELETE_COMMAND, path.c_str(),
+ std::string geodeFile = path;
+ geodeFile += "/test.geode.properties";
+ sprintf(cmd, "%s %s%stest.geode.properties", DELETE_COMMAND, path.c_str(),
PATH_SEP);
LOG(cmd);
ACE_OS::system(cmd);
FILE* urandom = /*ACE_OS::*/
- fopen(gemfireFile.c_str(), "w");
+ fopen(geodeFile.c_str(), "w");
char gemStr[258];
sprintf(gemStr, "locators=localhost[%d],localhost[%d],localhost[%d]\n",
CacheHelper::staticLocatorHostPort1,
@@ -1822,6 +1821,6 @@
fflush(urandom);
/*ACE_OS::*/
fclose(urandom);
- LOG(gemfireFile.c_str());
- return gemfireFile;
+ LOG(geodeFile.c_str());
+ return geodeFile;
}
diff --git a/src/cppcache/integration-test/CacheHelper.hpp b/src/cppcache/integration-test/CacheHelper.hpp
index d143aa2..7c9b086 100644
--- a/src/cppcache/integration-test/CacheHelper.hpp
+++ b/src/cppcache/integration-test/CacheHelper.hpp
@@ -304,10 +304,10 @@
static int staticMcastAddress;
private:
- static std::string generateGemfireProperties(const std::string& path,
- const bool ssl = false,
- const int dsId = -1,
- const int remoteLocator = 0);
+ static std::string generateGeodeProperties(const std::string& path,
+ const bool ssl = false,
+ const int dsId = -1,
+ const int remoteLocator = 0);
};
#ifndef test_cppcache_utils_static
diff --git a/src/cppcache/integration-test/InitSmartHeap.cpp b/src/cppcache/integration-test/InitSmartHeap.cpp
index b58b5b7..326d2d1 100644
--- a/src/cppcache/integration-test/InitSmartHeap.cpp
+++ b/src/cppcache/integration-test/InitSmartHeap.cpp
@@ -17,7 +17,7 @@
#include <smrtheap.hpp>
-namespace gemfire_smartheap {
+namespace geode_smartheap {
class InitSmartHeap {
public:
diff --git a/src/cppcache/integration-test/ThinClientDistOps.hpp b/src/cppcache/integration-test/ThinClientDistOps.hpp
index 17b73b6..455ad8f 100644
--- a/src/cppcache/integration-test/ThinClientDistOps.hpp
+++ b/src/cppcache/integration-test/ThinClientDistOps.hpp
@@ -404,8 +404,8 @@
regPtr->create(keyPtr, valPtr);
try {
regPtr->create(keyPtr, valPtr);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
LOG("createEntryTwice() Clean Exit.");
return;
}
@@ -761,8 +761,8 @@
reg->create(keyPtr, valPtr);
sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
LOG(message);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
ASSERT(false,
"Creating KEY Twice on a caching-enabled false region should be "
"allowed.");
@@ -802,8 +802,8 @@
reg->create(keyPtr, valPtr);
sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
LOG(message);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
ASSERT(false,
"Creating KEY Twice on a caching-enabled false region should be "
"allowed.");
diff --git a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
index 22fd16a..f0d0df0 100644
--- a/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
+++ b/src/cppcache/integration-test/ThinClientLocalCacheLoader.hpp
@@ -96,7 +96,7 @@
DUNIT_TASK_DEFINITION(CLIENT1, SetupClient)
{
- // Create a GemFire Cache with the "client_Loader.xml" Cache XML file.
+ // Create a Geode Cache with the "client_Loader.xml" Cache XML file.
const char* clientXmlFile = "client_Loader.xml";
static char* path = ACE_OS::getenv("TESTSRC");
std::string clientXml = path;
@@ -105,7 +105,7 @@
CacheFactoryPtr cacheFactoryPtr = CacheFactory::createCacheFactory()->set(
"cache-xml-file", clientXml.c_str());
cachePtr = cacheFactoryPtr->create();
- LOGINFO("Created the GemFire Cache");
+ LOGINFO("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML
// file.
diff --git a/src/cppcache/integration-test/ThinClientTransactions.hpp b/src/cppcache/integration-test/ThinClientTransactions.hpp
index a84ed55..7674b2f 100644
--- a/src/cppcache/integration-test/ThinClientTransactions.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactions.hpp
@@ -268,8 +268,8 @@
regPtr->create(keyPtr, valPtr);
try {
regPtr->create(keyPtr, valPtr);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
LOG("createEntryTwice() Clean Exit.");
return;
}
@@ -1043,8 +1043,8 @@
reg->create(keyPtr, valPtr);
sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
LOG(message);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
ASSERT(false,
"Creating KEY Twice on a caching-enabled false region should be "
"allowed.");
@@ -1084,8 +1084,8 @@
reg->create(keyPtr, valPtr);
sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
LOG(message);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
ASSERT(false,
"Creating KEY Twice on a caching-enabled false region should be "
"allowed.");
diff --git a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
index c2aaa11..cba8bcc 100644
--- a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
+++ b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp
@@ -268,8 +268,8 @@
regPtr->create(keyPtr, valPtr);
try {
regPtr->create(keyPtr, valPtr);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
LOG("createEntryTwice() Clean Exit.");
return;
}
@@ -1059,8 +1059,8 @@
reg->create(keyPtr, valPtr);
sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
LOG(message);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
ASSERT(false,
"Creating KEY Twice on a caching-enabled false region should be "
"allowed.");
@@ -1100,8 +1100,8 @@
reg->create(keyPtr, valPtr);
sprintf(message, "Third create on Key %s ", CREATE_TWICE_KEY);
LOG(message);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
ASSERT(false,
"Creating KEY Twice on a caching-enabled false region should be "
"allowed.");
diff --git a/src/cppcache/integration-test/testLinkage.cpp b/src/cppcache/integration-test/testLinkage.cpp
index 778d014..b2fc869 100644
--- a/src/cppcache/integration-test/testLinkage.cpp
+++ b/src/cppcache/integration-test/testLinkage.cpp
@@ -71,8 +71,8 @@
UnknownException aUnknownException("UnknownException");
ClassCastException aClassCastException("ClassCastException");
EntryNotFoundException aEntryNotFoundException("EntryNotFoundException");
- GemfireIOException aGemfireIOException("GemfireIOException");
- GemfireConfigException aGemfireConfigException("GemfireConfigException");
+ GeodeIOException aGeodeIOException("GeodeIOException");
+ GeodeConfigException aGeodeConfigException("GeodeConfigException");
NullPointerException aNullPointerException("NullPointerException");
EntryExistsException aEntryExistsException("EntryExistsException");
}
diff --git a/src/cppcache/integration-test/testThinClientCq.cpp b/src/cppcache/integration-test/testThinClientCq.cpp
index 453f287..26097ec 100644
--- a/src/cppcache/integration-test/testThinClientCq.cpp
+++ b/src/cppcache/integration-test/testThinClientCq.cpp
@@ -435,9 +435,9 @@
LOGINFO("ResultSet Query returned %d rows", resultsPtr->size());
LOG("Testing bug #1026 Complete");
// Iterate through the rows of the query result.
- } catch (const Exception& gemfireExcp) {
- LOGERROR("CqQuery GemFire Exception: %s", gemfireExcp.getMessage());
- FAIL(gemfireExcp.getMessage());
+ } catch (const Exception& geodeExcp) {
+ LOGERROR("CqQuery Geode Exception: %s", geodeExcp.getMessage());
+ FAIL(geodeExcp.getMessage());
}
}
diff --git a/src/cppcache/integration-test/testThinClientCqDurable.cpp b/src/cppcache/integration-test/testThinClientCqDurable.cpp
index a743477..2cda0cd 100644
--- a/src/cppcache/integration-test/testThinClientCqDurable.cpp
+++ b/src/cppcache/integration-test/testThinClientCqDurable.cpp
@@ -181,14 +181,14 @@
pp->insert("durable-client-id", "DurableClientId");
pp->insert("durable-timeout", 3600);
- // Create a GemFire Cache Programmatically.
+ // Create a Geode Cache Programmatically.
CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory(pp);
CachePtr cachePtr = cacheFactory->setSubscriptionEnabled(true)
->setSubscriptionAckInterval(5000)
->setSubscriptionMessageTrackingTimeout(50000)
->create();
- LOGINFO("Created the GemFire Cache Programmatically");
+ LOGINFO("Created the Geode Cache Programmatically");
RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(CACHING_PROXY);
@@ -229,23 +229,23 @@
// wait for some time to recieve events
apache::geode::client::millisleep(10000);
- // Close the GemFire Cache with keepalive = true. Server will queue events
+ // Close the Geode Cache with keepalive = true. Server will queue events
// for
// durable registered keys and will deliver all events when client will
// reconnect
// within timeout period and send "readyForEvents()"
cachePtr->close(true);
- LOGINFO("Closed the GemFire Cache with keepalive as true");
+ LOGINFO("Closed the Geode Cache with keepalive as true");
}
void RunFeederClient() {
CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
- LOGINFO("Feeder connected to the GemFire Distributed System");
+ LOGINFO("Feeder connected to the Geode Distributed System");
CachePtr cachePtr = cacheFactory->create();
- LOGINFO("Created the GemFire Cache");
+ LOGINFO("Created the Geode Cache");
RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(PROXY);
@@ -266,19 +266,19 @@
apache::geode::client::millisleep(10000);
LOGINFO("put on 0-10 keys done.");
- // Close the GemFire Cache
+ // Close the Geode Cache
cachePtr->close();
- LOGINFO("Closed the GemFire Cache");
+ LOGINFO("Closed the Geode Cache");
}
void RunFeederClient1() {
CacheFactoryPtr cacheFactory = CacheFactory::createCacheFactory();
- LOGINFO("Feeder connected to the GemFire Distributed System");
+ LOGINFO("Feeder connected to the Geode Distributed System");
CachePtr cachePtr = cacheFactory->create();
- LOGINFO("Created the GemFire Cache");
+ LOGINFO("Created the Geode Cache");
RegionFactoryPtr regionFactory = cachePtr->createRegionFactory(PROXY);
@@ -299,10 +299,10 @@
apache::geode::client::millisleep(10000);
LOGINFO("put on 0-10 keys done.");
- // Close the GemFire Cache
+ // Close the Geode Cache
cachePtr->close();
- LOGINFO("Closed the GemFire Cache");
+ LOGINFO("Closed the Geode Cache");
}
DUNIT_TASK_DEFINITION(CLIENT1, RunDurableClient)
diff --git a/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp b/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
index 88acab0..cff214a 100644
--- a/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
+++ b/src/cppcache/integration-test/testThinClientInterest1_Bug1001.cpp
@@ -243,8 +243,8 @@
CacheableStringPtr lCStringP = CacheableString::create(
str, static_cast<int32_t>(wcslen(str) + 1) * sizeof(wchar_t));
const wchar_t* lRtnCd ATTR_UNUSED = lCStringP->asWChar();
- } catch (const Exception& gemfireExcp) {
- printf("%s: %s", gemfireExcp.getName(), gemfireExcp.getMessage());
+ } catch (const Exception& geodeExcp) {
+ printf("%s: %s", geodeExcp.getName(), geodeExcp.getMessage());
FAIL("Should not have got exception.");
}
@@ -253,8 +253,8 @@
CacheableStringPtr lCStringP = CacheableString::create(
str, static_cast<int32_t>(wcslen(str) + 1) * sizeof(wchar_t));
const wchar_t* lRtnCd ATTR_UNUSED = lCStringP->asWChar();
- } catch (const Exception& gemfireExcp) {
- printf("%s: %s", gemfireExcp.getName(), gemfireExcp.getMessage());
+ } catch (const Exception& geodeExcp) {
+ printf("%s: %s", geodeExcp.getName(), geodeExcp.getMessage());
FAIL("Should not have got exception.");
}
diff --git a/src/cppcache/integration-test/testThinClientListenerEvents.cpp b/src/cppcache/integration-test/testThinClientListenerEvents.cpp
index a11d438..8455fde 100644
--- a/src/cppcache/integration-test/testThinClientListenerEvents.cpp
+++ b/src/cppcache/integration-test/testThinClientListenerEvents.cpp
@@ -33,7 +33,7 @@
typedef apache::geode::client::SharedPtr<SimpleCacheListener>
SimpleCacheListenerPtr;
-// Use the "gemfire" namespace.
+// Use the "geode" namespace.
using namespace apache::geode::client;
// The SimpleCacheListener class.
diff --git a/src/cppcache/integration-test/testThinClientPdxTests.cpp b/src/cppcache/integration-test/testThinClientPdxTests.cpp
index e331533..3d68597 100644
--- a/src/cppcache/integration-test/testThinClientPdxTests.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTests.cpp
@@ -4016,7 +4016,7 @@
// MixedVersionNestedPdxOps
{ runNestedPdxOpsWithVersioning(); }
- // Pdxobject In Gemfire Serializable Ops
+ // Pdxobject In Geode Serializable Ops
//{
// runPdxInGFSOps();
//}
diff --git a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
index 2e437cf..c66b384 100644
--- a/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxTestsWithAuto.cpp
@@ -3548,7 +3548,7 @@
runNestedPdxOps(true, true); // pool with locators
}
- // Pdxobject In Gemfire Serializable Ops
+ // Pdxobject In Geode Serializable Ops
{
runPdxInGFSOps(true); // pool with server endpoints
runPdxInGFSOps(true, true); // pool with locators
diff --git a/src/cppcache/integration-test/testThinClientRemoveOps.cpp b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
index 00c740e..2c1dff2 100644
--- a/src/cppcache/integration-test/testThinClientRemoveOps.cpp
+++ b/src/cppcache/integration-test/testThinClientRemoveOps.cpp
@@ -268,8 +268,8 @@
regPtr->create(keyPtr, valPtr);
try {
regPtr->create(keyPtr, valPtr);
- } catch (const EntryExistsException& gemfireExcp) {
- LOG(gemfireExcp.getMessage());
+ } catch (const EntryExistsException& geodeExcp) {
+ LOG(geodeExcp.getMessage());
LOG("createEntryTwice() Clean Exit.");
return;
}
diff --git a/src/cppcache/integration-test/testThinClientSecurityDH.cpp b/src/cppcache/integration-test/testThinClientSecurityDH.cpp
index 88d0173..e2b3d40 100644
--- a/src/cppcache/integration-test/testThinClientSecurityDH.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityDH.cpp
@@ -109,7 +109,7 @@
config->insert("security-client-dhalgo", dhAlgo);
std::string testsrc = ACE_OS::getenv("TESTSRC");
- testsrc += "/keystore/gemfire.pem";
+ testsrc += "/keystore/geode.pem";
printf("KeyStore Path is: %s", testsrc.c_str());
config->insert("security-client-kspath", testsrc.c_str());
@@ -228,15 +228,15 @@
cmdServerAuthenticator += " security-server-kspath=";
cmdServerAuthenticator += testsrc;
cmdServerAuthenticator +=
- " security-server-ksalias=gemfire1 "
- "security-server-kspasswd=gemfire";
+ " security-server-ksalias=geode1 "
+ "security-server-kspasswd=geode";
} else if (instance == 2) {
testsrc += "/keystore/gemfire2.keystore";
cmdServerAuthenticator += " security-server-kspath=";
cmdServerAuthenticator += testsrc;
cmdServerAuthenticator +=
- " security-server-ksalias=gemfire2 "
- "security-server-kspasswd=gemfire";
+ " security-server-ksalias=geode2 "
+ "security-server-kspasswd=geode";
}
printf("Input to server cmd is --> %s\n",
diff --git a/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
index ba9a77c..384885d 100644
--- a/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityDH_MU.cpp
@@ -115,7 +115,7 @@
config->insert("security-client-dhalgo", dhAlgo);
std::string testsrc = ACE_OS::getenv("TESTSRC");
- testsrc += "/keystore/gemfire.pem";
+ testsrc += "/keystore/geode.pem";
printf("KeyStore Path is: %s", testsrc.c_str());
config->insert("security-client-kspath", testsrc.c_str());
@@ -260,15 +260,15 @@
cmdServerAuthenticator += " security-server-kspath=";
cmdServerAuthenticator += testsrc;
cmdServerAuthenticator +=
- " security-server-ksalias=gemfire1 "
- "security-server-kspasswd=gemfire";
+ " security-server-ksalias=geode1 "
+ "security-server-kspasswd=geode";
} else if (instance == 2) {
testsrc += "/keystore/gemfire2.keystore";
cmdServerAuthenticator += " security-server-kspath=";
cmdServerAuthenticator += testsrc;
cmdServerAuthenticator +=
- " security-server-ksalias=gemfire2 "
- "security-server-kspasswd=gemfire";
+ " security-server-ksalias=geode2 "
+ "security-server-kspasswd=geode";
}
printf("Input to server cmd is --> %s\n",
diff --git a/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp b/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
index 9596fde..6fdd776 100644
--- a/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityMultiUserTest.cpp
@@ -171,8 +171,7 @@
other.printStackTrace();
m_failed = true;
char tmp[256] = {'\0'};
- sprintf(tmp, "Some other gemfire exception got for user id = %d",
- m_userId);
+ sprintf(tmp, "Some other geode exception got for user id = %d", m_userId);
LOG(tmp);
LOG(other.getMessage());
m_failed = true;
@@ -212,8 +211,7 @@
other.printStackTrace();
m_failed = true;
char tmp[256] = {'\0'};
- sprintf(tmp, "Some other gemfire exception got for user id = %d",
- m_userId);
+ sprintf(tmp, "Some other geode exception got for user id = %d", m_userId);
LOG(tmp);
LOG(other.getMessage());
m_failed = true;
diff --git a/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp b/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
index 0697e68..2667585 100644
--- a/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
+++ b/src/cppcache/integration-test/testThinClientSecurityPostAuthorization.cpp
@@ -72,20 +72,20 @@
"createUserPasswordAuthInitInstance");
switch (userType) {
case 'W': {
- config->insert("security-username", "gemfire9");
- config->insert("security-password", "gemfire9");
+ config->insert("security-username", "geode9");
+ config->insert("security-password", "geode9");
break;
}
case 'R': {
char clientStr[32];
- sprintf(clientStr, "gemfire%d", clientNum);
+ sprintf(clientStr, "geode%d", clientNum);
config->insert("security-username", clientStr);
config->insert("security-password", clientStr);
break;
}
case 'A': {
- config->insert("security-username", "gemfire1");
- config->insert("security-password", "gemfire1");
+ config->insert("security-username", "geode1");
+ config->insert("security-password", "geode1");
break;
}
default: { break; }
diff --git a/src/cppcache/integration-test/testThinClientStatistics.cpp b/src/cppcache/integration-test/testThinClientStatistics.cpp
index 3a37976..8a7f13b 100644
--- a/src/cppcache/integration-test/testThinClientStatistics.cpp
+++ b/src/cppcache/integration-test/testThinClientStatistics.cpp
@@ -193,7 +193,7 @@
regEntry->getStatistics(cacheStatptr);
} catch (StatisticsDisabledException& ex) {
LOGINFO("Exception Caught:: StatisticsDisabledException");
- } catch (GemfireConfigException& e) {
+ } catch (GeodeConfigException& e) {
LOGINFO("Exception Caught:: %s", e.getMessage());
} catch (Exception& ex) {
LOGINFO("Exception Caught:: %s", ex.getMessage());
diff --git a/src/cppcache/src/CacheFactory.cpp b/src/cppcache/src/CacheFactory.cpp
index 151c65e..2571585 100644
--- a/src/cppcache/src/CacheFactory.cpp
+++ b/src/cppcache/src/CacheFactory.cpp
@@ -37,8 +37,8 @@
#include "version.h"
-#define DEFAULT_DS_NAME "default_GemfireDS"
-#define DEFAULT_CACHE_NAME "default_GemfireCache"
+#define DEFAULT_DS_NAME "default_GeodeDS"
+#define DEFAULT_CACHE_NAME "default_GeodeCache"
#define DEFAULT_SERVER_PORT 40404
#define DEFAULT_SERVER_HOST "localhost"
diff --git a/src/cppcache/src/CacheImpl.hpp b/src/cppcache/src/CacheImpl.hpp
index 2bfc05a..0c81837 100644
--- a/src/cppcache/src/CacheImpl.hpp
+++ b/src/cppcache/src/CacheImpl.hpp
@@ -64,7 +64,7 @@
/**
* @class Cache Cache.hpp
- * GemFire's implementation of a distributed C++ Cache.
+ * Geode's implementation of a distributed C++ Cache.
*
* Caches are obtained from static methods on the {@link CacheFactory} class.
* <p>
diff --git a/src/cppcache/src/CacheTransactionManagerImpl.cpp b/src/cppcache/src/CacheTransactionManagerImpl.cpp
index 98a8028..fbb37b4 100644
--- a/src/cppcache/src/CacheTransactionManagerImpl.cpp
+++ b/src/cppcache/src/CacheTransactionManagerImpl.cpp
@@ -44,12 +44,12 @@
CacheTransactionManagerImpl::~CacheTransactionManagerImpl() {}
void CacheTransactionManagerImpl::begin() {
- if (TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL) {
+ if (TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL) {
GfErrTypeThrowException("Transaction already in progress",
GF_CACHE_ILLEGAL_STATE_EXCEPTION);
}
TXState* txState = new TXState(m_cache);
- TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(txState);
+ TSSTXStateWrapper::s_geodeTSSTXState->setTXState(txState);
addTx(txState->getTransactionId()->getId());
}
@@ -313,7 +313,7 @@
}
ThinClientPoolDM* CacheTransactionManagerImpl::getDM() {
- TcrConnection* conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+ TcrConnection* conn = TssConnectionWrapper::s_geodeTSSConn->getConnection();
if (conn != NULL) {
ThinClientPoolDM* dm = conn->getEndpointObject()->getPoolHADM();
if (dm != NULL) {
@@ -327,14 +327,14 @@
TransactionIdPtr CacheTransactionManagerImpl::suspend() {
// get the current state of the thread
- TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
if (txState == NULL) {
LOGFINE("Transaction not in progress. Returning NULL transaction Id.");
return NULLPTR;
}
// get the current connection that this transaction is using
- TcrConnection* conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+ TcrConnection* conn = TssConnectionWrapper::s_geodeTSSConn->getConnection();
if (conn == NULL) {
LOGFINE("Thread local connection is null. Returning NULL transaction Id.");
return NULLPTR;
@@ -366,7 +366,7 @@
addSuspendedTx(txState->getTransactionId()->getId(), txState);
// set the current transaction state as null
- TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(NULL);
+ TSSTXStateWrapper::s_geodeTSSTXState->setTXState(NULL);
// return the transaction ID
return txState->getTransactionId();
@@ -374,7 +374,7 @@
void CacheTransactionManagerImpl::resume(TransactionIdPtr transactionId) {
// get the current state of the thread
- if (TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL) {
+ if (TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL) {
GfErrTypeThrowException("A transaction is already in progress",
GF_CACHE_ILLEGAL_STATE_EXCEPTION);
}
@@ -400,7 +400,7 @@
bool CacheTransactionManagerImpl::tryResume(TransactionIdPtr transactionId,
bool cancelExpiryTask) {
// get the current state of the thread
- if (TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL) {
+ if (TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL) {
LOGFINE("A transaction is already in progress. Cannot resume transaction.");
return false;
}
@@ -417,7 +417,7 @@
bool CacheTransactionManagerImpl::tryResume(TransactionIdPtr transactionId,
int32_t waitTimeInMillisec) {
// get the current state of the thread
- if (TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL) {
+ if (TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL) {
LOGFINE("A transaction is already in progress. Cannot resume transaction.");
return false;
}
@@ -452,7 +452,7 @@
}
// set the current state as the state of the suspended transaction
- TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(txState);
+ TSSTXStateWrapper::s_geodeTSSTXState->setTXState(txState);
LOGFINE("Get connection for transaction id %d",
txState->getTransactionId()->getId());
@@ -462,7 +462,7 @@
if (conn == NULL || error != GF_NOERR) {
// throw an exception and set the current state as NULL because
// the transaction cannot be resumed
- TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(NULL);
+ TSSTXStateWrapper::s_geodeTSSTXState->setTXState(NULL);
GfErrTypeThrowException(
"Could not get a connection for the transaction id.",
GF_CACHE_ILLEGAL_STATE_EXCEPTION);
@@ -478,7 +478,7 @@
}
bool CacheTransactionManagerImpl::exists() {
- return TSSTXStateWrapper::s_gemfireTSSTXState->getTXState() != NULL;
+ return TSSTXStateWrapper::s_geodeTSSTXState->getTXState() != NULL;
}
void CacheTransactionManagerImpl::addTx(int32_t txId) {
@@ -564,7 +564,7 @@
}
}
TransactionIdPtr CacheTransactionManagerImpl::getTransactionId() {
- TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
if (txState == NULL) {
return NULLPTR;
} else {
diff --git a/src/cppcache/src/ClientProxyMembershipID.cpp b/src/cppcache/src/ClientProxyMembershipID.cpp
index e7ae787..2e546d3 100644
--- a/src/cppcache/src/ClientProxyMembershipID.cpp
+++ b/src/cppcache/src/ClientProxyMembershipID.cpp
@@ -380,7 +380,7 @@
aStringArray->fromData(input);
// #925 - currently reading empty string keep watch here,
// server might remove even sending this string
- // (https://svn.gemstone.com/trac/gemfire/changeset/44566).
+ // (https://svn.gemstone.com/trac/geode/changeset/44566).
input.readObject(dsName); // name
input.readObject(uniqueTag); // unique tag
input.readObject(durableClientId); // durable client id
@@ -439,7 +439,7 @@
// #925 - currently reading empty string keep watch here,
// server might remove even sending this string
- // (https://svn.gemstone.com/trac/gemfire/changeset/44566).
+ // (https://svn.gemstone.com/trac/geode/changeset/44566).
input.readObject(dsName); // name
if (vmKind != ClientProxyMembershipID::LONER_DM_TYPE) {
@@ -506,7 +506,7 @@
}
// #925 - currently reading empty string keep watch here,
// server might remove even sending this string
- // (https://svn.gemstone.com/trac/gemfire/changeset/44566).
+ // (https://svn.gemstone.com/trac/geode/changeset/44566).
// InternalDistributedMember no longer uses "name" in comparisons.
// std::string myDSName = getDSName();
// std::string otherDSName = otherMember->getDSName();
diff --git a/src/cppcache/src/Connector.hpp b/src/cppcache/src/Connector.hpp
index 73d23d0..579e9ba 100644
--- a/src/cppcache/src/Connector.hpp
+++ b/src/cppcache/src/Connector.hpp
@@ -53,7 +53,7 @@
* is thrown.
*
* <p> If <code>len</code> bytes cannot be read for any reason, then an
- * <code>GemfireIOException</code> is thrown.
+ * <code>GeodeIOException</code> is thrown.
*
* <p> The <code>read(b)</code> method for class <code>InputStream</code>
* has the same effect as: <pre><code> read(b, 0, b.length) </code></pre>
@@ -64,7 +64,7 @@
* complete.
* @return the total number of bytes read into the buffer, or
* <code>-1</code> if an error was encountered.
- * @exception GemfireIOException, TimeoutException, IllegalArgumentException,
+ * @exception GeodeIOException, TimeoutException, IllegalArgumentException,
* OutOfMemoryException.
*/
virtual int32_t receive(char *b, int32_t len, uint32_t waitSeconds,
@@ -79,7 +79,7 @@
* @param waitSeconds the number of seconds to allow the write to
* complete.
* @return the actual number of bytes written.
- * @exception GemfireIOException, TimeoutException, IllegalArgumentException.
+ * @exception GeodeIOException, TimeoutException, IllegalArgumentException.
*/
virtual int32_t send(const char *b, int32_t len, uint32_t waitSeconds,
uint32_t waitMicroSeconds) = 0;
diff --git a/src/cppcache/src/CppCacheLibrary.cpp b/src/cppcache/src/CppCacheLibrary.cpp
index 0c5dd5b..f953d37 100644
--- a/src/cppcache/src/CppCacheLibrary.cpp
+++ b/src/cppcache/src/CppCacheLibrary.cpp
@@ -93,7 +93,7 @@
void CppCacheLibrary::closeLib(void) {
// ACE::fini(); This should not happen..... Things might be using ace beyond
// the life of
- // using gemfire.
+ // using geode.
}
// called during DLL initialization
diff --git a/src/cppcache/src/CqService.cpp b/src/cppcache/src/CqService.cpp
index 0fa3bbf..7ed426f 100644
--- a/src/cppcache/src/CqService.cpp
+++ b/src/cppcache/src/CqService.cpp
@@ -116,8 +116,8 @@
UserAttributesPtr ua;
ua = NULLPTR;
if (m_tccdm != NULL && m_tccdm->isMultiUserMode()) {
- ua = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
- ->getUserAttributes();
+ ua =
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes();
}
CqServicePtr cqs(this);
diff --git a/src/cppcache/src/DistributedSystem.cpp b/src/cppcache/src/DistributedSystem.cpp
index ef535b7..d6915b9 100644
--- a/src/cppcache/src/DistributedSystem.cpp
+++ b/src/cppcache/src/DistributedSystem.cpp
@@ -175,7 +175,7 @@
Log::init(g_sysProps->logLevel(), logFilename,
g_sysProps->logFileSizeLimit(),
g_sysProps->logDiskSpaceLimit());
- } catch (const GemfireIOException&) {
+ } catch (const GeodeIOException&) {
Log::close();
TcrMessage::cleanup();
CppCacheLibrary::closeLib();
@@ -191,8 +191,7 @@
try {
std::string gfcpp = CppCacheLibrary::getProductDir();
- LOGCONFIG("Using GemFire Native Client Product Directory: %s",
- gfcpp.c_str());
+ LOGCONFIG("Using Geode Native Client Product Directory: %s", gfcpp.c_str());
} catch (const Exception&) {
LOGERROR(
"Unable to determine Product Directory. Please set the "
@@ -228,7 +227,7 @@
LOGCONFIG("Operators new and delete have been set.");
}
#endif
- // Log the Gemfire system properties
+ // Log the Geode system properties
g_sysProps->logSettings();
/* if (strlen(g_sysProps->securityClientDhAlgo())>0) {
@@ -290,7 +289,7 @@
m_connected = true;
dptr = dp;
*m_instance_ptr = dptr;
- LOGCONFIG("Starting the GemFire Native Client");
+ LOGCONFIG("Starting the Geode Native Client");
return dptr;
}
@@ -373,7 +372,7 @@
// Free up library resources
CppCacheLibrary::closeLib();
- LOGCONFIG("Stopped the GemFire Native Client");
+ LOGCONFIG("Stopped the Geode Native Client");
Log::close();
diff --git a/src/cppcache/src/DistributedSystemImpl.hpp b/src/cppcache/src/DistributedSystemImpl.hpp
index 15fed6b..78f59a7 100644
--- a/src/cppcache/src/DistributedSystemImpl.hpp
+++ b/src/cppcache/src/DistributedSystemImpl.hpp
@@ -46,7 +46,7 @@
/**
* @class DistributedSystemImpl DistributedSystemImpl.hpp
-* A "connection" to a GemFire distributed system.
+* A "connection" to a Geode distributed system.
* The connection will be through a (host, port) pair.
*/
diff --git a/src/cppcache/src/ExceptionTypes.cpp b/src/cppcache/src/ExceptionTypes.cpp
index 9a2979c..ea03c72 100644
--- a/src/cppcache/src/ExceptionTypes.cpp
+++ b/src/cppcache/src/ExceptionTypes.cpp
@@ -40,7 +40,7 @@
switch (err) {
case GF_NOTCON: {
NotConnectedException ex(
- str, (exMsg != NULL ? exMsg : ": not connected to GemFire"));
+ str, (exMsg != NULL ? exMsg : ": not connected to Geode"));
setTSSExceptionMessage(NULL);
throw ex;
}
@@ -124,7 +124,7 @@
throw ex;
}
case GF_IOERR: {
- GemfireIOException ex(
+ GeodeIOException ex(
str, (exMsg != NULL ? exMsg : ": Input/Output error in operation"));
setTSSExceptionMessage(NULL);
throw ex;
diff --git a/src/cppcache/src/ExecutionImpl.cpp b/src/cppcache/src/ExecutionImpl.cpp
index 0d101db..9b1b6a1 100644
--- a/src/cppcache/src/ExecutionImpl.cpp
+++ b/src/cppcache/src/ExecutionImpl.cpp
@@ -155,7 +155,7 @@
LOGDEBUG("ExecutionImpl::execute: isHAHasResultOptimizeForWrite = %d",
isHAHasResultOptimizeForWrite);
- TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
if (txState != NULL && m_allServer == true) {
throw UnsupportedOperationException(
diff --git a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
index f23898a..1267ae2 100644
--- a/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
+++ b/src/cppcache/src/InternalCacheTransactionManager2PCImpl.cpp
@@ -45,7 +45,7 @@
void InternalCacheTransactionManager2PCImpl::prepare() {
try {
- TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_gemfireTSSTXState;
+ TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_geodeTSSTXState;
TXState* txState = txStateWrapper->getTXState();
if (txState == NULL) {
@@ -120,7 +120,7 @@
void InternalCacheTransactionManager2PCImpl::afterCompletion(int32_t status) {
try {
- TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_gemfireTSSTXState;
+ TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_geodeTSSTXState;
TXState* txState = txStateWrapper->getTXState();
if (txState == NULL) {
diff --git a/src/cppcache/src/LocalRegion.cpp b/src/cppcache/src/LocalRegion.cpp
index 8adc23c..57b582c 100644
--- a/src/cppcache/src/LocalRegion.cpp
+++ b/src/cppcache/src/LocalRegion.cpp
@@ -742,7 +742,7 @@
* @return true if there is an entry in this region for the specified key
*@throw RegionDestroyedException, if region is destroyed.
*@throw IllegalArgumentException, if the key is 'null'.
-*@throw NotConnectedException, if not connected to gemfire system.
+*@throw NotConnectedException, if not connected to geode system.
*/
bool LocalRegion::containsKey_internal(const CacheableKeyPtr& keyPtr) const {
if (keyPtr == NULLPTR) {
@@ -1047,7 +1047,7 @@
TXState* m_txState;
inline explicit PutActions(LocalRegion& region) : m_region(region) {
- m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
}
inline static const char* name() { return "Region::put"; }
@@ -1138,7 +1138,7 @@
TXState* m_txState;
inline explicit CreateActions(LocalRegion& region) : m_region(region) {
- m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
}
inline static const char* name() { return "Region::create"; }
@@ -1206,7 +1206,7 @@
TXState* m_txState;
inline explicit DestroyActions(LocalRegion& region) : m_region(region) {
- m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
}
inline static const char* name() { return "Region::destroy"; }
@@ -1322,7 +1322,7 @@
inline explicit RemoveActions(LocalRegion& region)
: m_region(region), m_ServerResponse(GF_ENOENT) {
- m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
allowNULLValue = false;
}
@@ -1542,7 +1542,7 @@
TXState* m_txState;
inline explicit InvalidateActions(LocalRegion& region) : m_region(region) {
- m_txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ m_txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
}
inline static const char* name() { return "Region::invalidate"; }
diff --git a/src/cppcache/src/LocalRegion.hpp b/src/cppcache/src/LocalRegion.hpp
index e5a8945..128b119 100644
--- a/src/cppcache/src/LocalRegion.hpp
+++ b/src/cppcache/src/LocalRegion.hpp
@@ -391,7 +391,7 @@
void setPool(const PoolPtr& p) { m_attachedPool = p; }
TXState* getTXState() const {
- return TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ return TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
}
CacheablePtr handleReplay(GfErrType& err, CacheablePtr value) const;
diff --git a/src/cppcache/src/Log.cpp b/src/cppcache/src/Log.cpp
index c2a17ed..972452a 100644
--- a/src/cppcache/src/Log.cpp
+++ b/src/cppcache/src/Log.cpp
@@ -71,8 +71,8 @@
size_t g_bytesWritten = 0;
bool g_isLogFileOpened = false;
-size_t g_fileSizeLimit = GEMFIRE_MAX_LOG_FILE_LIMIT;
-size_t g_diskSpaceLimit = GEMFIRE_MAX_LOG_DISK_LIMIT;
+size_t g_fileSizeLimit = GEODE_MAX_LOG_FILE_LIMIT;
+size_t g_diskSpaceLimit = GEODE_MAX_LOG_DISK_LIMIT;
char g_logFileNameBuffer[2048] = {0};
@@ -204,12 +204,12 @@
if (g_logMutex == NULL) g_logMutex = new ACE_Thread_Mutex("Log::logMutex");
if (logDiskSpaceLimit <
- 0 /*|| logDiskSpaceLimit > GEMFIRE_MAX_LOG_DISK_LIMIT*/) {
- logDiskSpaceLimit = GEMFIRE_MAX_LOG_DISK_LIMIT;
+ 0 /*|| logDiskSpaceLimit > GEODE_MAX_LOG_DISK_LIMIT*/) {
+ logDiskSpaceLimit = GEODE_MAX_LOG_DISK_LIMIT;
}
- if (logFileLimit < 0 || logFileLimit > GEMFIRE_MAX_LOG_FILE_LIMIT) {
- logFileLimit = GEMFIRE_MAX_LOG_FILE_LIMIT;
+ if (logFileLimit < 0 || logFileLimit > GEODE_MAX_LOG_FILE_LIMIT) {
+ logFileLimit = GEODE_MAX_LOG_FILE_LIMIT;
}
ACE_Guard<ACE_Thread_Mutex> guard(*g_logMutex);
@@ -417,7 +417,7 @@
if (renameResult < 0) {
std::string msg = "Could not rename: " +
*g_logFileWithExt + " to: " + rollFile;
- throw GemfireIOException(msg.c_str());
+ throw GeodeIOException(msg.c_str());
}
*/
}
@@ -462,7 +462,7 @@
if (GF_FILEEXISTS(dirname) != 0 && ACE_OS::mkdir(dirname) != 0) {
std::string msg =
"Error in creating directories for: " + std::string(dirname);
- throw GemfireIOException(msg.c_str());
+ throw GeodeIOException(msg.c_str());
}
// retry some number of times before giving up when file is busy etc.
int maxTries = 10;
@@ -488,7 +488,7 @@
g_isLogFileOpened = false;
return;
// std::string msg = "Error in opening log file: " + *g_logFile;
- // throw GemfireIOException(msg.c_str());
+ // throw GeodeIOException(msg.c_str());
} else {
g_isLogFileOpened = true;
}
@@ -509,7 +509,7 @@
// we should be continue,
// fclose( g_log );
// std::string msg = "Error in writing banner to log file: " + *g_logFile;
- // throw GemfireIOException(msg.c_str());
+ // throw GeodeIOException(msg.c_str());
return;
}
@@ -716,7 +716,7 @@
ACE_OS::thr_self(), g_bytesWritten);*/
// std::string msg =
// "Could not rename: " + *g_logFileWithExt + " to: " + rollFile;
- // throw GemfireIOException(msg.c_str());
+ // throw GeodeIOException(msg.c_str());
return; // no need to throw exception try next time
}
@@ -799,7 +799,7 @@
g_log = NULL;
// g_isLogFileOpened = false;
// std::string msg = "Error in writing to log file: " + *g_logFile;
- // throw GemfireIOException(msg.c_str());
+ // throw GeodeIOException(msg.c_str());
} else {
fflush(g_log);
}
@@ -808,13 +808,13 @@
void Log::putThrow(LogLevel level, const char* msg, const Exception& ex) {
char buf[128] = {0};
- ACE_OS::snprintf(buf, 128, "GemFire exception %s thrown: ", ex.getName());
+ ACE_OS::snprintf(buf, 128, "Geode exception %s thrown: ", ex.getName());
put(level, (std::string(buf) + ex.getMessage() + "\n" + msg).c_str());
}
void Log::putCatch(LogLevel level, const char* msg, const Exception& ex) {
char buf[128] = {0};
- ACE_OS::snprintf(buf, 128, "GemFire exception %s caught: ", ex.getName());
+ ACE_OS::snprintf(buf, 128, "Geode exception %s caught: ", ex.getName());
put(level, (std::string(buf) + ex.getMessage() + "\n" + msg).c_str());
}
diff --git a/src/cppcache/src/PdxInstanceImpl.hpp b/src/cppcache/src/PdxInstanceImpl.hpp
index 0536ae9..05a8f95 100644
--- a/src/cppcache/src/PdxInstanceImpl.hpp
+++ b/src/cppcache/src/PdxInstanceImpl.hpp
@@ -1019,7 +1019,7 @@
// From PdxSerializable
/**
- * @brief serialize this object in gemfire PDX format. This is an internal
+ * @brief serialize this object in geode PDX format. This is an internal
* method.
* @param PdxWriter to serialize the PDX object
*/
diff --git a/src/cppcache/src/PdxType.cpp b/src/cppcache/src/PdxType.cpp
index 3b709cb..5b39d36 100644
--- a/src/cppcache/src/PdxType.cpp
+++ b/src/cppcache/src/PdxType.cpp
@@ -56,7 +56,7 @@
m_pdxFieldTypes = new std::vector<PdxFieldTypePtr>();
m_localToRemoteFieldMap = NULL;
m_remoteToLocalFieldMap = NULL;
- m_gemfireTypeId = 0;
+ m_geodeTypeId = 0;
/* adongre
* Coverity - II
* CID 29288: Uninitialized scalar field (UNINIT_CTOR)
@@ -80,7 +80,7 @@
m_pdxFieldTypes = new std::vector<PdxFieldTypePtr>();
m_localToRemoteFieldMap = NULL;
m_remoteToLocalFieldMap = NULL;
- m_gemfireTypeId = 0;
+ m_geodeTypeId = 0;
/* adongre
* Coverity - II
* CID 29287: Uninitialized scalar field (UNINIT_CTOR)
@@ -104,8 +104,8 @@
// m_noJavaClass
output.writeBoolean(m_noJavaClass);
- // m_gemfireTypeId
- output.writeInt(m_gemfireTypeId);
+ // m_geodeTypeId
+ output.writeInt(m_geodeTypeId);
// m_varLenFieldIdx
output.writeInt(m_varLenFieldIdx);
@@ -136,7 +136,7 @@
input.readBoolean(&m_noJavaClass);
- input.readInt(&m_gemfireTypeId);
+ input.readInt(&m_geodeTypeId);
input.readInt(&m_varLenFieldIdx);
@@ -478,7 +478,7 @@
PdxTypePtr PdxType::clone() {
PdxTypePtr clone(new PdxType(m_className, false));
- clone->m_gemfireTypeId = 0;
+ clone->m_geodeTypeId = 0;
clone->m_numberOfVarLenFields = m_numberOfVarLenFields;
for (std::vector<PdxFieldTypePtr>::iterator it = m_pdxFieldTypes->begin();
diff --git a/src/cppcache/src/PdxType.hpp b/src/cppcache/src/PdxType.hpp
index 3c20afb..921f9b6 100644
--- a/src/cppcache/src/PdxType.hpp
+++ b/src/cppcache/src/PdxType.hpp
@@ -70,7 +70,7 @@
char* m_className;
- int32 m_gemfireTypeId;
+ int32 m_geodeTypeId;
bool m_isLocal;
@@ -163,9 +163,9 @@
return size;
}
- virtual int32 getTypeId() const { return m_gemfireTypeId; }
+ virtual int32 getTypeId() const { return m_geodeTypeId; }
- virtual void setTypeId(int32 typeId) { m_gemfireTypeId = typeId; }
+ virtual void setTypeId(int32 typeId) { m_geodeTypeId = typeId; }
int32 getNumberOfVarLenFields() const { return m_numberOfVarLenFields; }
diff --git a/src/cppcache/src/ProxyRegion.hpp b/src/cppcache/src/ProxyRegion.hpp
index 3aa27cf..7756bf2 100644
--- a/src/cppcache/src/ProxyRegion.hpp
+++ b/src/cppcache/src/ProxyRegion.hpp
@@ -165,7 +165,7 @@
* @throws CacheServerException If an exception is received from the Java cache
* server.
* Only for Native Client regions.
- * @throws NotConnectedException if not connected to the gemfire system because
+ * @throws NotConnectedException if not connected to the geode system because
* the client
* cannot establish usable connections to any of the servers given to
* it
@@ -612,7 +612,7 @@
* and provides a user-defined argument to the <code>CacheListener</code>.
* Invalidate only removes the value from the entry, the key is kept intact.
* To completely remove the entry, destroy should be used.
- * The invalidate is not propogated to the Gemfire cache server to which it is
+ * The invalidate is not propogated to the Geode cache server to which it is
* connected with.
* <p>Updates the {@link CacheStatistics::getLastAccessedTime} and
* {@link CacheStatistics::getLastModifiedTime} for this region and the entry.
@@ -681,7 +681,7 @@
* Destroy removes
* not only the value, but also the key and entry from this region.
*
- * The destroy is propogated to the Gemfire cache server to which it is
+ * The destroy is propogated to the Geode cache server to which it is
* connected with. If the destroy fails due to an exception on server
* throwing back <code>CacheServerException</code> or security exception,
* then the local entry is still destroyed.
@@ -697,7 +697,7 @@
* @throws IllegalArgumentException if key is NULLPTR
* @throws CacheWriterException if CacheWriter aborts the operation
* @throws CacheListenerException if CacheListener throws an exception
- * @throws CacheServerException If an exception is received from the Gemfire
+ * @throws CacheServerException If an exception is received from the Geode
* cache server.
* Only for Native Client regions.
* @throws NotConnectedException if it is not connected to the cache because
@@ -773,7 +773,7 @@
* remove removes
* not only the value, but also the key and entry from this region.
*
- * The remove is propogated to the Gemfire cache server to which it is
+ * The remove is propogated to the Geode cache server to which it is
* connected with. If the destroy fails due to an exception on server
* throwing back <code>CacheServerException</code> or security exception,
* then the local entry is still removed.
@@ -790,7 +790,7 @@
* @throws IllegalArgumentException if key is NULLPTR
* @throws CacheWriterException if CacheWriter aborts the operation
* @throws CacheListenerException if CacheListener throws an exception
- * @throws CacheServerException If an exception is received from the Gemfire
+ * @throws CacheServerException If an exception is received from the Geode
* cache server.
* Only for Native Client regions.
* @throws NotConnectedException if it is not connected to the cache because
@@ -847,7 +847,7 @@
* remove removes
* not only the value, but also the key and entry from this region.
*
- * The remove is propogated to the Gemfire cache server to which it is
+ * The remove is propogated to the Geode cache server to which it is
* connected with. If the destroy fails due to an exception on server
* throwing back <code>CacheServerException</code> or security exception,
* then the local entry is still removed.
@@ -863,7 +863,7 @@
* @throws IllegalArgumentException if key is NULLPTR
* @throws CacheWriterException if CacheWriter aborts the operation
* @throws CacheListenerException if CacheListener throws an exception
- * @throws CacheServerException If an exception is received from the Gemfire
+ * @throws CacheServerException If an exception is received from the Geode
* cache server.
* Only for Native Client regions.
* @throws NotConnectedException if it is not connected to the cache because
@@ -1006,7 +1006,7 @@
* distributed system.
* The vector v will contain only the server keys. Any prior contents in the
* vector will be removed.
- * @throws CacheServerException If an exception is received from the Gemfire
+ * @throws CacheServerException If an exception is received from the Geode
* cache server.
* Only for Native Client regions.
* @throws NotConnectedException if it is not connected to the cache because
@@ -1046,7 +1046,7 @@
/**
* This operations checks for the value in the local cache .
- * It is not propagated to the Gemfire cache server
+ * It is not propagated to the Geode cache server
* to which it is connected.
*/
virtual bool containsValueForKey(const CacheableKeyPtr& keyPtr) const {
@@ -1057,7 +1057,7 @@
/**
* Convenience method allowing key to be a const char*
* This operations checks for the value in the local cache .
- * It is not propagated to the Gemfire cache server
+ * It is not propagated to the Geode cache server
* to which it is connected.
*/
template <class KEYTYPE>
@@ -1107,7 +1107,7 @@
/**
* Convenience method allowing key to be a const char*
* This operations checks for the key in the local cache .
- * It is not propagated to the Gemfire cache server
+ * It is not propagated to the Geode cache server
* to which it is connected.
*/
template <class KEYTYPE>
diff --git a/src/cppcache/src/PutAllPartialResultServerException.hpp b/src/cppcache/src/PutAllPartialResultServerException.hpp
index dce27fd..a5233a2 100644
--- a/src/cppcache/src/PutAllPartialResultServerException.hpp
+++ b/src/cppcache/src/PutAllPartialResultServerException.hpp
@@ -35,7 +35,7 @@
/**
* @brief PutAllPartialResultServerException class is used to encapsulate
- *gemfire PutAllPartialResultServerException in case of PutAll execution.
+ *geode PutAllPartialResultServerException in case of PutAll execution.
**/
class CPPCACHE_EXPORT PutAllPartialResultServerException : public Serializable {
/**
@@ -123,7 +123,7 @@
virtual int8_t typeId() const;
/**
- *@brief return as CacheableStringPtr the Exception name returned from gemfire
+ *@brief return as CacheableStringPtr the Exception name returned from geode
*sendException api.
**/
CacheableStringPtr getName() {
diff --git a/src/cppcache/src/RemoteQueryService.cpp b/src/cppcache/src/RemoteQueryService.cpp
index f176685..791f13d 100644
--- a/src/cppcache/src/RemoteQueryService.cpp
+++ b/src/cppcache/src/RemoteQueryService.cpp
@@ -65,8 +65,8 @@
return QueryPtr(
new RemoteQuery(querystring, RemoteQueryServicePtr(this), m_tccdm));
} else {
- UserAttributesPtr ua = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
- ->getUserAttributes();
+ UserAttributesPtr ua =
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes();
TryReadGuard guard(m_rwLock, m_invalid);
if (m_invalid) {
diff --git a/src/cppcache/src/SerializationRegistry.cpp b/src/cppcache/src/SerializationRegistry.cpp
index d17a5e2..730c126 100644
--- a/src/cppcache/src/SerializationRegistry.cpp
+++ b/src/cppcache/src/SerializationRegistry.cpp
@@ -103,7 +103,7 @@
}
inline void setup() {
- // Register GemFire builtins here!!
+ // Register Geode builtins here!!
// update type ids in GeodeTypeIds.hpp
bind(CacheableByte::createDeserializable);
diff --git a/src/cppcache/src/StackFrame.hpp b/src/cppcache/src/StackFrame.hpp
index 933e4b0..d57f0d4 100644
--- a/src/cppcache/src/StackFrame.hpp
+++ b/src/cppcache/src/StackFrame.hpp
@@ -103,7 +103,7 @@
/*
This code receives a stacktrace line in the forms:
- /export/hoth2/framework/lib/debug/libeventtest.so(_ZN7gemfire13testframework9EventTest17doEventOperationsEv+0x4a0)
+ /export/hoth2/framework/lib/debug/libeventtest.so(_ZN7geode13testframework9EventTest17doEventOperationsEv+0x4a0)
[0x93a1a0]
/export/hoth2/framework/lib/debug/libeventtest.so(doRegionOperations+0x13d)
[0x92c9e3]
diff --git a/src/cppcache/src/SystemProperties.cpp b/src/cppcache/src/SystemProperties.cpp
index 20f1a46..709f9dd 100644
--- a/src/cppcache/src/SystemProperties.cpp
+++ b/src/cppcache/src/SystemProperties.cpp
@@ -314,7 +314,7 @@
void SystemProperties::throwError(const char* msg) {
LOGERROR(msg);
- throw GemfireConfigException(msg);
+ throw GeodeConfigException(msg);
}
void SystemProperties::processProperty(const char* property,
@@ -747,7 +747,7 @@
void SystemProperties::logSettings() {
// *** PLEASE ADD IN ALPHABETICAL ORDER - USER VISIBLE ***
- std::string settings = "GemFire Native Client System Properties:";
+ std::string settings = "Geode Native Client System Properties:";
char buf[2048];
diff --git a/src/cppcache/src/TSSTXStateWrapper.cpp b/src/cppcache/src/TSSTXStateWrapper.cpp
index 1f2a685..f4c2d45 100644
--- a/src/cppcache/src/TSSTXStateWrapper.cpp
+++ b/src/cppcache/src/TSSTXStateWrapper.cpp
@@ -27,7 +27,7 @@
namespace apache {
namespace geode {
namespace client {
-ACE_TSS<TSSTXStateWrapper> TSSTXStateWrapper::s_gemfireTSSTXState;
+ACE_TSS<TSSTXStateWrapper> TSSTXStateWrapper::s_geodeTSSTXState;
TSSTXStateWrapper::TSSTXStateWrapper() { m_txState = NULL; }
diff --git a/src/cppcache/src/TSSTXStateWrapper.hpp b/src/cppcache/src/TSSTXStateWrapper.hpp
index f2d9621..fcadf43 100644
--- a/src/cppcache/src/TSSTXStateWrapper.hpp
+++ b/src/cppcache/src/TSSTXStateWrapper.hpp
@@ -40,7 +40,7 @@
TSSTXStateWrapper();
virtual ~TSSTXStateWrapper();
- static ACE_TSS<TSSTXStateWrapper> s_gemfireTSSTXState;
+ static ACE_TSS<TSSTXStateWrapper> s_geodeTSSTXState;
TXState* getTXState() { return m_txState; }
void setTXState(TXState* conn) { m_txState = conn; }
diff --git a/src/cppcache/src/TXCleaner.cpp b/src/cppcache/src/TXCleaner.cpp
index 2aafea5..3c9a0fc 100644
--- a/src/cppcache/src/TXCleaner.cpp
+++ b/src/cppcache/src/TXCleaner.cpp
@@ -28,7 +28,7 @@
namespace client {
TXCleaner::TXCleaner(CacheTransactionManagerImpl* cacheTxMgr) {
- m_txStateWrapper = TSSTXStateWrapper::s_gemfireTSSTXState;
+ m_txStateWrapper = TSSTXStateWrapper::s_geodeTSSTXState;
m_txState = m_txStateWrapper->getTXState();
m_cacheTxMgr = cacheTxMgr;
}
diff --git a/src/cppcache/src/TXState.cpp b/src/cppcache/src/TXState.cpp
index 5b25fcf..d500c34 100644
--- a/src/cppcache/src/TXState.cpp
+++ b/src/cppcache/src/TXState.cpp
@@ -110,7 +110,7 @@
// Since this is called during cleanup or through destructor, we should not
// throw exception from here,
// which can cause undefined cleanup.
- TcrConnection* conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+ TcrConnection* conn = TssConnectionWrapper::s_geodeTSSConn->getConnection();
if (conn != NULL) {
ThinClientPoolDM* dm = conn->getEndpointObject()->getPoolHADM();
if (dm != NULL) {
diff --git a/src/cppcache/src/TcpConn.cpp b/src/cppcache/src/TcpConn.cpp
index 1a4583b..d6b469a9 100644
--- a/src/cppcache/src/TcpConn.cpp
+++ b/src/cppcache/src/TcpConn.cpp
@@ -123,7 +123,7 @@
char msg[256];
ACE_OS::snprintf(msg, 256, "TcpConn::connect failed with errno: %d: %s",
lastError, ACE_OS::strerror(lastError));
- throw GemfireIOException(msg);
+ throw GeodeIOException(msg);
}
clearNagle(sock);
@@ -208,7 +208,7 @@
}
ACE_OS::snprintf(msg, 256, "TcpConn::listen failed with errno: %d: %s",
lastError, ACE_OS::strerror(lastError));
- throw GemfireIOException(msg);
+ throw GeodeIOException(msg);
}
}
@@ -270,7 +270,7 @@
lastError, ACE_OS::strerror(lastError));
// this is only called by constructor, so we must delete m_io
GF_SAFE_DELETE(m_io);
- throw GemfireIOException(msg);
+ throw GeodeIOException(msg);
}
int rc = this->m_io->enable(ACE_NONBLOCK);
if (-1 == rc) {
diff --git a/src/cppcache/src/TcpSslConn.cpp b/src/cppcache/src/TcpSslConn.cpp
index fc452c1..bbd055d 100644
--- a/src/cppcache/src/TcpSslConn.cpp
+++ b/src/cppcache/src/TcpSslConn.cpp
@@ -90,7 +90,7 @@
// ACE_OS::strerror(lastError) );
ACE_OS::snprintf(msg, 255, "TcpSslConn::listen failed with errno: %d: %s",
lastError, ACE_OS::strerror(lastError));
- throw GemfireIOException(msg);
+ throw GeodeIOException(msg);
}
}
@@ -131,7 +131,7 @@
lastError, ACE_OS::strerror(lastError));
// this is only called by constructor, so we must delete m_ssl
GF_SAFE_DELETE(m_ssl);
- throw GemfireIOException(msg);
+ throw GeodeIOException(msg);
}
}
diff --git a/src/cppcache/src/TcrConnection.cpp b/src/cppcache/src/TcrConnection.cpp
index 04178c2..2875f99 100644
--- a/src/cppcache/src/TcrConnection.cpp
+++ b/src/cppcache/src/TcrConnection.cpp
@@ -399,8 +399,8 @@
"connection timed out during diffie-hellman handshake"));
} else {
throwException(
- GemfireIOException("TcrConnection::TcrConnection: "
- "Handshake failure during diffie-hellman"));
+ GeodeIOException("TcrConnection::TcrConnection: "
+ "Handshake failure during diffie-hellman"));
}
}
}
@@ -553,7 +553,7 @@
"TcrConnection::TcrConnection: "
"connection timed out during handshake");
} else {
- throw GemfireIOException(
+ throw GeodeIOException(
"TcrConnection::TcrConnection: "
"Handshake failure");
}
@@ -884,7 +884,7 @@
TimeoutException("TcrConnection::send: connection timed out"));
} else {
throwException(
- GemfireIOException("TcrConnection::send: connection failure"));
+ GeodeIOException("TcrConnection::send: connection failure"));
}
}
}
@@ -920,7 +920,7 @@
// the !isNotificationMessage ensures that notification channel
// gets the TimeoutException when no data was received and is ignored by
// notification channel; when data has been received then it throws
- // GemfireIOException that causes the channel to close as required
+ // GeodeIOException that causes the channel to close as required
if (error == CONN_NODATA ||
(error == CONN_TIMEOUT && !isNotificationMessage)) {
if (isNotificationMessage) {
@@ -937,7 +937,7 @@
*opErr = CONN_IOERR;
return NULL;
}
- throwException(GemfireIOException(
+ throwException(GeodeIOException(
"TcrConnection::readMessage: "
"connection failure while receiving message header"));
}
@@ -978,7 +978,7 @@
if (error != CONN_NOERR) {
delete[] fullMessage;
// the !isNotificationMessage ensures that notification channel
- // gets the GemfireIOException and not TimeoutException;
+ // gets the GeodeIOException and not TimeoutException;
// this is required since header has already been read meaning there could
// be stale data on socket and so it should close the notification channel
// while TimeoutException is normally ignored by notification channel
@@ -991,9 +991,9 @@
*opErr = CONN_IOERR;
return NULL;
}
- throwException(GemfireIOException(
- "TcrConnection::readMessage: "
- "connection failure while receiving message body"));
+ throwException(
+ GeodeIOException("TcrConnection::readMessage: "
+ "connection failure while receiving message body"));
}
}
@@ -1046,7 +1046,7 @@
"TcrConnection::readMessageChunked: "
"connection timed out while receiving message header"));
} else {
- throwException(GemfireIOException(
+ throwException(GeodeIOException(
"TcrConnection::readMessageChunked: "
"connection failure while receiving message header"));
}
@@ -1107,7 +1107,7 @@
"TcrConnection::readMessageChunked: "
"connection timed out while receiving chunk header"));
} else {
- throwException(GemfireIOException(
+ throwException(GeodeIOException(
"TcrConnection::readMessageChunked: "
"connection failure while receiving chunk header"));
}
@@ -1144,9 +1144,9 @@
"TcrConnection::readMessageChunked: "
"connection timed out while receiving chunk body"));
} else {
- throwException(GemfireIOException(
- "TcrConnection::readMessageChunked: "
- "connection failure while receiving chunk body"));
+ throwException(
+ GeodeIOException("TcrConnection::readMessageChunked: "
+ "connection failure while receiving chunk body"));
}
}
@@ -1224,8 +1224,8 @@
GF_SAFE_DELETE_ARRAY(recvMessage);
GF_SAFE_DELETE_CON(m_conn);
throwException(
- GemfireIOException("TcrConnection::TcrConnection: "
- "Handshake failure"));
+ GeodeIOException("TcrConnection::TcrConnection: "
+ "Handshake failure"));
}
} else {
return CacheableBytes::createNoCopy(reinterpret_cast<uint8_t*>(recvMessage),
@@ -1263,8 +1263,8 @@
GF_SAFE_DELETE_ARRAY(recvMessage);
GF_SAFE_DELETE_CON(m_conn);
throwException(
- GemfireIOException("TcrConnection::TcrConnection: "
- "Handshake failure"));
+ GeodeIOException("TcrConnection::TcrConnection: "
+ "Handshake failure"));
}
// not expected to be reached
return NULLPTR;
@@ -1362,8 +1362,8 @@
GF_SAFE_DELETE_ARRAY(recvMessage);
GF_SAFE_DELETE_CON(m_conn);
throwException(
- GemfireIOException("TcrConnection::TcrConnection: "
- "Handshake failure"));
+ GeodeIOException("TcrConnection::TcrConnection: "
+ "Handshake failure"));
}
}
@@ -1387,8 +1387,8 @@
GF_SAFE_DELETE_ARRAY(recvMessage);
GF_SAFE_DELETE_CON(m_conn);
throwException(
- GemfireIOException("TcrConnection::TcrConnection: "
- "Handshake failure"));
+ GeodeIOException("TcrConnection::TcrConnection: "
+ "Handshake failure"));
}
}
@@ -1414,8 +1414,8 @@
} else {
LOGFINE("IO error receiving string typeid");
throwException(
- GemfireIOException("TcrConnection::TcrConnection: "
- "Handshake failure reading string type ID"));
+ GeodeIOException("TcrConnection::TcrConnection: "
+ "Handshake failure reading string type ID"));
}
}
@@ -1438,8 +1438,8 @@
default: {
GF_SAFE_DELETE_CON(m_conn);
throwException(
- GemfireIOException("TcrConnection::TcrConnection: "
- "Handshake failure: Unexpected string type ID"));
+ GeodeIOException("TcrConnection::TcrConnection: "
+ "Handshake failure: Unexpected string type ID"));
}
}
@@ -1467,8 +1467,8 @@
GF_SAFE_DELETE_CON(m_conn);
LOGFINE("IO error receiving string data");
throwException(
- GemfireIOException("TcrConnection::TcrConnection: "
- "Handshake failure reading string bytes"));
+ GeodeIOException("TcrConnection::TcrConnection: "
+ "Handshake failure reading string bytes"));
}
// not expected to be reached
return NULLPTR;
diff --git a/src/cppcache/src/TcrConnection.hpp b/src/cppcache/src/TcrConnection.hpp
index 9a97fa8..3550c9a 100644
--- a/src/cppcache/src/TcrConnection.hpp
+++ b/src/cppcache/src/TcrConnection.hpp
@@ -152,7 +152,7 @@
* @param recvLen output parameter for length of the received message
* @param receiveTimeoutSec read timeout in sec
* @return byte arrary of response. '0' ended.
- * @exception GemfireIOException if an I/O error occurs (socket failure).
+ * @exception GeodeIOException if an I/O error occurs (socket failure).
* @exception TimeoutException if timeout happens at any of the 3 socket
* operation: 1 write, 2 read
*/
@@ -169,7 +169,7 @@
* message vector, which will return chunked TcrMessage.
* sendTimeoutSec write timeout in sec
* receiveTimeoutSec read timeout in sec
- * @exception GemfireIOException if an I/O error occurs (socket failure).
+ * @exception GeodeIOException if an I/O error occurs (socket failure).
* @exception TimeoutException if timeout happens at any of the 3 socket
* operation: 1 write, 2 read
*/
@@ -186,7 +186,7 @@
* len length of the data to send
* sendTimeoutSec write timeout in sec
* @return no return. Because it either succeeds, or throw exception.
- * @exception GemfireIOException if an I/O error occurs (socket failure).
+ * @exception GeodeIOException if an I/O error occurs (socket failure).
* @exception TimeoutException if timeout happens at any of the 3 socket
* operation: 1 write, 2 read
*/
@@ -207,7 +207,7 @@
* @param recvLen output parameter for length of the received message
* @param receiveTimeoutSec read timeout in sec
* @return byte arrary of response. '0' ended.
- * @exception GemfireIOException if an I/O error occurs (socket failure).
+ * @exception GeodeIOException if an I/O error occurs (socket failure).
* @exception TimeoutException if timeout happens at any of the 3 socket
* operation: 1 write, 2 read
*/
@@ -222,7 +222,7 @@
* @param receiveTimeoutSec read timeout in seconds
* @param doHeaderTimeoutRetries retry when header receive times out
* @return byte array of response. '0' ended.
- * @exception GemfireIOException if an I/O error occurs (socket failure).
+ * @exception GeodeIOException if an I/O error occurs (socket failure).
* @exception TimeoutException if timeout happens during read
*/
char* readMessage(size_t* recvLen, uint32_t receiveTimeoutSec,
@@ -236,7 +236,7 @@
* @param reply response message
* @param receiveTimeoutSec read timeout in sec
* @param doHeaderTimeoutRetries retry when header receive times out
- * @exception GemfireIOException if an I/O error occurs (socket failure).
+ * @exception GeodeIOException if an I/O error occurs (socket failure).
* @exception TimeoutException if timeout happens during read
*/
void readMessageChunked(TcrMessageReply& reply, uint32_t receiveTimeoutSec,
diff --git a/src/cppcache/src/TcrEndpoint.cpp b/src/cppcache/src/TcrEndpoint.cpp
index 46099c1..b80c0fc 100644
--- a/src/cppcache/src/TcrEndpoint.cpp
+++ b/src/cppcache/src/TcrEndpoint.cpp
@@ -237,7 +237,7 @@
err = GF_TIMOUT;
m_needToConnectInLock = true; // while creating the connection
apache::geode::client::millisleep(50);
- } catch (const GemfireIOException& ex) {
+ } catch (const GeodeIOException& ex) {
LOGINFO("IO error[%d] in handshake with endpoint[%s]: %s",
ACE_OS::last_error(), m_name.c_str(), ex.getMessage());
err = GF_IOERR;
@@ -696,12 +696,12 @@
// If there is no notification, this exception is expected
// But this is valid only when *no* data has been received
// otherwise if data has been read then TcrConnection will throw
- // a GemfireIOException which will cause the channel to close.
+ // a GeodeIOException which will cause the channel to close.
LOGDEBUG(
"receiveNotification timed out: no data received from "
"endpoint %s",
m_name.c_str());
- } catch (const GemfireIOException& e) {
+ } catch (const GeodeIOException& e) {
// Endpoint is disconnected, this exception is expected
LOGFINER(
"IO exception while receiving subscription event for endpoint %s: %s",
@@ -1000,7 +1000,7 @@
// epFailure = true;
failReason = "timed out waiting for endpoint";
createNewConn = true;
- } catch (const GemfireIOException& ex) {
+ } catch (const GeodeIOException& ex) {
error = GF_IOERR;
epFailure = true;
failReason = "IO error for endpoint";
diff --git a/src/cppcache/src/TcrMessage.cpp b/src/cppcache/src/TcrMessage.cpp
index b33d41ca..71fd6d7 100644
--- a/src/cppcache/src/TcrMessage.cpp
+++ b/src/cppcache/src/TcrMessage.cpp
@@ -724,7 +724,7 @@
// the end write the length at the (buffer +
// 4) offset.
m_request->writeInt(static_cast<int32_t>(numOfParts));
- TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
if (txState == NULL) {
m_txId = -1;
} else {
diff --git a/src/cppcache/src/ThinClientBaseDM.cpp b/src/cppcache/src/ThinClientBaseDM.cpp
index 2b5e381..0ff6726 100644
--- a/src/cppcache/src/ThinClientBaseDM.cpp
+++ b/src/cppcache/src/ThinClientBaseDM.cpp
@@ -281,7 +281,7 @@
uniqueId = conn->getEndpointObject()->getUniqueId();
} else {
UserAttributesPtr userAttribute =
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes
->getUserAttributes();
connId = conn->getConnectionId();
if (!(request.getMessageType() == TcrMessage::USER_CREDENTIAL_MESSAGE)) {
@@ -313,7 +313,7 @@
if (TcrMessage::RESPONSE == reply.getMessageType()) {
if (this->isMultiUserMode()) {
UserAttributesPtr userAttribute =
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes
->getUserAttributes();
userAttribute->setConnectionAttributes(conn->getEndpointObject(),
reply.getUniqueId(conn));
diff --git a/src/cppcache/src/ThinClientPoolDM.cpp b/src/cppcache/src/ThinClientPoolDM.cpp
index bc8ea0d..4e54bb6 100644
--- a/src/cppcache/src/ThinClientPoolDM.cpp
+++ b/src/cppcache/src/ThinClientPoolDM.cpp
@@ -85,7 +85,7 @@
m_aCallbackArgument);
m_reply = new TcrMessageReply(true, m_poolDM);
if (m_poolDM->isMultiUserMode()) {
- m_userAttribute = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+ m_userAttribute = TSSUserAttributesWrapper::s_geodeTSSUserAttributes
->getUserAttributes();
}
@@ -679,7 +679,7 @@
FunctionExecution* fePtrList = new FunctionExecution[csArray->length()];
ThreadPool* threadPool = TPSingleton::instance();
UserAttributesPtr userAttr =
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->getUserAttributes();
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes();
for (int i = 0; i < csArray->length(); i++) {
CacheableStringPtr cs = csArray[i];
std::string endpointStr(cs->asChar());
@@ -997,7 +997,7 @@
void ThinClientPoolDM::sendUserCacheCloseMessage(bool keepAlive) {
LOGDEBUG("ThinClientPoolDM::sendUserCacheCloseMessage");
UserAttributesPtr userAttribute =
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->getUserAttributes();
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes();
std::map<std::string, UserConnectionAttributes*>& uca =
userAttribute->getUserConnectionServers();
@@ -1513,7 +1513,7 @@
request, version, singleHopConnFound,
connFound, serverLocation);
} else {
- userAttr = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+ userAttr = TSSUserAttributesWrapper::s_geodeTSSUserAttributes
->getUserAttributes();
if (userAttr == NULLPTR) {
LOGWARN("Attempted operation type %d without credentials",
@@ -2148,7 +2148,7 @@
error = this->sendUserCredentials(this->getCredentials(currentEndpoint),
conn, false, isServerException);
} else if (this->m_isMultiUserMode) {
- ua = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+ ua = TSSUserAttributesWrapper::s_geodeTSSUserAttributes
->getUserAttributes();
if (ua == NULLPTR) {
LOGWARN("Attempted operation type %d without credentials",
diff --git a/src/cppcache/src/ThinClientPoolDM.hpp b/src/cppcache/src/ThinClientPoolDM.hpp
index 655e37a..fdb53f3 100644
--- a/src/cppcache/src/ThinClientPoolDM.hpp
+++ b/src/cppcache/src/ThinClientPoolDM.hpp
@@ -252,7 +252,7 @@
if (request.forTransaction()) {
bool connFound =
m_manager->getStickyConnection(conn, error, excludeServers, true);
- TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
if (*error == GF_NOERR && !connFound &&
(txState == NULL || txState->isDirty())) {
*error = doFailover(conn);
@@ -482,7 +482,7 @@
}
GfErrType execute(void) {
- // TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->setUserAttributes(m_userAttr);
+ // TSSUserAttributesWrapper::s_geodeTSSUserAttributes->setUserAttributes(m_userAttr);
GuardUserAttribures gua;
if (m_userAttr != NULLPTR) gua.setProxyCache(m_userAttr->getProxyCache());
diff --git a/src/cppcache/src/ThinClientPoolStickyDM.cpp b/src/cppcache/src/ThinClientPoolStickyDM.cpp
index 11f4054..270e61d 100644
--- a/src/cppcache/src/ThinClientPoolStickyDM.cpp
+++ b/src/cppcache/src/ThinClientPoolStickyDM.cpp
@@ -93,7 +93,7 @@
request.forTransaction());
if (request.forTransaction()) {
- TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
if (*error == GF_NOERR && !cf && (txState == NULL || txState->isDirty())) {
*error = doFailover(conn);
}
diff --git a/src/cppcache/src/ThinClientRedundancyManager.cpp b/src/cppcache/src/ThinClientRedundancyManager.cpp
index a8a09a0..832c0fe 100644
--- a/src/cppcache/src/ThinClientRedundancyManager.cpp
+++ b/src/cppcache/src/ThinClientRedundancyManager.cpp
@@ -874,7 +874,7 @@
while (attempts--) {
if (err != GF_NOERR || m_redundantEndpoints.empty()) {
UserAttributesPtr userAttr =
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes
->getUserAttributes();
if (userAttr != NULLPTR) proxyCache = userAttr->getProxyCache();
err = maintainRedundancyLevel();
diff --git a/src/cppcache/src/ThinClientRegion.cpp b/src/cppcache/src/ThinClientRegion.cpp
index 957c651..aa26bb6 100644
--- a/src/cppcache/src/ThinClientRegion.cpp
+++ b/src/cppcache/src/ThinClientRegion.cpp
@@ -99,7 +99,7 @@
new VersionedCacheableObjectPartList(keys.ptr(), responseLock);
if (m_poolDM->isMultiUserMode()) {
- m_userAttribute = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+ m_userAttribute = TSSUserAttributesWrapper::s_geodeTSSUserAttributes
->getUserAttributes();
}
@@ -237,7 +237,7 @@
new VersionedCacheableObjectPartList(keys.ptr(), responseLock);
if (m_poolDM->isMultiUserMode()) {
- m_userAttribute = TSSUserAttributesWrapper::s_gemfireTSSUserAttributes
+ m_userAttribute = TSSUserAttributesWrapper::s_geodeTSSUserAttributes
->getUserAttributes();
}
@@ -1780,7 +1780,7 @@
LOGDEBUG("ThinClientRegion::putAllNoThrow_remote");
ThinClientPoolDM* poolDM = dynamic_cast<ThinClientPoolDM*>(m_tcrdm);
- TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
if (poolDM != NULL) {
if (poolDM->getPRSingleHopEnabled() &&
@@ -2121,7 +2121,7 @@
LOGDEBUG("ThinClientRegion::removeAllNoThrow_remote");
ThinClientPoolDM* poolDM = dynamic_cast<ThinClientPoolDM*>(m_tcrdm);
- TXState* txState = TSSTXStateWrapper::s_gemfireTSSTXState->getTXState();
+ TXState* txState = TSSTXStateWrapper::s_geodeTSSTXState->getTXState();
if (poolDM != NULL) {
if (poolDM->getPRSingleHopEnabled() &&
@@ -3352,7 +3352,7 @@
bool reExecute = false;
ACE_Recursive_Thread_Mutex resultCollectorLock;
UserAttributesPtr userAttr =
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->getUserAttributes();
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes->getUserAttributes();
std::vector<OnRegionFunctionExecution*> feWorkers;
ThreadPool* threadPool = TPSingleton::instance();
diff --git a/src/cppcache/src/ThinClientStickyManager.cpp b/src/cppcache/src/ThinClientStickyManager.cpp
index 218b6c9..5d5a228 100644
--- a/src/cppcache/src/ThinClientStickyManager.cpp
+++ b/src/cppcache/src/ThinClientStickyManager.cpp
@@ -23,7 +23,7 @@
bool maxConnLimit = false;
bool connFound = false;
// ACE_Guard<ACE_Recursive_Thread_Mutex> guard( m_stickyLock );
- conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+ conn = TssConnectionWrapper::s_geodeTSSConn->getConnection();
if (!conn) {
conn =
@@ -50,34 +50,34 @@
void ThinClientStickyManager::getSingleHopStickyConnection(
TcrEndpoint* theEP, TcrConnection*& conn) {
- conn = TssConnectionWrapper::s_gemfireTSSConn->getSHConnection(
- theEP, m_dm->getName());
+ conn = TssConnectionWrapper::s_geodeTSSConn->getSHConnection(theEP,
+ m_dm->getName());
}
void ThinClientStickyManager::addStickyConnection(TcrConnection* conn) {
ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_stickyLock);
TcrConnection* oldConn =
- TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+ TssConnectionWrapper::s_geodeTSSConn->getConnection();
if (oldConn) {
std::set<TcrConnection**>::iterator it = m_stickyConnList.find(
- TssConnectionWrapper::s_gemfireTSSConn->getConnDoublePtr());
+ TssConnectionWrapper::s_geodeTSSConn->getConnDoublePtr());
if (it != m_stickyConnList.end()) {
oldConn->setAndGetBeingUsed(false, false);
m_stickyConnList.erase(it);
PoolPtr p = NULLPTR;
- TssConnectionWrapper::s_gemfireTSSConn->setConnection(NULL, p);
+ TssConnectionWrapper::s_geodeTSSConn->setConnection(NULL, p);
m_dm->put(oldConn, false);
}
}
if (conn) {
PoolPtr p(m_dm);
- TssConnectionWrapper::s_gemfireTSSConn->setConnection(conn, p);
+ TssConnectionWrapper::s_geodeTSSConn->setConnection(conn, p);
conn->setAndGetBeingUsed(true, true); // this is done for transaction
// thread when some one resume
// transaction
m_stickyConnList.insert(
- TssConnectionWrapper::s_gemfireTSSConn->getConnDoublePtr());
+ TssConnectionWrapper::s_geodeTSSConn->getConnDoublePtr());
}
}
@@ -87,20 +87,20 @@
if (!conn) {
ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_stickyLock);
PoolPtr p = NULLPTR;
- TssConnectionWrapper::s_gemfireTSSConn->setConnection(NULL, p);
+ TssConnectionWrapper::s_geodeTSSConn->setConnection(NULL, p);
} else {
TcrConnection* currentConn =
- TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+ TssConnectionWrapper::s_geodeTSSConn->getConnection();
if (currentConn != conn) // otherwsie no need to set it again
{
ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_stickyLock);
PoolPtr p(m_dm);
- TssConnectionWrapper::s_gemfireTSSConn->setConnection(conn, p);
+ TssConnectionWrapper::s_geodeTSSConn->setConnection(conn, p);
conn->setAndGetBeingUsed(
false,
forTransaction); // if transaction then it will keep this as used
m_stickyConnList.insert(
- TssConnectionWrapper::s_gemfireTSSConn->getConnDoublePtr());
+ TssConnectionWrapper::s_geodeTSSConn->getConnDoublePtr());
} else {
currentConn->setAndGetBeingUsed(
false,
@@ -111,7 +111,7 @@
void ThinClientStickyManager::setSingleHopStickyConnection(
TcrEndpoint* ep, TcrConnection*& conn) {
- TssConnectionWrapper::s_gemfireTSSConn->setSHConnection(ep, conn);
+ TssConnectionWrapper::s_geodeTSSConn->setSHConnection(ep, conn);
}
void ThinClientStickyManager::cleanStaleStickyConnection() {
@@ -188,11 +188,11 @@
return canBeDeleted;
}
void ThinClientStickyManager::releaseThreadLocalConnection() {
- TcrConnection* conn = TssConnectionWrapper::s_gemfireTSSConn->getConnection();
+ TcrConnection* conn = TssConnectionWrapper::s_geodeTSSConn->getConnection();
if (conn) {
ACE_Guard<ACE_Recursive_Thread_Mutex> guard(m_stickyLock);
std::set<TcrConnection**>::iterator it = m_stickyConnList.find(
- TssConnectionWrapper::s_gemfireTSSConn->getConnDoublePtr());
+ TssConnectionWrapper::s_geodeTSSConn->getConnDoublePtr());
LOGDEBUG("ThinClientStickyManager::releaseThreadLocalConnection()");
if (it != m_stickyConnList.end()) {
m_stickyConnList.erase(it);
@@ -201,10 +201,10 @@
m_dm->put(conn, false);
}
PoolPtr p(m_dm);
- TssConnectionWrapper::s_gemfireTSSConn->setConnection(NULL, p);
+ TssConnectionWrapper::s_geodeTSSConn->setConnection(NULL, p);
}
PoolPtr p(m_dm);
- TssConnectionWrapper::s_gemfireTSSConn->releaseSHConnections(p);
+ TssConnectionWrapper::s_geodeTSSConn->releaseSHConnections(p);
}
bool ThinClientStickyManager::isNULL(TcrConnection** conn) {
if (*conn == NULL) return true;
@@ -213,5 +213,5 @@
void ThinClientStickyManager::getAnyConnection(TcrConnection*& conn) {
conn =
- TssConnectionWrapper::s_gemfireTSSConn->getAnyConnection(m_dm->getName());
+ TssConnectionWrapper::s_geodeTSSConn->getAnyConnection(m_dm->getName());
}
diff --git a/src/cppcache/src/TransactionSuspender.cpp b/src/cppcache/src/TransactionSuspender.cpp
index 2936b2c..60d200a 100644
--- a/src/cppcache/src/TransactionSuspender.cpp
+++ b/src/cppcache/src/TransactionSuspender.cpp
@@ -29,13 +29,13 @@
namespace client {
TransactionSuspender::TransactionSuspender() {
- TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_gemfireTSSTXState;
+ TSSTXStateWrapper* txStateWrapper = TSSTXStateWrapper::s_geodeTSSTXState;
m_TXState = txStateWrapper->getTXState();
txStateWrapper->setTXState(NULL);
}
TransactionSuspender::~TransactionSuspender() {
- TSSTXStateWrapper::s_gemfireTSSTXState->setTXState(m_TXState);
+ TSSTXStateWrapper::s_geodeTSSTXState->setTXState(m_TXState);
}
} // namespace client
} // namespace geode
diff --git a/src/cppcache/src/TssConnectionWrapper.cpp b/src/cppcache/src/TssConnectionWrapper.cpp
index bee1b41..adb6e42 100644
--- a/src/cppcache/src/TssConnectionWrapper.cpp
+++ b/src/cppcache/src/TssConnectionWrapper.cpp
@@ -18,7 +18,7 @@
#include "TcrConnection.hpp"
#include "ThinClientPoolDM.hpp"
using namespace apache::geode::client;
-ACE_TSS<TssConnectionWrapper> TssConnectionWrapper::s_gemfireTSSConn;
+ACE_TSS<TssConnectionWrapper> TssConnectionWrapper::s_geodeTSSConn;
TssConnectionWrapper::TssConnectionWrapper() {
PoolPtr p = NULLPTR;
m_pool = p;
diff --git a/src/cppcache/src/TssConnectionWrapper.hpp b/src/cppcache/src/TssConnectionWrapper.hpp
index 3919cb6..3348c59 100644
--- a/src/cppcache/src/TssConnectionWrapper.hpp
+++ b/src/cppcache/src/TssConnectionWrapper.hpp
@@ -58,7 +58,7 @@
TssConnectionWrapper(const TssConnectionWrapper&);
public:
- static ACE_TSS<TssConnectionWrapper> s_gemfireTSSConn;
+ static ACE_TSS<TssConnectionWrapper> s_geodeTSSConn;
TcrConnection* getConnection() { return m_tcrConn; }
TcrConnection* getSHConnection(TcrEndpoint* ep, const char* poolname);
void setConnection(TcrConnection* conn, PoolPtr& pool) {
diff --git a/src/cppcache/src/UserAttributes.cpp b/src/cppcache/src/UserAttributes.cpp
index 0efed28..ae3b8af 100644
--- a/src/cppcache/src/UserAttributes.cpp
+++ b/src/cppcache/src/UserAttributes.cpp
@@ -128,7 +128,7 @@
ProxyCachePtr UserAttributes::getProxyCache() { return m_proxyCache; }
ACE_TSS<TSSUserAttributesWrapper>
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes;
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes;
GuardUserAttribures::GuardUserAttribures(ProxyCachePtr proxyCache) {
setProxyCache(proxyCache);
@@ -138,7 +138,7 @@
m_proxyCache = proxyCache;
LOGDEBUG("GuardUserAttribures::GuardUserAttribures:");
if (m_proxyCache != NULLPTR && !proxyCache->isClosed()) {
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->setUserAttributes(
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes->setUserAttributes(
proxyCache->m_userAttributes);
} else {
throw CacheClosedException("User Cache has been closed");
@@ -149,7 +149,7 @@
GuardUserAttribures::~GuardUserAttribures() {
if (m_proxyCache != NULLPTR) {
- TSSUserAttributesWrapper::s_gemfireTSSUserAttributes->setUserAttributes(
+ TSSUserAttributesWrapper::s_geodeTSSUserAttributes->setUserAttributes(
NULLPTR);
}
}
diff --git a/src/cppcache/src/UserAttributes.hpp b/src/cppcache/src/UserAttributes.hpp
index 5453e11..ad90722 100644
--- a/src/cppcache/src/UserAttributes.hpp
+++ b/src/cppcache/src/UserAttributes.hpp
@@ -129,7 +129,7 @@
TSSUserAttributesWrapper(const TSSUserAttributesWrapper&);
public:
- static ACE_TSS<TSSUserAttributesWrapper> s_gemfireTSSUserAttributes;
+ static ACE_TSS<TSSUserAttributesWrapper> s_geodeTSSUserAttributes;
UserAttributesPtr getUserAttributes() { return m_userAttribute; }
void setUserAttributes(UserAttributesPtr userAttr) {
m_userAttribute = userAttr;
diff --git a/src/cppcache/src/Version.cpp b/src/cppcache/src/Version.cpp
index 2141cd3..3ba1ebd 100644
--- a/src/cppcache/src/Version.cpp
+++ b/src/cppcache/src/Version.cpp
@@ -21,8 +21,7 @@
namespace geode {
namespace client {
-int8_t Version::m_ordinal = 45; // Geode 1.0.0
-
+int8_t Version::m_ordinal = 45; // Geode 1.0.0
}
}
}
diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp
index ffcba0a..df972a1 100644
--- a/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp
+++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp
@@ -89,8 +89,7 @@
statsTypeMap.unbind_all();
} catch (const Exception& ex) {
- Log::warningCatch("~GeodeStatisticsFactory swallowing GemFire exception",
- ex);
+ Log::warningCatch("~GeodeStatisticsFactory swallowing Geode exception", ex);
} catch (const std::exception& ex) {
std::string what = "~GeodeStatisticsFactory swallowing std::exception: ";
diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
index 5d6a265..9a75543 100644
--- a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
+++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp
@@ -46,7 +46,7 @@
class StatisticsManager;
/**
- * Gemfire's implementation of {@link StatisticsFactory}.
+ * Geode's implementation of {@link StatisticsFactory}.
*
*/
class GeodeStatisticsFactory : public StatisticsFactory {
diff --git a/src/cppcache/src/statistics/HostStatHelperSolaris.cpp b/src/cppcache/src/statistics/HostStatHelperSolaris.cpp
index 7b0ee5c..f4f3f3f 100644
--- a/src/cppcache/src/statistics/HostStatHelperSolaris.cpp
+++ b/src/cppcache/src/statistics/HostStatHelperSolaris.cpp
@@ -70,7 +70,7 @@
ACE_OS::snprintf(procFileName, 64, "/proc/%lu/psinfo", (uint32)thePid);
// fread was returning errno 2 FILENOTFOUND so it was switched to read
- // This matches what was done in the Gemfire Project also
+ // This matches what was done in the Geode Project also
fPtr = open(procFileName, O_RDONLY, 0); /* read only */
if (fPtr != -1) {
if (read(fPtr, ¤tInfo, sizeof(currentInfo)) != sizeof(currentInfo)) {
diff --git a/src/cppcache/src/statistics/HostStatSampler.cpp b/src/cppcache/src/statistics/HostStatSampler.cpp
index e7defcd..765f8df 100644
--- a/src/cppcache/src/statistics/HostStatSampler.cpp
+++ b/src/cppcache/src/statistics/HostStatSampler.cpp
@@ -347,7 +347,7 @@
}
std::string HostStatSampler::getProductDescription() {
- return "Pivotal Gemfire Native Client ";
+ return "Pivotal Geode Native Client ";
}
void HostStatSampler::changeArchive(std::string filename) {
diff --git a/src/cppcache/src/statistics/LinuxProcessStats.cpp b/src/cppcache/src/statistics/LinuxProcessStats.cpp
index 4f418f6..eb2501b 100644
--- a/src/cppcache/src/statistics/LinuxProcessStats.cpp
+++ b/src/cppcache/src/statistics/LinuxProcessStats.cpp
@@ -24,7 +24,7 @@
/**
* <P>This class provides the interface for statistics about a
- * Linux operating system process that is using a GemFire system.
+ * Linux operating system process that is using a Geode system.
*
*/
diff --git a/src/cppcache/src/statistics/LinuxProcessStats.hpp b/src/cppcache/src/statistics/LinuxProcessStats.hpp
index 877cbf5..a3004ff 100644
--- a/src/cppcache/src/statistics/LinuxProcessStats.hpp
+++ b/src/cppcache/src/statistics/LinuxProcessStats.hpp
@@ -37,7 +37,7 @@
namespace statistics {
/**
* <P>This class provides the interface for statistics about a
- * Linux operating system process that is using a GemFire system.
+ * Linux operating system process that is using a Geode system.
*
*/
diff --git a/src/cppcache/src/statistics/NullProcessStats.cpp b/src/cppcache/src/statistics/NullProcessStats.cpp
index 74b1a1a..3731827 100644
--- a/src/cppcache/src/statistics/NullProcessStats.cpp
+++ b/src/cppcache/src/statistics/NullProcessStats.cpp
@@ -24,7 +24,7 @@
/**
* <P>This class provides the interface for statistics about a
- * Null operating system process that is using a GemFire system.
+ * Null operating system process that is using a Geode system.
*
*/
diff --git a/src/cppcache/src/statistics/NullProcessStats.hpp b/src/cppcache/src/statistics/NullProcessStats.hpp
index 937261c..1437ace 100644
--- a/src/cppcache/src/statistics/NullProcessStats.hpp
+++ b/src/cppcache/src/statistics/NullProcessStats.hpp
@@ -37,7 +37,7 @@
namespace statistics {
/**
* <P>This class provides the interface for statistics about a
- * Null operating system process that is using a GemFire system.
+ * Null operating system process that is using a Geode system.
*
*/
diff --git a/src/cppcache/src/statistics/PoolStatsSampler.cpp b/src/cppcache/src/statistics/PoolStatsSampler.cpp
index 8cc08ec..55e232f 100644
--- a/src/cppcache/src/statistics/PoolStatsSampler.cpp
+++ b/src/cppcache/src/statistics/PoolStatsSampler.cpp
@@ -122,7 +122,7 @@
dynCast<SharedPtr<NoAvailableLocatorsException> >(ex.getCause());
LOGDEBUG("No locators available, trying again.");
} catch (ClassCastException&) {
- LOGDEBUG("Not connected to gemfire, trying again.");
+ LOGDEBUG("Not connected to geode, trying again.");
}
} catch (...) {
LOGDEBUG("Exception occurred, trying again.");
diff --git a/src/cppcache/src/statistics/ProcessStats.hpp b/src/cppcache/src/statistics/ProcessStats.hpp
index 2af7331..750a948 100644
--- a/src/cppcache/src/statistics/ProcessStats.hpp
+++ b/src/cppcache/src/statistics/ProcessStats.hpp
@@ -33,7 +33,7 @@
/**
* Abstracts the process statistics that are common on all platforms.
- * This is necessary for monitoring the health of GemFire components.
+ * This is necessary for monitoring the health of Geode components.
*
*/
class CPPCACHE_EXPORT ProcessStats {
diff --git a/src/cppcache/src/statistics/SolarisProcessStats.cpp b/src/cppcache/src/statistics/SolarisProcessStats.cpp
index 3a0320b..1b76253 100644
--- a/src/cppcache/src/statistics/SolarisProcessStats.cpp
+++ b/src/cppcache/src/statistics/SolarisProcessStats.cpp
@@ -24,7 +24,7 @@
/**
* <P>This class provides the interface for statistics about a
- * Solaris operating system process that is using a GemFire system.
+ * Solaris operating system process that is using a Geode system.
*
*/
diff --git a/src/cppcache/src/statistics/SolarisProcessStats.hpp b/src/cppcache/src/statistics/SolarisProcessStats.hpp
index c1a7495..59df2f3 100644
--- a/src/cppcache/src/statistics/SolarisProcessStats.hpp
+++ b/src/cppcache/src/statistics/SolarisProcessStats.hpp
@@ -36,7 +36,7 @@
namespace statistics {
/**
* <P>This class provides the interface for statistics about a
- * Solaris operating system process that is using a GemFire system.
+ * Solaris operating system process that is using a Geode system.
*
*/
diff --git a/src/cppcache/src/statistics/StatArchiveWriter.cpp b/src/cppcache/src/statistics/StatArchiveWriter.cpp
index d600163..fdbd07b 100644
--- a/src/cppcache/src/statistics/StatArchiveWriter.cpp
+++ b/src/cppcache/src/statistics/StatArchiveWriter.cpp
@@ -73,13 +73,13 @@
if (len > 0) {
if (fwrite(buffBegin, sizeOfUInt8, len, m_fp) != static_cast<size_t>(len)) {
LOGERROR("Could not write into the statistics file");
- throw GemfireIOException("Could not write into the statistics file");
+ throw GeodeIOException("Could not write into the statistics file");
}
}
int rVal = fflush(m_fp);
if (rVal != 0) {
LOGERROR("Could not flush into the statistics file");
- throw GemfireIOException("Could not flush into the statistics file");
+ throw GeodeIOException("Could not flush into the statistics file");
}
}
diff --git a/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp b/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp
index 78f0a2a..bf01763 100644
--- a/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp
+++ b/src/cppcache/src/statistics/StatisticDescriptorImpl.cpp
@@ -27,7 +27,7 @@
/**
* Describes an individual statistic whose value is updated by an
- * application and may be archived by GemFire. These descriptions are
+ * 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
diff --git a/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp b/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
index d182168..64ca93b 100644
--- a/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
+++ b/src/cppcache/src/statistics/StatisticDescriptorImpl.hpp
@@ -35,7 +35,7 @@
/**
* Describes an individual statistic whose value is updated by an
- * application and may be archived by GemFire. These descriptions are
+ * application and may be archived by Geode. These descriptions are
* gathered together in a {@link StatisticsType}.
*
* <P>
@@ -98,7 +98,7 @@
int8 statIsCounter, int8 statIsLargerBetter);
public:
- /** GfFieldType defined in gemfire.h.
+ /** GfFieldType defined in geode.h.
* It describes the date type of an individual descriptor.
* Supported date types are INT, LONG, and DOUBLE.
*/
diff --git a/src/cppcache/src/statistics/StatisticsManager.cpp b/src/cppcache/src/statistics/StatisticsManager.cpp
index e42d283..f1b020b 100644
--- a/src/cppcache/src/statistics/StatisticsManager.cpp
+++ b/src/cppcache/src/statistics/StatisticsManager.cpp
@@ -123,7 +123,7 @@
GeodeStatisticsFactory::clean();
} catch (const Exception& ex) {
- Log::warningCatch("~StatisticsManager swallowing GemFire exception", ex);
+ Log::warningCatch("~StatisticsManager swallowing Geode exception", ex);
} catch (const std::exception& ex) {
std::string what = "~StatisticsManager swallowing std::exception: ";
diff --git a/src/cppcache/src/statistics/WindowsProcessStats.hpp b/src/cppcache/src/statistics/WindowsProcessStats.hpp
index 79c4271..ea993da 100644
--- a/src/cppcache/src/statistics/WindowsProcessStats.hpp
+++ b/src/cppcache/src/statistics/WindowsProcessStats.hpp
@@ -37,7 +37,7 @@
namespace statistics {
/**
* <P>This class provides the interface for statistics about a
- * Windows operating system process that is using a GemFire system.
+ * Windows operating system process that is using a Geode system.
*/
class CPPCACHE_EXPORT WindowsProcessStats : public ProcessStats {
diff --git a/src/cppcache/test/CacheXmlParserTest.cpp b/src/cppcache/test/CacheXmlParserTest.cpp
index 59dd705..6b5d9c8 100644
--- a/src/cppcache/test/CacheXmlParserTest.cpp
+++ b/src/cppcache/test/CacheXmlParserTest.cpp
@@ -100,7 +100,7 @@
std::string dtd_prefix = R"(<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE cache PUBLIC
- "-//GemStone Systems, Inc.//GemFire Declarative Caching 3.6//EN"
+ "-//GemStone Systems, Inc.//Geode Declarative Caching 3.6//EN"
"http://www.gemstone.com/dtd/gfcpp-cache3600.dtd">
<client-cache>)";
diff --git a/src/cryptoimpl/DHImpl.cpp b/src/cryptoimpl/DHImpl.cpp
index 0a36b01..8d6fe24 100644
--- a/src/cryptoimpl/DHImpl.cpp
+++ b/src/cryptoimpl/DHImpl.cpp
@@ -508,7 +508,7 @@
X509_get_subject_name(dhimpl->m_serverCerts[item]), NULL, 0);
// Ignore first letter for comparision, openssl adds / before subject name
- // e.g. /CN=gemfire1
+ // e.g. /CN=geode1
if (strcmp((const char *)certsubject + 1, subject) == 0) {
evpkey = X509_get_pubkey(dhimpl->m_serverCerts[item]);
cert = dhimpl->m_serverCerts[item];
diff --git a/src/dhimpl/DHImpl.cpp b/src/dhimpl/DHImpl.cpp
index 9ea3609..c86d49f 100644
--- a/src/dhimpl/DHImpl.cpp
+++ b/src/dhimpl/DHImpl.cpp
@@ -411,7 +411,7 @@
X509_NAME_oneline(X509_get_subject_name(m_serverCerts[item]), NULL, 0);
// Ignore first letter for comparision, openssl adds / before subject name
- // e.g. /CN=gemfire1
+ // e.g. /CN=geode1
if (strcmp((const char *)certsubject + 1, subject) == 0) {
evpkey = X509_get_pubkey(m_serverCerts[item]);
cert = m_serverCerts[item];
diff --git a/src/executables/GacInstall/AssemblyInfo.cs b/src/executables/GacInstall/AssemblyInfo.cs
index 040b4ee..a9e8d9a 100644
--- a/src/executables/GacInstall/AssemblyInfo.cs
+++ b/src/executables/GacInstall/AssemblyInfo.cs
@@ -22,11 +22,11 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("GemFireGacInstall")]
-[assembly: AssemblyDescription("GemFire utility to install/uninstall to GAC")]
+[assembly: AssemblyTitle("GeodeGacInstall")]
+[assembly: AssemblyDescription("Geode utility to install/uninstall to GAC")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("GemStone Systems Inc.")]
-[assembly: AssemblyProduct("GemFireGacInstall")]
+[assembly: AssemblyProduct("GeodeGacInstall")]
[assembly: AssemblyCopyright("Copyright © GemStone Systems Inc. 2006")]
[assembly: AssemblyTrademark("All Rights Reserved")]
[assembly: AssemblyCulture("")]
diff --git a/src/executables/GacInstall/Program.cs b/src/executables/GacInstall/Program.cs
index 8825c87..4b1d233 100644
--- a/src/executables/GacInstall/Program.cs
+++ b/src/executables/GacInstall/Program.cs
@@ -30,7 +30,7 @@
private const string DOTNETAssemblyFoldersKey =
@"SOFTWARE\Microsoft\.NETFramework\AssemblyFolders";
- private const string GemFireProductKey = "Apache.Geode";
+ private const string GeodeProductKey = "Apache.Geode";
#endregion
@@ -100,7 +100,7 @@
Registry.LocalMachine.OpenSubKey(DOTNETAssemblyFoldersKey, true);
if (dotNETAssemblyFoldersKey != null)
{
- dotNETAssemblyFoldersKey.DeleteSubKey(GemFireProductKey, false);
+ dotNETAssemblyFoldersKey.DeleteSubKey(GeodeProductKey, false);
}
if (doInstall)
{
@@ -108,7 +108,7 @@
if (dotNETAssemblyFoldersKey != null)
{
RegistryKey productKey =
- dotNETAssemblyFoldersKey.CreateSubKey(GemFireProductKey);
+ dotNETAssemblyFoldersKey.CreateSubKey(GeodeProductKey);
if (productKey != null)
{
productKey.SetValue(null, finalDirPath, RegistryValueKind.String);
diff --git a/src/pdxautoserializer/CodeGenerator.hpp b/src/pdxautoserializer/CodeGenerator.hpp
index 34fae30..820377d 100644
--- a/src/pdxautoserializer/CodeGenerator.hpp
+++ b/src/pdxautoserializer/CodeGenerator.hpp
@@ -145,7 +145,7 @@
const std::string& outputVarName) = 0;
/**
- * Generate the code for typeId function of gemfire
+ * Generate the code for typeId function of geode
* Serializable/DataSerializable interface.
*/
virtual void genTypeId(const std::string& methodPrefix) = 0;
diff --git a/src/quickstart/csharp/BasicOperations.cs b/src/quickstart/csharp/BasicOperations.cs
index 026c016..cc6e884 100644
--- a/src/quickstart/csharp/BasicOperations.cs
+++ b/src/quickstart/csharp/BasicOperations.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Create the example Region with generics support programmatically.
* 3.a. Put Entries (Key and Value pairs) into the Region.
* 3.b. If in 64 bit mode put over 4 GB data to demonstrate capacity.
@@ -34,7 +34,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// To check for available memory.
@@ -50,12 +50,12 @@
{
try
{
- // Create a GemFire Cache.
+ // Create a Geode Cache.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
@@ -112,15 +112,15 @@
Console.WriteLine("Destroyed the second Entry in the Region");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("BasicOperations GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("BasicOperations Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/CqQuery.cs b/src/quickstart/csharp/CqQuery.cs
index 27a429d..b4c9b9a 100644
--- a/src/quickstart/csharp/CqQuery.cs
+++ b/src/quickstart/csharp/CqQuery.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache Programmatically.
+ * 1. Create a Geode Cache Programmatically.
* 2. Create the example Region Programmatically.
* 3. Populate some query objects on the Region.
* 4. Register a cqQuery listener
@@ -32,7 +32,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// Use the "Tests" namespace for the query objects.
@@ -72,13 +72,13 @@
{
try
{
- // Create a GemFire Cache Programmatically.
+ // Create a Geode Cache Programmatically.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.SetSubscriptionEnabled(true)
.AddServer("localhost", 50505)
.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY);
// Create the example Region programmatically.
@@ -173,16 +173,16 @@
//Close the cq
qry.Close();
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("CqQuery GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("CqQuery Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/DataExpiration.cs b/src/quickstart/csharp/DataExpiration.cs
index b5c6b84..af06b40 100644
--- a/src/quickstart/csharp/DataExpiration.cs
+++ b/src/quickstart/csharp/DataExpiration.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache programmatically.
+ * 1. Create a Geode Cache programmatically.
* 2. Create the example Region with generics support programmatically.
* 3. Set the generic SimpleCacheListener plugin on the Region.
* 4. Put 3 Entries into the Region.
@@ -36,7 +36,7 @@
using System;
using System.Threading;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// Use the .NET generics namespace
@@ -51,12 +51,12 @@
{
try
{
- // Create a GemFire Cache Programmatically.
+ // Create a Geode Cache Programmatically.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.SetSubscriptionEnabled(true)
.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
// Create the example Region programmatically.
@@ -106,16 +106,16 @@
Console.WriteLine("Got {0} keys after the Entry Idle Timeout duration elapsed", keys.Count);
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("DataExpiration GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("DataExpiration Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/Delta.cs b/src/quickstart/csharp/Delta.cs
index 2403e34..21c4cf6 100644
--- a/src/quickstart/csharp/Delta.cs
+++ b/src/quickstart/csharp/Delta.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Get the example Region from the Cache.
* 3. Put an Entry into the Region.
* 4. Set delta for a value.
@@ -35,7 +35,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -47,13 +47,13 @@
{
try
{
- // Create a GemFire Cache through XMLs/clientDelta.xml
+ // Create a Geode Cache through XMLs/clientDelta.xml
Properties<string, string> prop = Properties<string, string>.Create<string, string>();
prop.Insert("cache-xml-file", "XMLs/clientDelta.xml");
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(prop);
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, DeltaExample> region = cache.GetRegion<string, DeltaExample>("exampleRegion");
@@ -86,24 +86,24 @@
//Verification
if( retVal.getField1() != 9 )
- throw new GemFireException("First field should have been 9");
+ throw new GeodeException("First field should have been 9");
if( retVal.getField2() != 15 )
- throw new GemFireException("Second field should have been 15");
+ throw new GeodeException("Second field should have been 15");
if( retVal.getField3() != 20 )
- throw new GemFireException("Third field should have been 20");
+ throw new GeodeException("Third field should have been 20");
Console.WriteLine("Delta has been successfully applied at server");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("Delta GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("Delta Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/DistributedSystem.cs b/src/quickstart/csharp/DistributedSystem.cs
index a0acaf3..6dd484b 100755
--- a/src/quickstart/csharp/DistributedSystem.cs
+++ b/src/quickstart/csharp/DistributedSystem.cs
@@ -20,7 +20,7 @@
* This example connects to two distributed systems.
* This example takes the following steps:
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Now it creates a Pool with poolName1.
* 3. Adds server(localhost:40404) to a pool factory.
* 4. Creates a generic region "root1" with the pool then creates a generic subregion "exampleRegion" with the pool.
@@ -38,7 +38,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespaces
+// Use the Geode namespaces
//using Apache.Geode.Client;
using Apache.Geode.Client;
@@ -102,12 +102,12 @@
{
try
{
- // Create a GemFire Cache.
+ // Create a Geode Cache.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
//test on first distributem system
TestDistributedSystem(cache, "localhost", 40404, "poolName1", "exampleRegion1");
@@ -115,15 +115,15 @@
//test on second distributed system
TestDistributedSystem(cache, "localhost", 40405, "poolName2", "exampleRegion2");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("DistributedSystem GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("DistributedSystem Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/DurableClient.cs b/src/quickstart/csharp/DurableClient.cs
index b6a55fe..e61fd474 100644
--- a/src/quickstart/csharp/DurableClient.cs
+++ b/src/quickstart/csharp/DurableClient.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache with durable client properties Programmatically.
+ * 1. Create a Geode Cache with durable client properties Programmatically.
* 2. Create the example generic Region programmatically.
* 3. Set DurableCacheListener with "AfterRegionLive" implementation to region.
* 4. Register Interest to region with durable option.
@@ -32,7 +32,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -47,13 +47,13 @@
durableProp.Insert("durable-client-id", "DurableClientId");
durableProp.Insert("durable-timeout", "300");
- // Create a Gemfire Cache programmatically.
+ // Create a Geode Cache programmatically.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(durableProp);
Cache cache = cacheFactory.SetSubscriptionEnabled(true)
.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Create the example Region programmatically.
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
@@ -86,21 +86,21 @@
//wait for some time to recieve events
System.Threading.Thread.Sleep(1000);
- // Close the GemFire Cache with keepalive = true. Server will queue events for
+ // Close the Geode Cache with keepalive = true. Server will queue events for
// durable registered keys and will deliver all events when client will reconnect
// within timeout period and send "readyForEvents()"
cache.Close(true);
- Console.WriteLine("Closed the GemFire Cache with keepalive as true");
+ Console.WriteLine("Closed the Geode Cache with keepalive as true");
}
public void RunFeeder()
{
- // Create a GemFire Cache Programmatically.
+ // Create a Geode Cache Programmatically.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY);
@@ -119,10 +119,10 @@
Console.WriteLine("Created Key-1 and Key-2 in region. Durable interest was registered only for Key-1.");
- // Close the GemFire Cache
+ // Close the Geode Cache
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
static void Main(string[] args)
@@ -142,9 +142,9 @@
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("DurableClient GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("DurableClient Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/Exceptions.cs b/src/quickstart/csharp/Exceptions.cs
index 5169bca..8d5bed0 100644
--- a/src/quickstart/csharp/Exceptions.cs
+++ b/src/quickstart/csharp/Exceptions.cs
@@ -21,7 +21,7 @@
* This example takes the following steps:
*
* 1. Create CacheFactory using the user specified settings or from the gfcpp.properties file by default.
- * 2. Create a GemFire Cache.
+ * 2. Create a Geode Cache.
* 3. Get the example generic Regions from the Cache.
* 4. Perform some operations which should cause exceptions.
* 5. Close the Cache.
@@ -32,7 +32,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -52,10 +52,10 @@
Console.WriteLine("Created CacheFactory");
- // Create a GemFire Cache with the "clientExceptions.xml" Cache XML file.
+ // Create a Geode Cache with the "clientExceptions.xml" Cache XML file.
Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Regions from the Cache which are declared in the Cache XML file.
IRegion<object, string> region = cache.GetRegion<object, string>("exampleRegion");
@@ -114,10 +114,10 @@
Console.WriteLine("Expected IllegalStateException: {0}", gfex.Message);
}
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
try
{
@@ -132,9 +132,9 @@
}
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("Exceptions GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("Exceptions Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/ExecuteFunctions.cs b/src/quickstart/csharp/ExecuteFunctions.cs
index 3f898e8..33a06ec 100644
--- a/src/quickstart/csharp/ExecuteFunctions.cs
+++ b/src/quickstart/csharp/ExecuteFunctions.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Get the example Region from the Cache.
* 3. Populate some query objects on the Region.
* 4. Create Execute Objects
@@ -32,7 +32,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
using System.Collections.Generic;
using System.Collections;
@@ -54,7 +54,7 @@
Cache cache = cacheFactory.SetSubscriptionEnabled(true).AddServer("localhost", 50505).AddServer("localhost", 40404).Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
IRegion<string, string> region = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY).Create<string, string>("partition_region");
Console.WriteLine("Created the Region");
@@ -150,15 +150,15 @@
Console.WriteLine("on all servers:result[{0}]={1}.", i, (string)resultList2[i]);
}
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("ExecuteFunctions GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("ExecuteFunctions Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/HACache.cs b/src/quickstart/csharp/HACache.cs
index d667657..62d57a8 100644
--- a/src/quickstart/csharp/HACache.cs
+++ b/src/quickstart/csharp/HACache.cs
@@ -20,8 +20,8 @@
*
* This example takes the following steps:
*
- * 1. Connect to a GemFire Distributed System which has two cache servers.
- * 2. Create a GemFire Cache with redundancy level = 1.
+ * 1. Connect to a Geode Distributed System which has two cache servers.
+ * 2. Create a Geode Cache with redundancy level = 1.
* 3. Get the example generic Region from the Cache.
* 4. Call registerKeys() on the Region.
* 5. Call registerRegex() on the Region.
@@ -35,7 +35,7 @@
using System;
using System.Threading;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -47,7 +47,7 @@
{
try
{
- // Create a GemFire Cache.
+ // Create a Geode Cache.
Apache.Geode.Client.CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientHACache.xml")
@@ -57,7 +57,7 @@
.SetSubscriptionEnabled(true)
.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<object, int> region = cache.GetRegion<object, int>("/exampleRegion");
@@ -116,15 +116,15 @@
Console.WriteLine("Unregistered keys");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("HACache GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("HACache Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/LoaderListenerWriter.cs b/src/quickstart/csharp/LoaderListenerWriter.cs
index ddba119..d7f8c5f 100644
--- a/src/quickstart/csharp/LoaderListenerWriter.cs
+++ b/src/quickstart/csharp/LoaderListenerWriter.cs
@@ -20,8 +20,8 @@
*
* This example takes the following steps:
*
- * 1. Connect to a GemFire Distributed System.
- * 2. Create a GemFire Cache.
+ * 1. Connect to a Geode Distributed System.
+ * 2. Create a Geode Cache.
* 3. Get the generic example Region from the Cache.
* 4. Set the generic SimpleCacheLoader, SimpleCacheListener and SimpleCacheWriter plugins on the Region.
* 5. Put 3 Entries into the Region.
@@ -38,7 +38,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -50,14 +50,14 @@
{
try
{
- // Create a GemFire Cache.
+ // Create a Geode Cache.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientLoaderListenerWriter.xml")
.SetSubscriptionEnabled(true)
.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, string> region = cache.GetRegion<string, string>("/exampleRegion");
@@ -112,15 +112,15 @@
Console.WriteLine("Got expected KeyNotFoundException: {0}", knfex.Message);
}
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("LoaderListenerWriter GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("LoaderListenerWriter Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/MultiuserSecurity.cs b/src/quickstart/csharp/MultiuserSecurity.cs
index 9b08642..4c78718 100755
--- a/src/quickstart/csharp/MultiuserSecurity.cs
+++ b/src/quickstart/csharp/MultiuserSecurity.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache with multiuser enabled.
+ * 1. Create a Geode Cache with multiuser enabled.
* 2. Creates userCache using user "root". Who is authorized to do get and put operations.
* 3. Creates userCache using user "writer2". Who is authorized to do only put operation. It tries to do get operation and gets NotAuthorizedException.
* 4. Close the Cache.
@@ -30,7 +30,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
using System.Collections.Generic;
using System.Collections;
@@ -50,13 +50,13 @@
//to do this one need to setup OpenSSL.
//secProp.Insert("security-client-dhalgo", "Blowfish:128");
- // Connect to the GemFire Distributed System using the settings from the gfcpp.properties file by default.
- // Create a GemFire Cache.
+ // Connect to the Geode Distributed System using the settings from the gfcpp.properties file by default.
+ // Create a Geode Cache.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(null);
Cache cache = cacheFactory.SetMultiuserAuthentication(true).Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY);
@@ -69,7 +69,7 @@
cache.Close();
- Console.WriteLine("Client disconnected from the GemFire Distributed System");
+ Console.WriteLine("Client disconnected from the Geode Distributed System");
}
void runWithUserRoot(Cache cache)
@@ -187,9 +187,9 @@
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("FAILED: MultiuserSecurityExample GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("FAILED: MultiuserSecurityExample Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/PdxInstance.cs b/src/quickstart/csharp/PdxInstance.cs
index 6900fdf..1bb2d06 100755
--- a/src/quickstart/csharp/PdxInstance.cs
+++ b/src/quickstart/csharp/PdxInstance.cs
@@ -21,7 +21,7 @@
*
* This example shows IPdxInstanceFactory and IPdxInstance usage.
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Creates the PdxInstanceFactory for Person class.
* 3. Then creates instance of PdxInstance
* 4. It does put.
@@ -32,7 +32,7 @@
// Use standard namespaces
using System;
using System.Reflection;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
@@ -80,13 +80,13 @@
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
- Console.WriteLine("Connected to the GemFire Distributed System");
+ Console.WriteLine("Connected to the Geode Distributed System");
- // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML file.
+ // Create a Geode Cache with the "clientPdxRemoteQuery.xml" Cache XML file.
// Set SetPdxReadSerialized to true to access PdxInstance
Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientPdxInstance.xml").Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, IPdxInstance> region = cache.GetRegion<string, IPdxInstance>("Person");
@@ -121,16 +121,16 @@
else
Console.WriteLine("PdxInstance doesn't returns all fields value expected");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("PdxInstance GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("PdxInstance Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/PdxRemoteQuery.cs b/src/quickstart/csharp/PdxRemoteQuery.cs
index 73cbde6..cf90a83 100644
--- a/src/quickstart/csharp/PdxRemoteQuery.cs
+++ b/src/quickstart/csharp/PdxRemoteQuery.cs
@@ -22,7 +22,7 @@
* This example shows IPdxSerializable usage with remote query. It can query .NET objects without having corresponding java classes at server.
* Look PortfolioPdx.cs and PositionPdx.cs to know more.
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Get the example Region from the Cache.
* 3. Populate some query Pdx objects on the Region.
* 4. Get the pool, get the Query Service from Pool. Pool is define in clientPdxRemoteQuery.xml.
@@ -35,7 +35,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// Use the "Tests" namespace for the query objects.
@@ -53,12 +53,12 @@
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
- Console.WriteLine("Connected to the GemFire Distributed System");
+ Console.WriteLine("Connected to the Geode Distributed System");
- // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML file.
+ // Create a Geode Cache with the "clientPdxRemoteQuery.xml" Cache XML file.
Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientPdxRemoteQuery.xml").Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, PortfolioPdx> region = cache.GetRegion<string, PortfolioPdx>("Portfolios");
@@ -126,16 +126,16 @@
Console.WriteLine("Region existsValue() returned {0}", existsValue ? "true" : "false");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("PdxRemoteQuery GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("PdxRemoteQuery Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/PdxSerializer.cs b/src/quickstart/csharp/PdxSerializer.cs
index 9f3a826..5d08633 100755
--- a/src/quickstart/csharp/PdxSerializer.cs
+++ b/src/quickstart/csharp/PdxSerializer.cs
@@ -34,7 +34,7 @@
*
* After that test demonstrartes query on .NET objects without having corresponding java classes at server.
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Get the Person from the Cache.
* 3. Populate some query Person objects on the Region.
* 4. Get the pool, get the Query Service from Pool. Pool is define in clientPdxRemoteQuery.xml.
@@ -47,7 +47,7 @@
// Use standard namespaces
using System;
using System.Reflection;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
@@ -173,12 +173,12 @@
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
- Console.WriteLine("Connected to the GemFire Distributed System");
+ Console.WriteLine("Connected to the Geode Distributed System");
- // Create a GemFire Cache with the "clientPdxRemoteQuery.xml" Cache XML file.
+ // Create a Geode Cache with the "clientPdxRemoteQuery.xml" Cache XML file.
Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientPdxSerializer.xml").Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, Person> region = cache.GetRegion<string, Person>("Person");
@@ -234,16 +234,16 @@
}
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("PdxSerializer GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("PdxSerializer Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/PoolCqQuery.cs b/src/quickstart/csharp/PoolCqQuery.cs
index 81b70c7..33ece96 100755
--- a/src/quickstart/csharp/PoolCqQuery.cs
+++ b/src/quickstart/csharp/PoolCqQuery.cs
@@ -21,7 +21,7 @@
* This example takes the following steps:
*
* 1. Create CacheFactory using the user specified properties or from the gfcpp.properties file by default.
- * 2. Create a GemFire Cache.
+ * 2. Create a Geode Cache.
* 3. Get the Portfolios Region from the Pool.
* 4. Populate some query objects on the Region.
* 5. Get the Query Service from cache.
@@ -34,7 +34,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// Use the "Tests" namespace for the query objects.
@@ -81,10 +81,10 @@
Console.WriteLine("Created CacheFactory");
- // Create a GemFire Cache with the "clientPoolCqQuery.xml" Cache XML file.
+ // Create a Geode Cache with the "clientPoolCqQuery.xml" Cache XML file.
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the Portfolios Region from the Cache which is declared in the Cache XML file.
IRegion<string, Portfolio> region = cache.GetRegion<string, Portfolio>("Portfolios");
@@ -176,15 +176,15 @@
//Close the cq
qry.Close();
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("PoolCqQuery GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("PoolCqQuery Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/PoolRemoteQuery.cs b/src/quickstart/csharp/PoolRemoteQuery.cs
index 9b34e4a..1978e6a 100755
--- a/src/quickstart/csharp/PoolRemoteQuery.cs
+++ b/src/quickstart/csharp/PoolRemoteQuery.cs
@@ -20,7 +20,7 @@
* This examples creates pool using locator.
* This example takes the following steps:
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Get the example Region from the Cache.
* 3. Populate some query objects on the Region.
* 4. Get the pool, get the Query Service from Pool. Pool is define in clientRemoteQueryWithPool.xml. Pool has locator to get the server. Apart from that pool is bind to server group "ServerGroup1".
@@ -33,7 +33,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// Use the "Tests" namespace for the query objects.
@@ -51,12 +51,12 @@
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
- Console.WriteLine("Connected to the GemFire Distributed System");
+ Console.WriteLine("Connected to the Geode Distributed System");
- // Create a GemFire Cache with the "clientPoolRemoteQuery.xml" Cache XML file.
+ // Create a Geode Cache with the "clientPoolRemoteQuery.xml" Cache XML file.
Cache cache = cacheFactory.Set("cache-xml-file", "XMLs/clientPoolRemoteQuery.xml").Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, Portfolio> region = cache.GetRegion<string, Portfolio>("Portfolios");
@@ -124,16 +124,16 @@
Console.WriteLine("Region existsValue() returned {0}", existsValue ? "true" : "false");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("PoolRemoteQuery GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("PoolRemoteQuery Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/PoolWithEndpoints.cs b/src/quickstart/csharp/PoolWithEndpoints.cs
index 124a300..4b2dafa 100755
--- a/src/quickstart/csharp/PoolWithEndpoints.cs
+++ b/src/quickstart/csharp/PoolWithEndpoints.cs
@@ -21,7 +21,7 @@
* This example takes the following steps:
*
* 1. Create CacheFactory using the settings from the gfcpp.properties file by default.
- * 2. Create a GemFire Cache.
+ * 2. Create a Geode Cache.
* 3. Create Poolfactory with endpoint and then create pool using poolfactory.
* 4. Create a Example Region programmatically.
* 5. Put Entries (Key and Value pairs) into the Region.
@@ -35,7 +35,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -52,10 +52,10 @@
Console.WriteLine("Created CacheFactory");
- // Create a GemFire Cache.
+ // Create a Geode Cache.
Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
//Create Poolfactory with endpoint and then create pool using poolfactory.
PoolFactory pfact = PoolManager.CreateFactory();
@@ -101,15 +101,15 @@
Console.WriteLine("Destroyed the second Entry in the Region");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("PoolWithEndpoints GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("PoolWithEndpoints Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/PutAllGetAllOperations.cs b/src/quickstart/csharp/PutAllGetAllOperations.cs
index 26cd54c..1b8f562 100644
--- a/src/quickstart/csharp/PutAllGetAllOperations.cs
+++ b/src/quickstart/csharp/PutAllGetAllOperations.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache using CacheFactory. By default it will connect to "localhost" at port 40404".
+ * 1. Create a Geode Cache using CacheFactory. By default it will connect to "localhost" at port 40404".
* 2. Create a Example Region.
* 3. PutAll Entries (Key and Value pairs) into the Region.
* 4. GetAll Entries from the Region.
@@ -32,7 +32,7 @@
using System;
using System.Collections.Generic;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -44,10 +44,10 @@
{
try
{
- //Create a GemFire Cache using CacheFactory. By default it will connect to "localhost" at port 40404".
+ //Create a Geode Cache using CacheFactory. By default it will connect to "localhost" at port 40404".
Cache cache = CacheFactory.CreateCacheFactory().Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
//Set Attributes for the region.
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
@@ -80,15 +80,15 @@
Console.WriteLine("Obtained 100 entries from the Region");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("PutAllGetAllOperations GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("PutAllGetAllOperations Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/RefIDExample.cs b/src/quickstart/csharp/RefIDExample.cs
index ad892c4..c34a966 100644
--- a/src/quickstart/csharp/RefIDExample.cs
+++ b/src/quickstart/csharp/RefIDExample.cs
@@ -20,7 +20,7 @@
* This example creates two pools through XML and sets region attributes using refid.
* This example takes the following steps:
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Now it creates 2 Pools with the names poolName1, poolName2 respectively.
* 3. Sets the region attribute using refid.
* 4. Gets the region "root1" with poolName1, and region "root2" with poolName2.
@@ -36,7 +36,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -53,7 +53,7 @@
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory(prop);
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the Regions from the Cache which is declared in the Cache XML file.
IRegion<string, string> region1 = cache.GetRegion<string, string>("root1");
@@ -105,15 +105,15 @@
Console.WriteLine("Destroyed the second Entry in both the Regions");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("RefIDExample GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("RefIDExample Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/RegisterInterest.cs b/src/quickstart/csharp/RegisterInterest.cs
index ef4a751..ff70d12 100644
--- a/src/quickstart/csharp/RegisterInterest.cs
+++ b/src/quickstart/csharp/RegisterInterest.cs
@@ -21,7 +21,7 @@
* This example takes the following steps:
*
* 1. Create CacheFactory using the user specified properties or from the gfcpp.properties file by default.
- * 2. Create a GemFire Cache.
+ * 2. Create a Geode Cache.
* 3. Get the example Region from the Cache.
* 4. Call registerAllKeys() and unregisterAllKeys() on the Region.
* 5. Call registerKeys() and unregisterKeys() on the Region.
@@ -33,7 +33,7 @@
using System;
using System.Collections.Generic;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -52,10 +52,10 @@
Console.WriteLine("Created CacheFactory");
- // Create a GemFire Cache with the "clientRegisterInterest.xml" Cache XML file.
+ // Create a Geode Cache with the "clientRegisterInterest.xml" Cache XML file.
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, string> region = cache.GetRegion<string, string>("exampleRegion");
@@ -105,15 +105,15 @@
Console.WriteLine("Called RegisterRegex() and UnregisterRegex() with getInitialValues argument");
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("RegisterInterest GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("RegisterInterest Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/RemoteQuery.cs b/src/quickstart/csharp/RemoteQuery.cs
index 7ae7887..b33aae8 100644
--- a/src/quickstart/csharp/RemoteQuery.cs
+++ b/src/quickstart/csharp/RemoteQuery.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache Programmatically.
+ * 1. Create a Geode Cache Programmatically.
* 2. Create the example Region Programmatically.
* 3. Populate some query objects on the Region.
* 4. Execute a query that returns a Result Set.
@@ -33,7 +33,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// Use the "Tests" namespace for the query objects.
@@ -48,11 +48,11 @@
{
try
{
- // Create a GemFire Cache Programmatically.
+ // Create a Geode Cache Programmatically.
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.SetSubscriptionEnabled(true).Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
@@ -143,16 +143,16 @@
Console.WriteLine("Row {0} Column 2 is named {1}, value is {2}", rowCount, st.Set.GetFieldName(0), st[1].ToString());
}
- // Close the GemFire Cache.
+ // Close the Geode Cache.
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("RemoteQuery GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("RemoteQuery Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/Security.cs b/src/quickstart/csharp/Security.cs
index b67441d..882f20a 100644
--- a/src/quickstart/csharp/Security.cs
+++ b/src/quickstart/csharp/Security.cs
@@ -21,7 +21,7 @@
* This example takes the following steps:
*
* 1. Sets the authinit property and the other security properties.
- * 2. Connect to a GemFire Distributed System.
+ * 2. Connect to a Geode Distributed System.
* 3. Does all operations. ( for which it has all permissions)
* 4. Does a put and get. ( for which it have put permission. )
* 5. Does a get and put. ( for which it have get permission. )
@@ -33,7 +33,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
namespace Apache.Geode.Client.QuickStart
@@ -55,7 +55,7 @@
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, string> region = cache.GetRegion<string, string>("exampleRegion");
@@ -98,7 +98,7 @@
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, string> region = cache.GetRegion<string, string>("exampleRegion");
@@ -141,7 +141,7 @@
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire Cache");
+ Console.WriteLine("Created the Geode Cache");
// Get the example Region from the Cache which is declared in the Cache XML file.
IRegion<string, string> region = cache.GetRegion<string, string>("exampleRegion");
@@ -176,9 +176,9 @@
ex.RunSecurityExampleWithGetPermission();
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("SecurityExample GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("SecurityExample Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/Transactions.cs b/src/quickstart/csharp/Transactions.cs
index 38d86ef..dc532a8 100644
--- a/src/quickstart/csharp/Transactions.cs
+++ b/src/quickstart/csharp/Transactions.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Create the example Region Programmatically.
* 3 Begin Transaction
* 4. Put Entries (Key and Value pairs) into the Region.
@@ -38,7 +38,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// Use the .NET generics namespace
@@ -54,12 +54,12 @@
{
try
{
- // Create a GemFire Cache
+ // Create a Geode Cache
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire cache.");
+ Console.WriteLine("Created the Geode cache.");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
@@ -122,12 +122,12 @@
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("Transactions GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("Transactions Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/quickstart/csharp/TransactionsXA.cs b/src/quickstart/csharp/TransactionsXA.cs
index 3f2f6f3..39da327 100644
--- a/src/quickstart/csharp/TransactionsXA.cs
+++ b/src/quickstart/csharp/TransactionsXA.cs
@@ -20,7 +20,7 @@
*
* This example takes the following steps:
*
- * 1. Create a GemFire Cache.
+ * 1. Create a Geode Cache.
* 2. Create the example Region Programmatically.
* 3 Begin Transaction
* 4. Put Entries (Key and Value pairs) into the Region.
@@ -38,7 +38,7 @@
// Use standard namespaces
using System;
-// Use the GemFire namespace
+// Use the Geode namespace
using Apache.Geode.Client;
// Use the .NET generics namespace
@@ -54,12 +54,12 @@
{
try
{
- // Create a GemFire Cache
+ // Create a Geode Cache
CacheFactory cacheFactory = CacheFactory.CreateCacheFactory();
Cache cache = cacheFactory.Create();
- Console.WriteLine("Created the GemFire cache.");
+ Console.WriteLine("Created the Geode cache.");
RegionFactory regionFactory = cache.CreateRegionFactory(RegionShortcut.CACHING_PROXY);
@@ -131,12 +131,12 @@
cache.Close();
- Console.WriteLine("Closed the GemFire Cache");
+ Console.WriteLine("Closed the Geode Cache");
}
// An exception should not occur
- catch (GemFireException gfex)
+ catch (GeodeException gfex)
{
- Console.WriteLine("Transactions GemFire Exception: {0}", gfex.Message);
+ Console.WriteLine("Transactions Geode Exception: {0}", gfex.Message);
}
}
}
diff --git a/src/sqliteimpl/SqLiteImpl.cpp b/src/sqliteimpl/SqLiteImpl.cpp
index a730077..ce64793 100644
--- a/src/sqliteimpl/SqLiteImpl.cpp
+++ b/src/sqliteimpl/SqLiteImpl.cpp
@@ -18,7 +18,7 @@
#include "SqLiteImpl.hpp"
namespace {
-std::string g_default_persistence_directory = "GemFireRegionData";
+std::string g_default_persistence_directory = "GeodeRegionData";
} // namespace
using namespace apache::geode::client;
diff --git a/src/templates/security/csharp/AssemblyInfo.cs b/src/templates/security/csharp/AssemblyInfo.cs
index af6c405..71bff22 100644
--- a/src/templates/security/csharp/AssemblyInfo.cs
+++ b/src/templates/security/csharp/AssemblyInfo.cs
@@ -22,11 +22,11 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("GemFire.NETCacheTemplates")]
-[assembly: AssemblyDescription("Templates for GemFire Native Client .NET Cache")]
+[assembly: AssemblyTitle("Geode.NETCacheTemplates")]
+[assembly: AssemblyDescription("Templates for Geode Native Client .NET Cache")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Pivotal Software, Inc.")]
-[assembly: AssemblyProduct("GemFire.NETCacheTemplates")]
+[assembly: AssemblyProduct("Geode.NETCacheTemplates")]
[assembly: AssemblyCopyright("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.")]
[assembly: AssemblyTrademark("All Rights Reserved")]
[assembly: AssemblyCulture("")]
diff --git a/src/tests/cli/NewFwkLib/CacheServer.cs b/src/tests/cli/NewFwkLib/CacheServer.cs
index 8ad9440..cd6d1d9 100644
--- a/src/tests/cli/NewFwkLib/CacheServer.cs
+++ b/src/tests/cli/NewFwkLib/CacheServer.cs
@@ -228,7 +228,7 @@
(errStr.IndexOf("Deserializ") >= 0))
{
throw new Exception("Test got " + errStr + ", but this error text " +
- "might contain GemFire internal values\n" + ex.Message);
+ "might contain Geode internal values\n" + ex.Message);
}
}
@@ -4370,7 +4370,7 @@
userProp.Insert(KeyStoreFileProp, GetKeyStoreDir(dataDir) +
userName + ".keystore");
userProp.Insert(KeyStoreAliasProp, userName);
- userProp.Insert(KeyStorePasswordProp, "gemfire");
+ userProp.Insert(KeyStorePasswordProp, "geode");
//mu_cache = pool.CreateSecureUserCache(userProp);
//IRegionService mu_cache = CacheHelper.DCache.CreateAuthenticatedView(userProp, pool.Name);
IRegionService mu_cache = CacheHelper<TKey, TVal>.DCache.CreateAuthenticatedView(
diff --git a/src/tests/cli/NewFwkLib/Utils.cs b/src/tests/cli/NewFwkLib/Utils.cs
index 28e1acc..1913a98 100644
--- a/src/tests/cli/NewFwkLib/Utils.cs
+++ b/src/tests/cli/NewFwkLib/Utils.cs
@@ -238,7 +238,7 @@
int status = GFNoError;
Process javaProc;
string javaExePath = gfeDir + PathSep + "bin" + PathSep + exeName;
- Util.ServerLog("Executing local GemFire command {0} {1}", javaExePath,
+ Util.ServerLog("Executing local Geode command {0} {1}", javaExePath,
exeArgs);
if (!Util.StartProcess(javaExePath, exeArgs, false, TempDir,
true, false, false, out javaProc))
@@ -309,9 +309,9 @@
private string GetSslProperty(string hostType, bool forServer,string startDir)
{
string sslCmdStr = null;
- //if (!File.Exists(startDir + PathSep + "gemfire.properties"))
+ //if (!File.Exists(startDir + PathSep + "geode.properties"))
//{
- TextWriter sw = new StreamWriter(startDir + PathSep + "gemfire.properties", false);
+ TextWriter sw = new StreamWriter(startDir + PathSep + "geode.properties", false);
String locatorAddress = GetJavaLocator();
sw.WriteLine("locators={0}", locatorAddress);
ResetKey("sslEnable");
@@ -324,7 +324,7 @@
FwkInfo("ssl is enable");
if (!forServer)
{
- //StreamWriter sw = new StreamWriter("gemfire.properties",false);
+ //StreamWriter sw = new StreamWriter("geode.properties",false);
sw.WriteLine("ssl-enabled=true");
sw.WriteLine("ssl-require-authentication=true");
sw.WriteLine("mcast-port=0");
@@ -595,12 +595,12 @@
if (locatorType != Util.SystemType)
{
FwkInfo(StartRemoteGFExe(locatorHost, locatorType,
- "gemfire", locatorArgs));
+ "geode", locatorArgs));
}
else
{
string outStr;
- int status = StartLocalGFExe("gemfire.bat", gfeDir,
+ int status = StartLocalGFExe("geode.bat", gfeDir,
locatorArgs, out outStr);
if (status == GFTimeout)
{
diff --git a/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs b/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
index a217c76..0471ea2 100644
--- a/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/CredentialGeneratorN.cs
@@ -68,7 +68,7 @@
}
/// <summary>
- /// A set of properties that should be added to the Gemfire system properties
+ /// A set of properties that should be added to the Geode system properties
/// before using the authentication module.
/// </summary>
private Properties<string, string> m_sysProps = null;
@@ -135,7 +135,7 @@
}
/// <summary>
- /// A set of extra properties that should be added to Gemfire system
+ /// A set of extra properties that should be added to Geode system
/// properties when not null.
/// </summary>
public Properties<string, string> SystemProperties
@@ -147,7 +147,7 @@
}
/// <summary>
- /// A set of extra properties that should be added to Gemfire system
+ /// A set of extra properties that should be added to Geode system
/// properties when not null.
/// </summary>
public Properties<string, string> JavaProperties
@@ -247,7 +247,7 @@
/// abstract class.
/// </remarks>
/// <returns>
- /// A set of extra properties that should be added to Gemfire system
+ /// A set of extra properties that should be added to Geode system
/// properties when not null.
/// </returns>
/// <exception cref="IllegalArgumentException">
diff --git a/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs b/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
index f6f8c5c..58a4411 100644
--- a/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/LdapCredentialGeneratorN.cs
@@ -24,7 +24,7 @@
public class LDAPCredentialGenerator : CredentialGenerator
{
- private const string UserPrefix = "gemfire";
+ private const string UserPrefix = "geode";
public LDAPCredentialGenerator()
{
diff --git a/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs b/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
index 0d9cd7b..e42b4aa 100644
--- a/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/PKCSCredentialGeneratorN.cs
@@ -27,7 +27,7 @@
public const string KeyStoreFileProp = "security-keystorepath";
public const string KeyStoreAliasProp = "security-alias";
public const string KeyStorePasswordProp = "security-keystorepass";
- private const string UserPrefix = "gemfire";
+ private const string UserPrefix = "geode";
private bool IsMultiUserMode = false;
Apache.Geode.Client.Tests.PkcsAuthInit Pkcs = null;
@@ -55,7 +55,7 @@
Properties<string, string> props = new Properties<string, string>();
props.Insert(PublicKeyFileProp, GetKeyStoreDir(m_serverDataDir) +
"publickeyfile");
- props.Insert(PublicKeyPassProp, "gemfire");
+ props.Insert(PublicKeyPassProp, "geode");
return props;
}
@@ -85,9 +85,9 @@
Properties<string, string> props = new Properties<string, string>();
int aliasnum = (index % 10) + 1;
props.Insert(KeyStoreFileProp, GetKeyStoreDir(m_clientDataDir) +
- "gemfire11.keystore");
- props.Insert(KeyStoreAliasProp, "gemfire11");
- props.Insert(KeyStorePasswordProp, "gemfire");
+ "geode11.keystore");
+ props.Insert(KeyStoreAliasProp, "geode11");
+ props.Insert(KeyStorePasswordProp, "geode");
if (!IsMultiUserMode){
return props;
}
@@ -111,7 +111,7 @@
props.Insert(KeyStoreFileProp, GetKeyStoreDir(m_clientDataDir) +
UserPrefix + aliasnum + ".keystore");
props.Insert(KeyStoreAliasProp, UserPrefix + aliasnum);
- props.Insert(KeyStorePasswordProp, "gemfire");
+ props.Insert(KeyStorePasswordProp, "geode");
if (!IsMultiUserMode){
return props;
}
@@ -135,7 +135,7 @@
props.Insert(KeyStoreFileProp, GetKeyStoreDir(m_clientDataDir) +
userName + ".keystore");
props.Insert(KeyStoreAliasProp, userName);
- props.Insert(KeyStorePasswordProp, "gemfire");
+ props.Insert(KeyStorePasswordProp, "geode");
if (!IsMultiUserMode)
{
return props;
diff --git a/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs b/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
index 50f732e..e10160a 100644
--- a/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
+++ b/src/tests/cli/SecurityUtil/XmlAuthzCredentialGeneratorN.cs
@@ -222,7 +222,7 @@
private string GetLdapUser(Role roleType, int index)
{
- const string userPrefix = "gemfire";
+ const string userPrefix = "geode";
int[] readerIndices = { 3, 4, 5 };
int[] writerIndices = { 6, 7, 8 };
int[] queryIndices = { 9, 10 };
diff --git a/src/tests/cpp/security/CredentialGenerator.hpp b/src/tests/cpp/security/CredentialGenerator.hpp
index f6158aa..506f945 100644
--- a/src/tests/cpp/security/CredentialGenerator.hpp
+++ b/src/tests/cpp/security/CredentialGenerator.hpp
@@ -211,7 +211,7 @@
std::string(" --J=-Dgemfire.security-publickey-filepath=") +
this->getPublickeyfile();
securityCmdStr +=
- std::string(" --J=-Dgemfire.security-publickey-pass=gemfire");
+ std::string(" --J=-Dgemfire.security-publickey-pass=geode");
}
if ((securityParams.find("dummy") != std::string::npos) &&
(!this->getClientDummyAuthorizer().empty())) {
diff --git a/src/tests/cpp/security/LdapUserCredentialGenerator.hpp b/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
index cb1520c..632ce12 100644
--- a/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
+++ b/src/tests/cpp/security/LdapUserCredentialGenerator.hpp
@@ -83,16 +83,16 @@
return "javaobject.DummyAuthorization.create";
}
void getValidCredentials(PropertiesPtr& p) {
- p->insert("security-username", "gemfire1");
- p->insert("security-password", "gemfire1");
+ p->insert("security-username", "geode1");
+ p->insert("security-password", "geode1");
FWKDEBUG("inserted valid security-username "
<< p->find("security-username")->asChar() << " password "
<< p->find("security-password")->asChar());
}
void getInvalidCredentials(PropertiesPtr& p) {
- p->insert("security-username", "gemfire1");
- p->insert("security-password", "1gemfire");
+ p->insert("security-username", "geode1");
+ p->insert("security-password", "1geode");
FWKDEBUG("inserted invalid security-username "
<< p->find("security-username")->asChar() << " password "
<< p->find("security-password")->asChar());
diff --git a/src/tests/cpp/security/PkcsCredentialGenerator.hpp b/src/tests/cpp/security/PkcsCredentialGenerator.hpp
index 8c52c6f..2bc509c 100644
--- a/src/tests/cpp/security/PkcsCredentialGenerator.hpp
+++ b/src/tests/cpp/security/PkcsCredentialGenerator.hpp
@@ -99,8 +99,8 @@
void setPKCSProperties(PropertiesPtr& p, char* username) {
char keyStorePassWord[1024];
- sprintf(keyStorePassWord, "%s", "gemfire");
- p->insert(SECURITY_USERNAME, "gemfire");
+ sprintf(keyStorePassWord, "%s", "geode");
+ p->insert(SECURITY_USERNAME, "geode");
p->insert(KEYSTORE_ALIAS, username);
p->insert(KEYSTORE_PASSWORD, keyStorePassWord);
insertKeyStorePath(p, username);
@@ -108,7 +108,7 @@
void getValidCredentials(PropertiesPtr& p) {
char username[20] = {'\0'};
- sprintf(username, "gemfire%d", (rand() % 10) + 1);
+ sprintf(username, "geode%d", (rand() % 10) + 1);
setPKCSProperties(p, username);
FWKINFO("inserted valid security-username "
<< p->find("security-username")->asChar());
@@ -116,7 +116,7 @@
void getInvalidCredentials(PropertiesPtr& p) {
char username[20] = {'\0'};
- sprintf(username, "%dgemfire", (rand() % 11) + 1);
+ sprintf(username, "%dgeode", (rand() % 11) + 1);
setPKCSProperties(p, username);
FWKINFO("inserted invalid security-username "
<< p->find("security-username")->asChar());
diff --git a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
index ff0020f..51c5e07 100644
--- a/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
+++ b/src/tests/cpp/security/XmlAuthzCredentialGenerator.hpp
@@ -195,7 +195,7 @@
}
std::string getAllowedUser(ROLES role) {
- const std::string userPrefix = "gemfire";
+ const std::string userPrefix = "geode";
const int readerIndices[] = {3, 4, 5};
const int writerIndices[] = {6, 7, 8};
const int queryIndices[] = {9, 10};
@@ -250,7 +250,7 @@
void getAllowedPkcsAuthz(ROLES role) {
const std::string userName = getAllowedUser(role);
(*m_prop)->insert("security-alias", userName.c_str());
- (*m_prop)->insert("security-keystorepass", "gemfire");
+ (*m_prop)->insert("security-keystorepass", "geode");
FWKINFO("inserted PKCS security-alias"
<< (*m_prop)->find("security-alias")->asChar() << " password "
