You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/21 16:37:48 UTC
[3/6] incubator-geode git commit: GEODE-1567: update
golden-help-offline for HelpCommandsIntegrationTest
GEODE-1567: update golden-help-offline for HelpCommandsIntegrationTest
* update golden-help-offline.properties to match changes made for GEODE-985 and GEODE-1408
* restore geode.properties back to gemfire.properties in CliStrings until GEODE-1466 is completed
* restore GeodeRedisServer back to GemFireRedisServer in CliStrings until GEODE-1566 is completed
* fix typo for cacheLoader default in CreateAlterDestroyRegionCommands from "help" to "null"
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/858bc354
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/858bc354
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/858bc354
Branch: refs/heads/feature/GEODE-1565
Commit: 858bc35445a861acdcc2d2f678466d903987cbba
Parents: 0296476
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Jun 20 12:47:56 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Jun 20 12:47:56 2016 -0700
----------------------------------------------------------------------
.../CreateAlterDestroyRegionCommands.java | 2 +-
.../internal/cli/i18n/CliStrings.java | 8 +-
.../commands/HelpCommandsIntegrationTest.java | 4 +
.../cli/commands/golden-help-offline.properties | 82 ++++++++++----------
4 files changed, 50 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/858bc354/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
index 741da25..e525f37 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
@@ -498,7 +498,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
String[] cacheListeners,
@CliOption (key = CliStrings.ALTER_REGION__CACHELOADER,
unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
- specifiedDefaultValue = "help",
+ specifiedDefaultValue = "null",
help = CliStrings.ALTER_REGION__CACHELOADER__HELP)
String cacheLoader,
@CliOption (key = CliStrings.ALTER_REGION__CACHEWRITER,
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/858bc354/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
index d5ebe4c..9b38fac 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
@@ -1627,7 +1627,7 @@ public class CliStrings {
public static final String START_LOCATOR__LOG_LEVEL = LOG_LEVEL;
public static final String START_LOCATOR__LOG_LEVEL__HELP = "Sets the level of output logged to the Locator log file. Possible values for log-level include: finest, finer, fine, config, info, warning, severe, none.";
public static final String START_LOCATOR__MCAST_ADDRESS = MCAST_ADDRESS;
- public static final String START_LOCATOR__MCAST_ADDRESS__HELP = "The IP address or hostname used to bind the UPD socket for multi-cast networking so the Locator can communicate other members in the Geode cluster using a common multicast address and port. If mcast-port is zero, then mcast-address is ignored.";
+ public static final String START_LOCATOR__MCAST_ADDRESS__HELP = "The IP address or hostname used to bind the UPD socket for multi-cast networking so the Locator can communicate with other members in the Geode cluster using a common multicast address and port. If mcast-port is zero, then mcast-address is ignored.";
public static final String START_LOCATOR__MCAST_PORT = MCAST_PORT;
public static final String START_LOCATOR__MCAST_PORT__HELP = "Sets the port used for multi-cast networking so the Locator can communicate with other members of the Geode cluster. A zero value disables mcast.";
public static final String START_LOCATOR__MEMBER_NAME = "name";
@@ -1635,7 +1635,7 @@ public class CliStrings {
public static final String START_LOCATOR__PORT = "port";
public static final String START_LOCATOR__PORT__HELP = "Port the Locator will listen on.";
public static final String START_LOCATOR__PROPERTIES = "properties-file";
- public static final String START_LOCATOR__PROPERTIES__HELP = "The geode.properties file for configuring the Locator's distributed system. The file's path can be absolute or relative to the gfsh working directory (--dir=).";
+ public static final String START_LOCATOR__PROPERTIES__HELP = "The gemfire.properties file for configuring the Locator's distributed system. The file's path can be absolute or relative to the gfsh working directory (--dir=)."; // TODO:GEODE-1466: update golden file to geode.properties
public static final String START_LOCATOR__SECURITY_PROPERTIES = "security-properties-file";
public static final String START_LOCATOR__SECURITY_PROPERTIES__HELP = "The gfsecurity.properties file for configuring the Locator's security configuration in the distributed system. The file's path can be absolute or relative to gfsh directory (--dir=).";
public static final String START_LOCATOR__INITIALHEAP = "initial-heap";
@@ -1736,13 +1736,13 @@ public class CliStrings {
public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE = ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE__HELP = "The total size of off-heap memory specified as off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates whether the size should be interpreted as gigabytes or megabytes. A non-zero size causes that much memory to be allocated from the operating system and reserved for off-heap use.";
public static final String START_SERVER__PROPERTIES = "properties-file";
- public static final String START_SERVER__PROPERTIES__HELP = "The geode.properties file for configuring the Cache Server's distributed system. The file's path can be absolute or relative to the gfsh working directory.";
+ public static final String START_SERVER__PROPERTIES__HELP = "The gemfire.properties file for configuring the Cache Server's distributed system. The file's path can be absolute or relative to the gfsh working directory."; // TODO:GEODE-1466: update golden file to geode.properties
public static final String START_SERVER__REDIS_PORT = ConfigurationProperties.REDIS_PORT;
public static final String START_SERVER__REDIS_PORT__HELP = "Sets the port that the Geode Redis service listens on for Redis clients.";
public static final String START_SERVER__REDIS_BIND_ADDRESS = ConfigurationProperties.REDIS_BIND_ADDRESS;
public static final String START_SERVER__REDIS_BIND_ADDRESS__HELP = "Sets the IP address the Geode Redis service listens on for Redis clients. The default is to bind to the first non-loopback address for this machine.";
public static final String START_SERVER__REDIS_PASSWORD = ConfigurationProperties.REDIS_PASSWORD;
- public static final String START_SERVER__REDIS_PASSWORD__HELP = "Sets the authentication password for GeodeRedisServer";
+ public static final String START_SERVER__REDIS_PASSWORD__HELP = "Sets the authentication password for GemFireRedisServer"; // TODO:GEODE-1566: update golden file to GeodeRedisServer
public static final String START_SERVER__SECURITY_PROPERTIES = "security-properties-file";
public static final String START_SERVER__SECURITY_PROPERTIES__HELP = "The gfsecurity.properties file for configuring the Server's security configuration in the distributed system. The file's path can be absolute or relative to gfsh directory.";
public static final String START_SERVER__REBALANCE = "rebalance";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/858bc354/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
index bbb11db..7959037 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
@@ -74,6 +74,10 @@ public class HelpCommandsIntegrationTest {
}
}
+ /**
+ * TODO:GEODE-1466: update golden file to geode.properties
+ * TODO:GEODE-1566: update golden file to GeodeRedisServer
+ */
@Test
public void testOfflineHelp() throws Exception {
Properties helpProps = new Properties();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/858bc354/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties
index 0cd7a07..7a83679 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/management/internal/cli/commands/golden-help-offline.properties
@@ -131,7 +131,7 @@ PARAMETERS\n\
\ \ \ \ entry-idle-time-expiration-action\n\
\ \ \ \ \ \ \ \ Action to be taken on an entry that has exceeded the idle expiration.\n\
\ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): __DEFAULT__\n\
+\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): INVALIDATE\n\
\ \ \ \ entry-time-to-live-expiration\n\
\ \ \ \ \ \ \ \ How long the region's entries can remain in the cache without being accessed or updated.\n\
\ \ \ \ \ \ \ \ The default is no expiration of this type.\n\
@@ -140,7 +140,7 @@ PARAMETERS\n\
\ \ \ \ entry-time-to-live-expiration-action\n\
\ \ \ \ \ \ \ \ Action to be taken on an entry that has exceeded the TTL expiration.\n\
\ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): __DEFAULT__\n\
+\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): INVALIDATE\n\
\ \ \ \ region-idle-time-expiration\n\
\ \ \ \ \ \ \ \ How long the region can remain in the cache without being accessed. The default is no\n\
\ \ \ \ \ \ \ \ expiration of this type.\n\
@@ -149,7 +149,7 @@ PARAMETERS\n\
\ \ \ \ region-idle-time-expiration-action\n\
\ \ \ \ \ \ \ \ Action to be taken on a region that has exceeded the idle expiration.\n\
\ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): __DEFAULT__\n\
+\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): INVALIDATE\n\
\ \ \ \ region-time-to-live-expiration\n\
\ \ \ \ \ \ \ \ How long the region can remain in the cache without being accessed or updated. The default\n\
\ \ \ \ \ \ \ \ is no expiration of this type.\n\
@@ -158,7 +158,7 @@ PARAMETERS\n\
\ \ \ \ region-time-to-live-expiration-action\n\
\ \ \ \ \ \ \ \ Action to be taken on a region that has exceeded the TTL expiration.\n\
\ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): __DEFAULT__\n\
+\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): INVALIDATE\n\
\ \ \ \ cache-listener\n\
\ \ \ \ \ \ \ \ Fully qualified class name of a plug-in to be instantiated for receiving after-event\n\
\ \ \ \ \ \ \ \ notification of changes to the region and its entries. Any number of cache listeners can be\n\
@@ -170,13 +170,13 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ region. For distributed regions, a cache loader may be invoked remotely from other members\n\
\ \ \ \ \ \ \ \ that have the region defined.\n\
\ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): __DEFAULT__\n\
+\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): null\n\
\ \ \ \ cache-writer\n\
\ \ \ \ \ \ \ \ Fully qualified class name of a plug-in to be instantiated for receiving before-event\n\
\ \ \ \ \ \ \ \ notification of changes to the region and its entries. The plug-in may cancel the event. At\n\
\ \ \ \ \ \ \ \ most, one cache writer can be defined in each member for the region.\n\
\ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): __DEFAULT__\n\
+\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): null\n\
\ \ \ \ async-event-queue-id\n\
\ \ \ \ \ \ \ \ IDs of the Async Event Queues that will be used for write-behind operations.\n\
\ \ \ \ \ \ \ \ Required: false\n\
@@ -409,7 +409,7 @@ NAME\n\
IS AVAILABLE\n\
\ \ \ \ false\n\
SYNOPSIS\n\
-\ \ \ \ Configures GemFire's Portable Data eXchange for all the cache(s) in the cluster. This command\n\
+\ \ \ \ Configures Geode's Portable Data eXchange for all the cache(s) in the cluster. This command\n\
\ \ \ \ would not take effect on the running members in the system.\n\
\ \ \ \ \ This command persists the pdx configuration in the locator with cluster configuration service.\n\
\ \ \ \ \n\
@@ -477,7 +477,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Network address of the jmx-manager in the form: host[port].\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ use-http\n\
-\ \ \ \ \ \ \ \ Connects to Manager by sending HTTP requests to HTTP service hostint the Management REST\n\
+\ \ \ \ \ \ \ \ Connects to Manager by sending HTTP requests to HTTP service hosting the Management REST\n\
\ \ \ \ \ \ \ \ API. You must first 'disconnect' in order to reconnect to the Manager via locator or\n\
\ \ \ \ \ \ \ \ jmx-manager using JMX.\n\
\ \ \ \ \ \ \ \ Required: false\n\
@@ -910,7 +910,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Group(s) of members on which the region will be created.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ skip-if-exists\n\
-\ \ \ \ \ \ \ \ Skip region ceation if the region already exists.\n\
+\ \ \ \ \ \ \ \ Skip region creation if the region already exists.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): true\n\
\ \ \ \ \ \ \ \ Default (if the parameter is not specified): true\n\
@@ -937,7 +937,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Central Region with which this region should be colocated.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ compressor\n\
-\ \ \ \ \ \ \ \ The fully-qualifed class name of the Compressor to use when compressing region entry\n\
+\ \ \ \ \ \ \ \ The fully-qualified class name of the Compressor to use when compressing region entry\n\
\ \ \ \ \ \ \ \ values. The default is no compression.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ concurrency-level\n\
@@ -1485,7 +1485,7 @@ NAME\n\
IS AVAILABLE\n\
\ \ \ \ true\n\
SYNOPSIS\n\
-\ \ \ \ Export region data from an offline disk store into gemfire snapshot files.\n\
+\ \ \ \ Export region data from an offline disk store into Geode snapshot files.\n\
SYNTAX\n\
\ \ \ \ export offline-disk-store --name=value --disk-dirs=value(,value)* --dir=value\n\
PARAMETERS\n\
@@ -2157,7 +2157,7 @@ NAME\n\
IS AVAILABLE\n\
\ \ \ \ false\n\
SYNOPSIS\n\
-\ \ \ \ Display any deadlocks in the GemFire distributed system.\n\
+\ \ \ \ Display any deadlocks in the Geode distributed system.\n\
SYNTAX\n\
\ \ \ \ show dead-locks --file=value\n\
PARAMETERS\n\
@@ -2329,7 +2329,7 @@ IS AVAILABLE\n\
\ \ \ \ true\n\
SYNOPSIS\n\
\ \ \ \ Start the JDK's JConsole tool in a separate process. JConsole will be launched, but connecting\n\
-\ \ \ \ to GemFire must be done manually.\n\
+\ \ \ \ to Geode must be done manually.\n\
SYNTAX\n\
\ \ \ \ start jconsole [--interval=value] [--notile(=value)?] [--pluginpath=value] [--version(=value)?]\n\
\ \ \ \ [--J=value(,value)*]\n\
@@ -2367,7 +2367,7 @@ IS AVAILABLE\n\
\ \ \ \ true\n\
SYNOPSIS\n\
\ \ \ \ Start the JDK's Java VisualVM (jvisualvm) tool in a separate process. Java VisualVM will be\n\
-\ \ \ \ launched, but connecting to GemFire must be done manually.\n\
+\ \ \ \ launched, but connecting to Geode must be done manually.\n\
SYNTAX\n\
\ \ \ \ start jvisualvm [--J=value(,value)*]\n\
PARAMETERS\n\
@@ -2392,7 +2392,7 @@ SYNTAX\n\
\ \ \ \ [--cluster-config-dir=value]\n\
PARAMETERS\n\
\ \ \ \ name\n\
-\ \ \ \ \ \ \ \ The member name to give this Locator in the GemFire cluster.\n\
+\ \ \ \ \ \ \ \ The member name to give this Locator in the Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: true\n\
\ \ \ \ bind-address\n\
\ \ \ \ \ \ \ \ IP address on which the Locator will be bound. By default, the Locator is bound to all\n\
@@ -2421,7 +2421,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): true\n\
\ \ \ \ \ \ \ \ Default (if the parameter is not specified): false\n\
\ \ \ \ locators\n\
-\ \ \ \ \ \ \ \ Sets the list of Locators used by this Locator to join the appropriate GemFire cluster.\n\
+\ \ \ \ \ \ \ \ Sets the list of Locators used by this Locator to join the appropriate Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ log-level\n\
\ \ \ \ \ \ \ \ Sets the level of output logged to the Locator log file. Possible values for log-level\n\
@@ -2429,12 +2429,12 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ mcast-address\n\
\ \ \ \ \ \ \ \ The IP address or hostname used to bind the UPD socket for multi-cast networking so the\n\
-\ \ \ \ \ \ \ \ Locator can communicate other members in the GemFire cluster using a common multicast\n\
+\ \ \ \ \ \ \ \ Locator can communicate with other members in the Geode cluster using a common multicast\n\
\ \ \ \ \ \ \ \ address and port. If mcast-port is zero, then mcast-address is ignored.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ mcast-port\n\
\ \ \ \ \ \ \ \ Sets the port used for multi-cast networking so the Locator can communicate with other\n\
-\ \ \ \ \ \ \ \ members of the GemFire cluster. A zero value disables mcast.\n\
+\ \ \ \ \ \ \ \ members of the Geode cluster. A zero value disables mcast.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ port\n\
\ \ \ \ \ \ \ \ Port the Locator will listen on.\n\
@@ -2504,7 +2504,7 @@ NAME\n\
IS AVAILABLE\n\
\ \ \ \ true\n\
SYNOPSIS\n\
-\ \ \ \ Start a GemFire Cache Server.\n\
+\ \ \ \ Start a Geode Cache Server.\n\
SYNTAX\n\
\ \ \ \ start server --name=value [--assign-buckets(=value)?] [--bind-address=value]\n\
\ \ \ \ [--cache-xml-file=value] [--classpath=value] [--critical-heap-percentage=value]\n\
@@ -2562,7 +2562,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): true\n\
\ \ \ \ \ \ \ \ Default (if the parameter is not specified): false\n\
\ \ \ \ enable-time-statistics\n\
-\ \ \ \ \ \ \ \ Causes additional time-based statistics to be gathered for GemFire operations.\n\
+\ \ \ \ \ \ \ \ Causes additional time-based statistics to be gathered for Geode operations.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): true\n\
\ \ \ \ eviction-heap-percentage\n\
@@ -2609,14 +2609,14 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ will set the system property "foo.bar" to "true".\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ locators\n\
-\ \ \ \ \ \ \ \ Sets the list of Locators used by the Cache Server to join the appropriate GemFire cluster.\n\
+\ \ \ \ \ \ \ \ Sets the list of Locators used by the Cache Server to join the appropriate Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ locator-wait-time\n\
\ \ \ \ \ \ \ \ Sets the number of seconds the server will wait for a locator to become available during\n\
\ \ \ \ \ \ \ \ startup before giving up.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ lock-memory\n\
-\ \ \ \ \ \ \ \ Causes GemFire to lock heap and off-heap memory pages into RAM. This prevents the operating\n\
+\ \ \ \ \ \ \ \ Causes Geode to lock heap and off-heap memory pages into RAM. This prevents the operating\n\
\ \ \ \ \ \ \ \ system from swapping the pages out to disk, which can cause severe performance degradation.\n\
\ \ \ \ \ \ \ \ When you use this option, also configure the operating system limits for locked memory.\n\
\ \ \ \ \ \ \ \ Required: false\n\
@@ -2641,29 +2641,29 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ mcast-address\n\
\ \ \ \ \ \ \ \ The IP address or hostname used to bind the UPD socket for multi-cast networking so the\n\
-\ \ \ \ \ \ \ \ Cache Server can communicate with other members in the GemFire cluster. If mcast-port is\n\
+\ \ \ \ \ \ \ \ Cache Server can communicate with other members in the Geode cluster. If mcast-port is\n\
\ \ \ \ \ \ \ \ zero, then mcast-address is ignored.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ mcast-port\n\
\ \ \ \ \ \ \ \ Sets the port used for multi-cast networking so the Cache Server can communicate with other\n\
-\ \ \ \ \ \ \ \ members of the GemFire cluster. A zero value disables mcast.\n\
+\ \ \ \ \ \ \ \ members of the Geode cluster. A zero value disables mcast.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ memcached-port\n\
-\ \ \ \ \ \ \ \ Sets the port that the GemFire memcached service listens on for memcached clients.\n\
+\ \ \ \ \ \ \ \ Sets the port that the Geode memcached service listens on for memcached clients.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ memcached-protocol\n\
-\ \ \ \ \ \ \ \ Sets the protocol that the GemFire memcached service uses (ASCII or BINARY).\n\
+\ \ \ \ \ \ \ \ Sets the protocol that the Geode memcached service uses (ASCII or BINARY).\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ memcached-bind-address\n\
-\ \ \ \ \ \ \ \ Sets the IP address the GemFire memcached service listens on for memcached clients. The\n\
+\ \ \ \ \ \ \ \ Sets the IP address the Geode memcached service listens on for memcached clients. The\n\
\ \ \ \ \ \ \ \ default is to bind to the first non-loopback address for this machine.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ redis-port\n\
-\ \ \ \ \ \ \ \ Sets the port that the GemFire Redis service listens on for Redis clients.\n\
+\ \ \ \ \ \ \ \ Sets the port that the Geode Redis service listens on for Redis clients.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ redis-bind-address\n\
-\ \ \ \ \ \ \ \ Sets the IP address the GemFire Redis service listens on for Redis clients. The default is\n\
-\ \ \ \ \ \ \ \ to bind to the first non-loopback address for this machine.\n\
+\ \ \ \ \ \ \ \ Sets the IP address the Geode Redis service listens on for Redis clients. The default is to\n\
+\ \ \ \ \ \ \ \ bind to the first non-loopback address for this machine.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ redis-password\n\
\ \ \ \ \ \ \ \ Sets the authentication password for GemFireRedisServer\n\
@@ -2672,7 +2672,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Sets the time (in seconds ) after which a message in the client queue will expire\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ name\n\
-\ \ \ \ \ \ \ \ The member name to give this Cache Server in the GemFire cluster.\n\
+\ \ \ \ \ \ \ \ The member name to give this Cache Server in the Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: true\n\
\ \ \ \ off-heap-memory-size\n\
\ \ \ \ \ \ \ \ The total size of off-heap memory specified as off-heap-memory-size=<n>[g|m]. <n> is the\n\
@@ -2685,7 +2685,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ file's path can be absolute or relative to the gfsh working directory.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ rebalance\n\
-\ \ \ \ \ \ \ \ Whether to initiate rebalancing across the GemFire cluster.\n\
+\ \ \ \ \ \ \ \ Whether to initiate rebalancing across the Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ \ \ \ \ Default (if the parameter is specified without value): true\n\
\ \ \ \ \ \ \ \ Default (if the parameter is not specified): false\n\
@@ -2709,7 +2709,7 @@ PARAMETERS\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ spring-xml-location\n\
\ \ \ \ \ \ \ \ Specifies the location of a Spring XML configuration file(s) for bootstrapping and\n\
-\ \ \ \ \ \ \ \ configuring a GemFire Server.\n\
+\ \ \ \ \ \ \ \ configuring a Geode Server.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ statistic-archive-file\n\
\ \ \ \ \ \ \ \ The file that statistic samples are written to. An empty string (default) disables\n\
@@ -2796,7 +2796,7 @@ SYNTAX\n\
\ \ \ \ status locator [--name=value] [--host=value] [--port=value] [--pid=value] [--dir=value]\n\
PARAMETERS\n\
\ \ \ \ name\n\
-\ \ \ \ \ \ \ \ Member name or ID of the Locator in the GemFire cluster.\n\
+\ \ \ \ \ \ \ \ Member name or ID of the Locator in the Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ host\n\
\ \ \ \ \ \ \ \ Hostname or IP address on which the Locator is running.\n\
@@ -2817,15 +2817,15 @@ NAME\n\
IS AVAILABLE\n\
\ \ \ \ true\n\
SYNOPSIS\n\
-\ \ \ \ Display the status of a GemFire Cache Server.\n\
+\ \ \ \ Display the status of a Geode Cache Server.\n\
SYNTAX\n\
\ \ \ \ status server [--name=value] [--pid=value] [--dir=value]\n\
PARAMETERS\n\
\ \ \ \ name\n\
-\ \ \ \ \ \ \ \ Member name or ID of the Cache Server in the GemFire cluster.\n\
+\ \ \ \ \ \ \ \ Member name or ID of the Cache Server in the Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ pid\n\
-\ \ \ \ \ \ \ \ Process ID (PID) of the running GemFire Cache Server.\n\
+\ \ \ \ \ \ \ \ Process ID (PID) of the running Geode Cache Server.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ dir\n\
\ \ \ \ \ \ \ \ Working directory in which the Cache Server is running. The default is the current\n\
@@ -2880,7 +2880,7 @@ SYNTAX\n\
\ \ \ \ stop locator [--name=value] [--pid=value] [--dir=value]\n\
PARAMETERS\n\
\ \ \ \ name\n\
-\ \ \ \ \ \ \ \ Member name or ID of the Locator in the GemFire cluster.\n\
+\ \ \ \ \ \ \ \ Member name or ID of the Locator in the Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ pid\n\
\ \ \ \ \ \ \ \ The process id (PID) of the running Locator.\n\
@@ -2895,7 +2895,7 @@ NAME\n\
IS AVAILABLE\n\
\ \ \ \ true\n\
SYNOPSIS\n\
-\ \ \ \ Stop a GemFire Cache Server.\n\
+\ \ \ \ Stop a Geode Cache Server.\n\
SYNTAX\n\
\ \ \ \ stop server [--name=value] [--pid=value] [--dir=value]\n\
MODES\n\
@@ -2909,10 +2909,10 @@ MODES\n\
\ \ \ \ \ \ \ \ stop server --dir=value\n\
PARAMETERS\n\
\ \ \ \ name\n\
-\ \ \ \ \ \ \ \ Member name or ID of the Cache Server in the GemFire cluster.\n\
+\ \ \ \ \ \ \ \ Member name or ID of the Cache Server in the Geode cluster.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ pid\n\
-\ \ \ \ \ \ \ \ Process ID (PID) of the running GemFire Cache Server.\n\
+\ \ \ \ \ \ \ \ Process ID (PID) of the running Geode Cache Server.\n\
\ \ \ \ \ \ \ \ Required: false\n\
\ \ \ \ dir\n\
\ \ \ \ \ \ \ \ Working directory in which the Cache Server is running. The default is the current\n\