http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/plugins/DurableCacheListener.hpp ---------------------------------------------------------------------- diff --git a/src/quickstart/cpp/plugins/DurableCacheListener.hpp b/src/quickstart/cpp/plugins/DurableCacheListener.hpp index b582208..738f41e 100644 --- a/src/quickstart/cpp/plugins/DurableCacheListener.hpp +++ b/src/quickstart/cpp/plugins/DurableCacheListener.hpp @@ -19,15 +19,15 @@ * DurableClient QuickStart Example. * * This is to use newly added listener callback "afterRegionLive" - * It merely prints the events captured from the GemFire Native Client. + * It merely prints the events captured from the Geode Native Client. * */ -// Include the GemFire library. +// Include the Geode library. #include <gfcpp/GeodeCppCache.hpp> #include <gfcpp/CacheListener.hpp> -// Use the "gemfire" namespace. +// Use the "geode" namespace. using namespace apache::geode::client; // The SimpleCacheListener class.
http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/plugins/SimpleCacheListener.hpp ---------------------------------------------------------------------- diff --git a/src/quickstart/cpp/plugins/SimpleCacheListener.hpp b/src/quickstart/cpp/plugins/SimpleCacheListener.hpp index c35d5fb..fef7be2 100644 --- a/src/quickstart/cpp/plugins/SimpleCacheListener.hpp +++ b/src/quickstart/cpp/plugins/SimpleCacheListener.hpp @@ -19,15 +19,15 @@ * SimpleCacheListener QuickStart Example. * * This is a simple implementation of a Cache Listener - * It merely prints the events captured from the GemFire Native Client. + * It merely prints the events captured from the Geode Native Client. * */ -// Include the GemFire library. +// Include the Geode library. #include <gfcpp/GeodeCppCache.hpp> #include <gfcpp/CacheListener.hpp> -// Use the "gemfire" namespace. +// Use the "geode" namespace. using namespace apache::geode::client; // The SimpleCacheListener class. http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp ---------------------------------------------------------------------- diff --git a/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp b/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp index 95959f0..17e6fff 100644 --- a/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp +++ b/src/quickstart/cpp/plugins/SimpleCacheLoader.hpp @@ -19,15 +19,15 @@ * SimpleCacheLoader QuickStart Example. * * This is a simple implementation of a Cache Loader - * It merely prints the events captured from the GemFire Native Client. + * It merely prints the events captured from the Geode Native Client. * */ -// Include the GemFire library. +// Include the Geode library. #include <gfcpp/GeodeCppCache.hpp> #include <gfcpp/CacheLoader.hpp> -// Use the "gemfire" namespace. +// Use the "geode" namespace. using namespace apache::geode::client; // The SimpleCacheLoader class. http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp ---------------------------------------------------------------------- diff --git a/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp b/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp index 3bedc90..61f16a4 100644 --- a/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp +++ b/src/quickstart/cpp/plugins/SimpleCacheWriter.hpp @@ -19,15 +19,15 @@ * SimpleCacheWriter QuickStart Example. * * This is a simple implementation of a Cache Writer - * It merely prints the events captured from the GemFire Native Client. + * It merely prints the events captured from the Geode Native Client. * */ -// Include the GemFire library. +// Include the Geode library. #include <gfcpp/GeodeCppCache.hpp> #include <gfcpp/CacheWriter.hpp> -// Use the "gemfire" namespace. +// Use the "geode" namespace. using namespace apache::geode::client; // The SimpleCacheWriter class. http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/runcpp.bat.in ---------------------------------------------------------------------- diff --git a/src/quickstart/runcpp.bat.in b/src/quickstart/runcpp.bat.in index 1b527fa..ed8a836 100755 --- a/src/quickstart/runcpp.bat.in +++ b/src/quickstart/runcpp.bat.in @@ -2,19 +2,19 @@ setlocal rem GFCPP must be set -rem GEMFIRE must be set +rem GEODE must be set rem OPENSSL must be set for Security example -if not "%GFCPP%"=="" goto checkGEMFIRE +if not "%GFCPP%"=="" goto checkGEODE echo GFCPP is not set. goto finished -:checkGEMFIRE +:checkGEODE -if not "%GEMFIRE%"=="" goto checkOPENSSL +if not "%GEODE%"=="" goto checkOPENSSL -echo GEMFIRE is not set. +echo GEODE is not set. goto finished :checkOPENSSL @@ -39,10 +39,10 @@ set exname=%1 if not exist %LANGDIR%\%exname%.exe goto presentmenu echo. -echo Running GemFire %LANG% QuickStart example %exname% ... +echo Running Geode %LANG% QuickStart example %exname% ... -set CLASSPATH=%CLASSPATH%;${NATIVECLIENT_DIR}\SampleCode\quickstart\lib\javaobject.jar;%GEMFIRE%\lib\gfSecurityImpl.jar -set PATH=%GEMFIRE%\bin;%PATH%;%GEMFIRE%\bin;%GFCPP%\bin;%OPENSSL%\bin;..\bin; +set CLASSPATH=%CLASSPATH%;${NATIVECLIENT_DIR}\SampleCode\quickstart\lib\javaobject.jar;%GEODE%\lib\gfSecurityImpl.jar +set PATH=%GEODE%\bin;%PATH%;%GEODE%\bin;%GFCPP%\bin;%OPENSSL%\bin;..\bin; if not exist gfecs mkdir gfecs @@ -120,7 +120,7 @@ if '%exname%' neq 'MultiuserSecurity' goto :skipsecuritystart :startserverforsecurity -call gfsh start server --cache-xml-file=${CMAKE_BINARY_DIR}/XMLs/server%exname%.xml --mcast-port=0 --dir=gfecs --J=-Dsecurity-client-authenticator=templates.security.PKCSAuthenticator.create --J=-Dsecurity-publickey-filepath=${CMAKE_BINARY_DIR}keystore/publickeyfile --J=-Dsecurity-publickey-pass=gemfire --J=-Dsecurity-authz-xml-uri=${CMAKE_BINARY_DIR}/XMLs/authz-pkcs.xml --J=-Dsecurity-client-accessor=templates.security.XmlAuthorization.create --name=the-server --include-system-classpath +call gfsh start server --cache-xml-file=${CMAKE_BINARY_DIR}/XMLs/server%exname%.xml --mcast-port=0 --dir=gfecs --J=-Dsecurity-client-authenticator=templates.security.PKCSAuthenticator.create --J=-Dsecurity-publickey-filepath=${CMAKE_BINARY_DIR}keystore/publickeyfile --J=-Dsecurity-publickey-pass=geode --J=-Dsecurity-authz-xml-uri=${CMAKE_BINARY_DIR}/XMLs/authz-pkcs.xml --J=-Dsecurity-client-accessor=templates.security.XmlAuthorization.create --name=the-server --include-system-classpath if '%exname%' neq 'MultiuserSecurity' goto :skipsecuritystart @@ -197,7 +197,7 @@ goto closeup :presentmenu echo. -echo Please select a GemFire %LANG% QuickStart example to run. +echo Please select a Geode %LANG% QuickStart example to run. echo. echo 1. BasicOperations echo 2. DataExpiration http://git-wip-us.apache.org/repos/asf/geode/blob/63d531ee/src/quickstart/runcpp.sh.in ---------------------------------------------------------------------- diff --git a/src/quickstart/runcpp.sh.in b/src/quickstart/runcpp.sh.in index f7102d8..01a13db 100755 --- a/src/quickstart/runcpp.sh.in +++ b/src/quickstart/runcpp.sh.in @@ -1,7 +1,7 @@ #!/bin/bash -if [ -z $GEMFIRE ]; then - echo GEMFIRE is not set. +if [ -z $GEODE ]; then + echo GEODE is not set. exit 1 fi if [ -z $OPENSSL ]; then @@ -27,7 +27,7 @@ then exname=$1 else if [ -t 0 ]; then - echo Please select a GemFire C++ QuickStart example to run. + echo Please select a Geode C++ QuickStart example to run. echo echo 1. BasicOperations echo 2. DataExpiration @@ -145,10 +145,10 @@ else done fi -echo Running GemFire C++ QuickStart example $exname ... +echo Running Geode C++ QuickStart example $exname ... -export CLASSPATH="$CLASSPATH:${NATIVECLIENT_DIR}/SampleCode/quickstart/lib/javaobject.jar:$GEMFIRE/lib/gfSecurityImpl.jar" -export PATH="$PATH:$GEMFIRE/bin" +export CLASSPATH="$CLASSPATH:${NATIVECLIENT_DIR}/SampleCode/quickstart/lib/javaobject.jar:$GEODE/lib/gfSecurityImpl.jar" +export PATH="$PATH:$GEODE/bin" if [ -z "$LD_LIBRARY_PATH" ] then LD_LIBRARY_PATH=${NATIVECLIENT_DIR}/lib @@ -207,7 +207,7 @@ else --include-system-classpath \ --J=-Dsecurity-client-authenticator=templates.security.PKCSAuthenticator.create \ --J=-Dsecurity-publickey-filepath=${CMAKE_BINARY_DIR}/keystore/publickeyfile \ - --J=-Dsecurity-publickey-pass=gemfire \ + --J=-Dsecurity-publickey-pass=geode \ --J=-Dsecurity-authz-xml-uri=${CMAKE_BINARY_DIR}/XMLs/authz-pkcs.xml \ --J=-Dsecurity-client-accessor=templates.security.XmlAuthorization.create fi