geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [2/2] incubator-geode git commit: GEODE-985: rebrand GFSH help for Apache Geode GEODE-1408: correct alter region help in gfsh
Date Fri, 17 Jun 2016 22:48:02 GMT
GEODE-985: rebrand GFSH help for Apache Geode
GEODE-1408: correct alter region help in gfsh

* This closes #167 [klund@apache.org]


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

Branch: refs/heads/develop
Commit: f606706e5f0f311ec734f93beb343db37e512c1b
Parents: fc76608
Author: gmeilen <gracemeilen@gmail.com>
Authored: Fri Jun 17 15:30:20 2016 -0700
Committer: Kirk Lund <klund@apache.org>
Committed: Fri Jun 17 15:36:04 2016 -0700

----------------------------------------------------------------------
 .../LauncherLifecycleCommandsDUnitTest.java     |   8 +-
 .../gemfire/management/cli/CliMetaData.java     |   3 +-
 .../internal/cli/commands/ConfigCommands.java   |   6 +-
 .../CreateAlterDestroyRegionCommands.java       |  20 +-
 .../internal/cli/commands/DataCommands.java     |  38 ++--
 .../internal/cli/commands/DeployCommands.java   |   6 +-
 .../cli/commands/DiskStoreCommands.java         |  28 +--
 ...ExportImportSharedConfigurationCommands.java |   4 +-
 .../internal/cli/commands/FunctionCommands.java |   6 +-
 .../internal/cli/commands/GfshHelpCommands.java |   4 +-
 .../internal/cli/commands/IndexCommands.java    |  12 +-
 .../cli/commands/LauncherLifecycleCommands.java |  40 ++--
 .../internal/cli/commands/MemberCommands.java   |   4 +-
 .../cli/commands/MiscellaneousCommands.java     |  16 +-
 .../internal/cli/commands/PDXCommands.java      |   6 +-
 .../internal/cli/commands/RegionCommands.java   |   4 +-
 .../internal/cli/commands/ShellCommands.java    |  14 +-
 .../internal/cli/commands/StatusCommands.java   |   2 +-
 .../internal/cli/commands/WanCommands.java      |  24 +--
 .../management/internal/cli/help/CliTopic.java  |  32 +--
 .../internal/cli/i18n/CliStrings.java           | 216 +++++++++----------
 .../internal/cli/shell/JmxOperationInvoker.java |   2 +-
 22 files changed, 250 insertions(+), 245 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index da4c4ab..1d91834 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -365,7 +365,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     String resultString = toString(result);
 
     assertTrue(resultString, resultString.contains(
-        MessageFormat.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, StringUtils.EMPTY_STRING,
+        MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, StringUtils.EMPTY_STRING,
             gemfirePropertiesPathname)));
   }
 
@@ -391,7 +391,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     String resultString = toString(result);
 
     assertTrue(resultString, resultString.contains(
-        MessageFormat.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ",
+        MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ",
             gemfireSecurityPropertiesPathname)));
   }
 
@@ -432,7 +432,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     String resultString = toString(result);
 
     assertTrue(resultString, resultString.contains(
-        MessageFormat.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, StringUtils.EMPTY_STRING,
+        MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, StringUtils.EMPTY_STRING,
             gemfirePropertiesFile)));
   }
 
@@ -453,7 +453,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     String resultString = toString(result);
 
     assertTrue(resultString, resultString.contains(
-        MessageFormat.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ",
+        MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ",
             gemfireSecuritiesPropertiesFile)));
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java
index a5ed7c5..607f545 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/cli/CliMetaData.java
@@ -22,7 +22,6 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import com.gemstone.gemfire.management.internal.cli.CliAroundInterceptor;
-import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 
 /**
  * An annotation to define additional meta-data for commands.
@@ -54,7 +53,7 @@ public @interface CliMetaData {
   boolean writesToSharedConfiguration() default false;
   
   /** In help, topics that are related to this command **/
-  String[] relatedTopic() default com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.DEFAULT_TOPIC_GEMFIRE;
+  String[] relatedTopic() default com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.DEFAULT_TOPIC_GEODE;
 
   /**
    * The fully qualified name of a class which implements the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
index de17d1c..d16414c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
@@ -68,7 +68,7 @@ public class ConfigCommands implements CommandMarker {
   }
 
   @CliCommand(value = { CliStrings.DESCRIBE_CONFIG }, help = CliStrings.DESCRIBE_CONFIG__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEMFIRE_CONFIG})
+  @CliMetaData(shellOnly = false, relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG })
   @ResourceOperation(resource = Resource.CLUSTER, operation= OperationCode.READ)
   public Result describeConfig(
       @CliOption (key = CliStrings.DESCRIBE_CONFIG__MEMBER,
@@ -182,7 +182,7 @@ public class ConfigCommands implements CommandMarker {
    * @return Results of the attempt to write the configuration
    */
   @CliCommand(value = { CliStrings.EXPORT_CONFIG }, help = CliStrings.EXPORT_CONFIG__HELP)
-  @CliMetaData(interceptor = "com.gemstone.gemfire.management.internal.cli.commands.ConfigCommands$Interceptor", relatedTopic = {CliStrings.TOPIC_GEMFIRE_CONFIG})
+  @CliMetaData(interceptor = "com.gemstone.gemfire.management.internal.cli.commands.ConfigCommands$Interceptor", relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result exportConfig(
       @CliOption(key = { CliStrings.EXPORT_CONFIG__MEMBER },
@@ -238,7 +238,7 @@ public class ConfigCommands implements CommandMarker {
 
 
   @CliCommand(value = { CliStrings.ALTER_RUNTIME_CONFIG }, help = CliStrings.ALTER_RUNTIME_CONFIG__HELP)
-  @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEMFIRE_CONFIG})
+  @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.MANAGE)
   public Result alterRuntimeConfig(
       @CliOption (key = {CliStrings.ALTER_RUNTIME_CONFIG__MEMBER},

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/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 d27786f..741da25 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
@@ -108,7 +108,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand (value = CliStrings.CREATE_REGION, help = CliStrings.CREATE_REGION__HELP)
-  @CliMetaData (relatedTopic = CliStrings.TOPIC_GEMFIRE_REGION, writesToSharedConfiguration = true)
+  @CliMetaData (relatedTopic = CliStrings.TOPIC_GEODE_REGION, writesToSharedConfiguration = true)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result createRegion(
       @CliOption (key = CliStrings.CREATE_REGION__REGION,
@@ -437,7 +437,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
   }  
   
   @CliCommand (value = CliStrings.ALTER_REGION, help = CliStrings.ALTER_REGION__HELP)
-  @CliMetaData (relatedTopic = CliStrings.TOPIC_GEMFIRE_REGION, writesToSharedConfiguration = true)
+  @CliMetaData (relatedTopic = CliStrings.TOPIC_GEODE_REGION, writesToSharedConfiguration = true)
   public Result alterRegion(
       @CliOption (key = CliStrings.ALTER_REGION__REGION,
                   mandatory = true,
@@ -457,7 +457,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
       Integer entryExpirationIdleTime,
       @CliOption (key = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIMEACTION,
                   unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
-                  specifiedDefaultValue = CliMetaData.ANNOTATION_DEFAULT_VALUE,
+                  specifiedDefaultValue = "INVALIDATE",
                   help = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIMEACTION__HELP)
       String entryExpirationIdleTimeAction,
       @CliOption (key = CliStrings.ALTER_REGION__ENTRYEXPIRATIONTIMETOLIVE,
@@ -467,7 +467,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
       Integer entryExpirationTTL,
       @CliOption (key = CliStrings.ALTER_REGION__ENTRYEXPIRATIONTTLACTION,
                   unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
-                  specifiedDefaultValue = CliMetaData.ANNOTATION_DEFAULT_VALUE,
+                  specifiedDefaultValue = "INVALIDATE",
                   help = CliStrings.ALTER_REGION__ENTRYEXPIRATIONTTLACTION__HELP)
       String entryExpirationTTLAction,
       @CliOption (key = CliStrings.ALTER_REGION__REGIONEXPIRATIONIDLETIME,
@@ -477,7 +477,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
       Integer regionExpirationIdleTime, 
       @CliOption (key = CliStrings.ALTER_REGION__REGIONEXPIRATIONIDLETIMEACTION,
                   unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
-                  specifiedDefaultValue = CliMetaData.ANNOTATION_DEFAULT_VALUE,
+                  specifiedDefaultValue = "INVALIDATE",
                   help = CliStrings.ALTER_REGION__REGIONEXPIRATIONIDLETIMEACTION__HELP)
       String regionExpirationIdleTimeAction,
       @CliOption (key = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTL,
@@ -487,7 +487,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
       Integer regionExpirationTTL, 
       @CliOption (key = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTLACTION,
                   unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
-                  specifiedDefaultValue = CliMetaData.ANNOTATION_DEFAULT_VALUE,
+                  specifiedDefaultValue = "INVALIDATE",
                   help = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTLACTION__HELP)
       String regionExpirationTTLAction,          
       @CliOption (key = CliStrings.ALTER_REGION__CACHELISTENER,
@@ -498,12 +498,12 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
       String[] cacheListeners,
       @CliOption (key = CliStrings.ALTER_REGION__CACHELOADER,
                   unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
-                  specifiedDefaultValue = CliMetaData.ANNOTATION_DEFAULT_VALUE,
+                  specifiedDefaultValue = "help",
                   help = CliStrings.ALTER_REGION__CACHELOADER__HELP)
       String cacheLoader,
       @CliOption (key = CliStrings.ALTER_REGION__CACHEWRITER,
                   unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
-                  specifiedDefaultValue = CliMetaData.ANNOTATION_DEFAULT_VALUE,
+                  specifiedDefaultValue = "null",
                   help = CliStrings.ALTER_REGION__CACHEWRITER__HELP)
       String cacheWriter,
       @CliOption (key = CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID,
@@ -997,7 +997,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = { CliStrings.DESTROY_REGION }, help = CliStrings.DESTROY_REGION__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEMFIRE_REGION, writesToSharedConfiguration = true)
+  @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEODE_REGION, writesToSharedConfiguration = true)
   @ResourceOperation(resource=Resource.DATA, operation = OperationCode.MANAGE)
   public Result destroyRegion(
       @CliOption(key = CliStrings.DESTROY_REGION__REGION,
@@ -1031,7 +1031,7 @@ public class CreateAlterDestroyRegionCommands extends AbstractCommandsSupport {
 
       if (regionMembersList.size() == 0) {
         return ResultBuilder.createUserErrorResult(
-            CliStrings.format(CliStrings.DESTROY_REGION__MSG__COULDNOT_FIND_REGIONPATH_0_IN_GEMFIRE,
+            CliStrings.format(CliStrings.DESTROY_REGION__MSG__COULDNOT_FIND_REGIONPATH_0_IN_GEODE,
                 new Object[]{regionPath, "jmx-manager-update-rate milliseconds"}));
       }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java
index 8d93344..bbf2b02 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DataCommands.java
@@ -95,8 +95,9 @@ public class DataCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.REBALANCE, help = CliStrings.REBALANCE__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_DATA,
-      CliStrings.TOPIC_GEMFIRE_REGION })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_DATA,
+      CliStrings.TOPIC_GEODE_REGION
+  })
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result rebalance(
       @CliOption(key = CliStrings.REBALANCE__INCLUDEREGION, unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, help = CliStrings.REBALANCE__INCLUDEREGION__HELP) String[] includeRegions,
@@ -833,8 +834,9 @@ public class DataCommands implements CommandMarker {
   
 
   @CliCommand(value = CliStrings.EXPORT_DATA, help = CliStrings.EXPORT_DATA__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_DATA,
-      CliStrings.TOPIC_GEMFIRE_REGION })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_DATA,
+      CliStrings.TOPIC_GEODE_REGION
+  })
   public Result exportData(
       @CliOption(key = CliStrings.EXPORT_DATA__REGION, mandatory = true, optionContext = ConverterHint.REGIONPATH, help = CliStrings.EXPORT_DATA__REGION__HELP) String regionName,
       @CliOption(key = CliStrings.EXPORT_DATA__FILE, unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, mandatory = true, help = CliStrings.EXPORT_DATA__FILE__HELP) String filePath,
@@ -846,10 +848,10 @@ public class DataCommands implements CommandMarker {
         .getDistributedMemberByNameOrId(memberNameOrId);
     Result result = null;
 
-    if (!filePath.endsWith(CliStrings.GEMFIRE_DATA_FILE_EXTENSION)) {
+    if (!filePath.endsWith(CliStrings.GEODE_DATA_FILE_EXTENSION)) {
       return ResultBuilder.createUserErrorResult(CliStrings.format(
           CliStrings.INVALID_FILE_EXTENTION,
-          CliStrings.GEMFIRE_DATA_FILE_EXTENSION));
+          CliStrings.GEODE_DATA_FILE_EXTENSION));
     }
     try {
       if (targetMember != null) {
@@ -889,8 +891,9 @@ public class DataCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.IMPORT_DATA, help = CliStrings.IMPORT_DATA__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_DATA,
-      CliStrings.TOPIC_GEMFIRE_REGION })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_DATA,
+      CliStrings.TOPIC_GEODE_REGION
+  })
   public Result importData(
       @CliOption(key = CliStrings.IMPORT_DATA__REGION, optionContext = ConverterHint.REGIONPATH, mandatory = true, help = CliStrings.IMPORT_DATA__REGION__HELP) String regionName,
       @CliOption(key = CliStrings.IMPORT_DATA__FILE, mandatory = true, unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, help = CliStrings.IMPORT_DATA__FILE__HELP) String filePath,
@@ -905,10 +908,10 @@ public class DataCommands implements CommandMarker {
       final DistributedMember targetMember = CliUtil
           .getDistributedMemberByNameOrId(memberNameOrId);
 
-      if (!filePath.endsWith(CliStrings.GEMFIRE_DATA_FILE_EXTENSION)) {
+      if (!filePath.endsWith(CliStrings.GEODE_DATA_FILE_EXTENSION)) {
         return ResultBuilder.createUserErrorResult(CliStrings.format(
             CliStrings.INVALID_FILE_EXTENTION,
-            CliStrings.GEMFIRE_DATA_FILE_EXTENSION));
+            CliStrings.GEODE_DATA_FILE_EXTENSION));
       }
       if (targetMember != null) {
         final String args[] = { regionName, filePath };
@@ -946,7 +949,8 @@ public class DataCommands implements CommandMarker {
   }
 
   @CliMetaData(shellOnly = false, relatedTopic = {
-      CliStrings.TOPIC_GEMFIRE_DATA, CliStrings.TOPIC_GEMFIRE_REGION })
+      CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION
+  })
   @CliCommand(value = { CliStrings.PUT }, help = CliStrings.PUT__HELP)
   public Result put(
       @CliOption(key = { CliStrings.PUT__KEY }, mandatory = true, help = CliStrings.PUT__KEY__HELP) String key,
@@ -1014,7 +1018,8 @@ public class DataCommands implements CommandMarker {
   }
 
   @CliMetaData(shellOnly = false, relatedTopic = {
-      CliStrings.TOPIC_GEMFIRE_DATA, CliStrings.TOPIC_GEMFIRE_REGION })
+      CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION
+  })
   @CliCommand(value = { CliStrings.GET }, help = CliStrings.GET__HELP)
   public Result get(
       @CliOption(key = { CliStrings.GET__KEY }, mandatory = true, help = CliStrings.GET__KEY__HELP) String key,
@@ -1069,7 +1074,8 @@ public class DataCommands implements CommandMarker {
   }
 
   @CliMetaData(shellOnly = false, relatedTopic = {
-      CliStrings.TOPIC_GEMFIRE_DATA, CliStrings.TOPIC_GEMFIRE_REGION })
+      CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION
+  })
   @CliCommand(value = { CliStrings.LOCATE_ENTRY }, help = CliStrings.LOCATE_ENTRY__HELP)
   public Result locateEntry(
       @CliOption(key = { CliStrings.LOCATE_ENTRY__KEY }, mandatory = true, help = CliStrings.LOCATE_ENTRY__KEY__HELP) String key,
@@ -1117,7 +1123,8 @@ public class DataCommands implements CommandMarker {
   }
 
   @CliMetaData(shellOnly = false, relatedTopic = {
-      CliStrings.TOPIC_GEMFIRE_DATA, CliStrings.TOPIC_GEMFIRE_REGION })
+      CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION
+  })
   @CliCommand(value = { CliStrings.REMOVE }, help = CliStrings.REMOVE__HELP)
   @ResourceOperation(resource=Resource.DATA, operation = OperationCode.MANAGE)
   public Result remove(
@@ -1170,7 +1177,8 @@ public class DataCommands implements CommandMarker {
   }
 
   @CliMetaData(shellOnly = false, relatedTopic = {
-      CliStrings.TOPIC_GEMFIRE_DATA, CliStrings.TOPIC_GEMFIRE_REGION })
+      CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION
+  })
   @MultiStepCommand
   @CliCommand(value = { CliStrings.QUERY }, help = CliStrings.QUERY__HELP)
   public Object query(

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java
index 7729dfb..e320383 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommands.java
@@ -77,7 +77,7 @@ public final class DeployCommands extends AbstractCommandsSupport implements Com
    * @return The result of the attempt to deploy
    */
   @CliCommand(value = { CliStrings.DEPLOY }, help = CliStrings.DEPLOY__HELP)
-  @CliMetaData(interceptor = "com.gemstone.gemfire.management.internal.cli.commands.DeployCommands$Interceptor", relatedTopic={CliStrings.TOPIC_GEMFIRE_CONFIG}, writesToSharedConfiguration=true)
+  @CliMetaData(interceptor = "com.gemstone.gemfire.management.internal.cli.commands.DeployCommands$Interceptor", relatedTopic={CliStrings.TOPIC_GEODE_CONFIG }, writesToSharedConfiguration=true)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public final Result deploy(
     @CliOption(key = { CliStrings.DEPLOY__GROUP }, help = CliStrings.DEPLOY__GROUP__HELP, optionContext=ConverterHint.MEMBERGROUP)
@@ -160,7 +160,7 @@ public final class DeployCommands extends AbstractCommandsSupport implements Com
    * @return The result of the attempt to undeploy
    */
   @CliCommand(value = { CliStrings.UNDEPLOY }, help = CliStrings.UNDEPLOY__HELP)
-  @CliMetaData(relatedTopic={CliStrings.TOPIC_GEMFIRE_CONFIG}, writesToSharedConfiguration=true)
+  @CliMetaData(relatedTopic={CliStrings.TOPIC_GEODE_CONFIG }, writesToSharedConfiguration=true)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public final Result undeploy(
       @CliOption(key = { CliStrings.UNDEPLOY__GROUP },
@@ -231,7 +231,7 @@ public final class DeployCommands extends AbstractCommandsSupport implements Com
    * @return List of deployed JAR files
    */
   @CliCommand(value = { CliStrings.LIST_DEPLOYED }, help = CliStrings.LIST_DEPLOYED__HELP)
-  @CliMetaData(relatedTopic={CliStrings.TOPIC_GEMFIRE_CONFIG})
+  @CliMetaData(relatedTopic={CliStrings.TOPIC_GEODE_CONFIG })
   @ResourceOperation(resource = Resource.CLUSTER, operation= OperationCode.READ)
   public final Result listDeployed(
       @CliOption(key = { CliStrings.LIST_DEPLOYED__GROUP },

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java
index 36eda43..eba9d3b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommands.java
@@ -119,7 +119,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
   
   @CliCommand(value=CliStrings.BACKUP_DISK_STORE, help=CliStrings.BACKUP_DISK_STORE__HELP)
-  @CliMetaData(relatedTopic={ CliStrings.TOPIC_GEMFIRE_DISKSTORE })
+  @CliMetaData(relatedTopic={ CliStrings.TOPIC_GEODE_DISKSTORE })
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.READ)
   public Result backupDiskStore(
   
@@ -214,7 +214,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
 
 
   @CliCommand(value = CliStrings.LIST_DISK_STORE, help = CliStrings.LIST_DISK_STORE__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEMFIRE_DISKSTORE })
+  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEODE_DISKSTORE })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result listDiskStore() {
     try {
@@ -283,7 +283,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value=CliStrings.CREATE_DISK_STORE, help=CliStrings.CREATE_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=false, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE}, writesToSharedConfiguration=true)
+  @CliMetaData(shellOnly=false, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE }, writesToSharedConfiguration=true)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result createDiskStore(@CliOption(key=CliStrings.CREATE_DISK_STORE__NAME,
                                            mandatory=true,
@@ -424,7 +424,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
 
     
   @CliCommand(value=CliStrings.COMPACT_DISK_STORE, help=CliStrings.COMPACT_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=false, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE})
+  @CliMetaData(shellOnly=false, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE })
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result compactDiskStore(@CliOption(key=CliStrings.COMPACT_DISK_STORE__NAME,
                                             mandatory=true,
@@ -554,7 +554,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value=CliStrings.COMPACT_OFFLINE_DISK_STORE, help=CliStrings.COMPACT_OFFLINE_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE})
+  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE })
   public Result compactOfflineDiskStore(
                  @CliOption(key=CliStrings.COMPACT_OFFLINE_DISK_STORE__NAME,
                             mandatory=true,
@@ -697,7 +697,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
 
   
   @CliCommand(value=CliStrings.UPGRADE_OFFLINE_DISK_STORE, help=CliStrings.UPGRADE_OFFLINE_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE})
+  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE })
   public Result upgradeOfflineDiskStore(
       @CliOption(key=CliStrings.UPGRADE_OFFLINE_DISK_STORE__NAME, 
       mandatory=true,
@@ -866,7 +866,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.DESCRIBE_DISK_STORE, help = CliStrings.DESCRIBE_DISK_STORE__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEMFIRE_DISKSTORE })
+  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEODE_DISKSTORE })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result describeDiskStore(@CliOption(key = CliStrings.DESCRIBE_DISK_STORE__MEMBER, mandatory = true, optionContext = ConverterHint.MEMBERIDNAME, help = CliStrings.DESCRIBE_DISK_STORE__MEMBER__HELP)
                                   final String memberName,
@@ -993,7 +993,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.REVOKE_MISSING_DISK_STORE, help = CliStrings.REVOKE_MISSING_DISK_STORE__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_DISKSTORE })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_DISKSTORE })
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result revokeMissingDiskStore(
       @CliOption(key = CliStrings.REVOKE_MISSING_DISK_STORE__ID, mandatory = true, help = CliStrings.REVOKE_MISSING_DISK_STORE__ID__HELP)
@@ -1020,7 +1020,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.SHOW_MISSING_DISK_STORE, help = CliStrings.SHOW_MISSING_DISK_STORE__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_DISKSTORE })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_DISKSTORE })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result showMissingDiskStore() {
 
@@ -1059,7 +1059,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   
   
   @CliCommand(value=CliStrings.DESCRIBE_OFFLINE_DISK_STORE, help=CliStrings.DESCRIBE_OFFLINE_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE})
+  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE })
   public Result describeOfflineDiskStore(
       @CliOption (key=CliStrings.DESCRIBE_OFFLINE_DISK_STORE__DISKSTORENAME, 
           mandatory=true,
@@ -1107,7 +1107,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
   
   @CliCommand(value=CliStrings.EXPORT_OFFLINE_DISK_STORE, help=CliStrings.EXPORT_OFFLINE_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE})
+  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE })
   public Result exportOfflineDiskStore(
       @CliOption (key=CliStrings.EXPORT_OFFLINE_DISK_STORE__DISKSTORENAME, 
           mandatory=true,
@@ -1155,7 +1155,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value=CliStrings.VALIDATE_DISK_STORE, help=CliStrings.VALIDATE_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic = {CliStrings.TOPIC_GEMFIRE_DISKSTORE}) //offline command
+  @CliMetaData(shellOnly=true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE }) //offline command
   public Result validateDiskStore(
       @CliOption(key=CliStrings.VALIDATE_DISK_STORE__NAME, mandatory=true,
                   help=CliStrings.VALIDATE_DISK_STORE__NAME__HELP)
@@ -1236,7 +1236,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   
   
   @CliCommand(value=CliStrings.ALTER_DISK_STORE, help=CliStrings.ALTER_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE})
+  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE })
   public Result alterOfflineDiskStore(
       @CliOption  (key=CliStrings.ALTER_DISK_STORE__DISKSTORENAME, 
       mandatory=true,
@@ -1367,7 +1367,7 @@ public class DiskStoreCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value=CliStrings.DESTROY_DISK_STORE, help=CliStrings.DESTROY_DISK_STORE__HELP)
-  @CliMetaData(shellOnly=false, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE}, writesToSharedConfiguration=true)
+  @CliMetaData(shellOnly=false, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE }, writesToSharedConfiguration=true)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result destroyDiskStore(
       @CliOption  (key=CliStrings.DESTROY_DISK_STORE__NAME, 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ExportImportSharedConfigurationCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ExportImportSharedConfigurationCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ExportImportSharedConfigurationCommands.java
index 085dc19..b830fff 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ExportImportSharedConfigurationCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ExportImportSharedConfigurationCommands.java
@@ -63,7 +63,7 @@ public class ExportImportSharedConfigurationCommands extends AbstractCommandsSup
   private final LoadSharedConfigurationFunction loadSharedConfiguration = new LoadSharedConfigurationFunction();
 
   @CliCommand(value = { CliStrings.EXPORT_SHARED_CONFIG }, help = CliStrings.EXPORT_SHARED_CONFIG__HELP)
-  @CliMetaData(interceptor = "com.gemstone.gemfire.management.internal.cli.commands.ExportImportSharedConfigurationCommands$ExportInterceptor",  readsSharedConfiguration=true, relatedTopic = {CliStrings.TOPIC_GEMFIRE_CONFIG})
+  @CliMetaData(interceptor = "com.gemstone.gemfire.management.internal.cli.commands.ExportImportSharedConfigurationCommands$ExportInterceptor",  readsSharedConfiguration=true, relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result exportSharedConfig(
       @CliOption(key = { CliStrings.EXPORT_SHARED_CONFIG__FILE}, 
@@ -114,7 +114,7 @@ public class ExportImportSharedConfigurationCommands extends AbstractCommandsSup
   }
 
   @CliCommand(value = { CliStrings.IMPORT_SHARED_CONFIG }, help = CliStrings.IMPORT_SHARED_CONFIG__HELP)
-  @CliMetaData(interceptor = "com.gemstone.gemfire.management.internal.cli.commands.ExportImportSharedConfigurationCommands$ImportInterceptor", writesToSharedConfiguration=true, relatedTopic = {CliStrings.TOPIC_GEMFIRE_CONFIG})
+  @CliMetaData(interceptor = "com.gemstone.gemfire.management.internal.cli.commands.ExportImportSharedConfigurationCommands$ImportInterceptor", writesToSharedConfiguration=true, relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.MANAGE)
   @SuppressWarnings("unchecked")
   public Result importSharedConfig(

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java
index 5469e22..ae3d0aa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommands.java
@@ -81,7 +81,7 @@ public class FunctionCommands implements CommandMarker {
   }
   
   @CliCommand(value = CliStrings.EXECUTE_FUNCTION, help = CliStrings.EXECUTE_FUNCTION__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_FUNCTION })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_FUNCTION })
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.WRITE)
   public Result executeFunction(
       //TODO: Add optioncontext for functionID
@@ -453,7 +453,7 @@ public class FunctionCommands implements CommandMarker {
   }
   
   @CliCommand(value = CliStrings.DESTROY_FUNCTION, help = CliStrings.DESTROY_FUNCTION__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_FUNCTION } ,
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_FUNCTION } ,
       interceptor = "com.gemstone.gemfire.management.internal.cli.commands.FunctionCommands$Interceptor")  
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   //TODO: Add optioncontext for functionId
@@ -578,7 +578,7 @@ public class FunctionCommands implements CommandMarker {
   }     
   
   @CliCommand(value = CliStrings.LIST_FUNCTION, help = CliStrings.LIST_FUNCTION__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_FUNCTION })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_FUNCTION })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result listFunction(
       @CliOption(key = CliStrings.LIST_FUNCTION__MATCHES, 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java
index ac961cb..932641b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/GfshHelpCommands.java
@@ -47,7 +47,7 @@ public class GfshHelpCommands implements CommandMarker{
   }
   
   @CliCommand(value = CliStrings.HELP, help = CliStrings.HELP__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic = {CliStrings.TOPIC_GEMFIRE_HELP})
+  @CliMetaData(shellOnly=true, relatedTopic = {CliStrings.TOPIC_GEODE_HELP })
   public Result obtainHelp(
       @CliArgument(name = CliStrings.HELP__COMMAND, 
                  argumentContext = CliStrings.PARAM_CONTEXT_HELP, 
@@ -59,7 +59,7 @@ public class GfshHelpCommands implements CommandMarker{
   
   
   @CliCommand(value = CliStrings.HINT, help = CliStrings.HINT__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic = {CliStrings.TOPIC_GEMFIRE_HELP})
+  @CliMetaData(shellOnly=true, relatedTopic = {CliStrings.TOPIC_GEODE_HELP })
   public Result hint(
       @CliArgument(name = CliStrings.HINT__TOPICNAME, 
                 argumentContext = ConverterHint.HINTTOPIC, 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java
index d2ca5f7..dde31a6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommands.java
@@ -87,7 +87,7 @@ public class IndexCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.LIST_INDEX, help = CliStrings.LIST_INDEX__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEMFIRE_REGION, CliStrings.TOPIC_GEMFIRE_DATA})
+  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result listIndex(@CliOption(key = CliStrings.LIST_INDEX__STATS,
                                      mandatory = false,
@@ -171,7 +171,7 @@ public class IndexCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.CREATE_INDEX, help = CliStrings.CREATE_INDEX__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEMFIRE_REGION, CliStrings.TOPIC_GEMFIRE_DATA}, writesToSharedConfiguration=true)
+  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA }, writesToSharedConfiguration=true)
   //TODO : Add optionContext for indexName
   public Result createIndex(
       @CliOption (key = CliStrings.CREATE_INDEX__NAME,
@@ -321,7 +321,7 @@ public class IndexCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.DESTROY_INDEX, help = CliStrings.DESTROY_INDEX__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEMFIRE_REGION, CliStrings.TOPIC_GEMFIRE_DATA}, writesToSharedConfiguration=true)
+  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA }, writesToSharedConfiguration=true)
   public Result destroyIndex(
       @CliOption(
       key = CliStrings.DESTROY_INDEX__NAME,
@@ -463,7 +463,7 @@ public class IndexCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.DEFINE_INDEX, help = CliStrings.DEFINE_INDEX__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEMFIRE_REGION, CliStrings.TOPIC_GEMFIRE_DATA}, writesToSharedConfiguration=true)
+  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA }, writesToSharedConfiguration=true)
   //TODO : Add optionContext for indexName
   public Result defineIndex(
       @CliOption (key = CliStrings.DEFINE_INDEX_NAME,
@@ -533,7 +533,7 @@ public class IndexCommands extends AbstractCommandsSupport {
   }
   
   @CliCommand(value = CliStrings.CREATE_DEFINED_INDEXES, help = CliStrings.CREATE_DEFINED__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEMFIRE_REGION, CliStrings.TOPIC_GEMFIRE_DATA}, writesToSharedConfiguration=true)
+  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA }, writesToSharedConfiguration=true)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   //TODO : Add optionContext for indexName
   public Result createDefinedIndexes(
@@ -634,7 +634,7 @@ public class IndexCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.CLEAR_DEFINED_INDEXES, help = CliStrings.CLEAR_DEFINED__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEMFIRE_REGION, CliStrings.TOPIC_GEMFIRE_DATA}, writesToSharedConfiguration=true)
+  @CliMetaData(shellOnly = false, relatedTopic={CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA }, writesToSharedConfiguration=true)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   //TODO : Add optionContext for indexName
   public Result clearDefinedIndexes() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
index c67a4bc..6979ed8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -146,7 +146,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.START_LOCATOR, help = CliStrings.START_LOCATOR__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_LOCATOR, CliStrings.TOPIC_GEMFIRE_LIFECYCLE })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_LOCATOR, CliStrings.TOPIC_GEODE_LIFECYCLE })
   public Result startLocator(
       @CliOption(key = CliStrings.START_LOCATOR__MEMBER_NAME,
           mandatory = true,
@@ -266,14 +266,14 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
       gemfirePropertiesPathname = CliUtil.resolvePathname(gemfirePropertiesPathname);
 
       if (!StringUtils.isBlank(gemfirePropertiesPathname) && !IOUtils.isExistingPathname(gemfirePropertiesPathname)) {
-        return ResultBuilder.createUserErrorResult(CliStrings.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
+        return ResultBuilder.createUserErrorResult(CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
             StringUtils.EMPTY_STRING, gemfirePropertiesPathname));
       }
 
       gemfireSecurityPropertiesPathname = CliUtil.resolvePathname(gemfireSecurityPropertiesPathname);
 
       if (!StringUtils.isBlank(gemfireSecurityPropertiesPathname) && !IOUtils.isExistingPathname(gemfireSecurityPropertiesPathname)) {
-        return ResultBuilder.createUserErrorResult(CliStrings.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
+        return ResultBuilder.createUserErrorResult(CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
             "Security ", gemfireSecurityPropertiesPathname));
       }
 
@@ -714,7 +714,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.STATUS_LOCATOR, help = CliStrings.STATUS_LOCATOR__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_LOCATOR, CliStrings.TOPIC_GEMFIRE_LIFECYCLE })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_LOCATOR, CliStrings.TOPIC_GEODE_LIFECYCLE })
   public Result statusLocator(@CliOption(key = CliStrings.STATUS_LOCATOR__MEMBER,
       optionContext = ConverterHint.LOCATOR_MEMBER_IDNAME,
       unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
@@ -782,7 +782,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.STOP_LOCATOR, help = CliStrings.STOP_LOCATOR__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_LOCATOR, CliStrings.TOPIC_GEMFIRE_LIFECYCLE })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_LOCATOR, CliStrings.TOPIC_GEODE_LIFECYCLE })
   @ResourceOperation(resource = OperationContext.Resource.CLUSTER, operation = OperationContext.OperationCode.MANAGE)
   public Result stopLocator(@CliOption(key = CliStrings.STOP_LOCATOR__MEMBER,
       optionContext = ConverterHint.LOCATOR_MEMBER_IDNAME,
@@ -1248,7 +1248,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.START_SERVER, help = CliStrings.START_SERVER__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_SERVER, CliStrings.TOPIC_GEMFIRE_LIFECYCLE })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_LIFECYCLE })
   public Result startServer(@CliOption(key = CliStrings.START_SERVER__ASSIGN_BUCKETS,
       unspecifiedDefaultValue = "false",
       specifiedDefaultValue = "true",
@@ -1478,14 +1478,14 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
       gemfirePropertiesPathname = CliUtil.resolvePathname(gemfirePropertiesPathname);
 
       if (!StringUtils.isBlank(gemfirePropertiesPathname) && !IOUtils.isExistingPathname(gemfirePropertiesPathname)) {
-        return ResultBuilder.createUserErrorResult(CliStrings.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
+        return ResultBuilder.createUserErrorResult(CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
             StringUtils.EMPTY_STRING, gemfirePropertiesPathname));
       }
 
       gemfireSecurityPropertiesPathname = CliUtil.resolvePathname(gemfireSecurityPropertiesPathname);
 
       if (!StringUtils.isBlank(gemfireSecurityPropertiesPathname) && !IOUtils.isExistingPathname(gemfireSecurityPropertiesPathname)) {
-        return ResultBuilder.createUserErrorResult(CliStrings.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
+        return ResultBuilder.createUserErrorResult(CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
             "Security ", gemfireSecurityPropertiesPathname));
       }
 
@@ -1804,7 +1804,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.STATUS_SERVER, help = CliStrings.STATUS_SERVER__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_SERVER, CliStrings.TOPIC_GEMFIRE_LIFECYCLE })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_LIFECYCLE })
   public Result statusServer(@CliOption(key = CliStrings.STATUS_SERVER__MEMBER,
       optionContext = ConverterHint.MEMBERIDNAME,
       unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
@@ -1866,7 +1866,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.STOP_SERVER, help = CliStrings.STOP_SERVER__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_SERVER, CliStrings.TOPIC_GEMFIRE_LIFECYCLE })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_LIFECYCLE })
   @ResourceOperation(resource = OperationContext.Resource.CLUSTER, operation = OperationContext.OperationCode.MANAGE)
   public Result stopServer(@CliOption(key = CliStrings.STOP_SERVER__MEMBER,
       optionContext = ConverterHint.MEMBERIDNAME,
@@ -1954,7 +1954,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   //@CliCommand(value=CliStrings.START_MANAGER, help=CliStrings.START_MANAGER__HELP)
-  //@CliMetaData(shellOnly=true, relatedTopic = {CliStrings.TOPIC_GEMFIRE_MANAGER, CliStrings.TOPIC_GEMFIRE_JMX, CliStrings.TOPIC_GEMFIRE_LIFECYCLE})
+  //@CliMetaData(shellOnly=true, relatedTopic = {CliStrings.TOPIC_GEODE_MANAGER, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_LIFECYCLE})
   public Result startManager(@CliOption(key = CliStrings.START_MANAGER__MEMBERNAME,
       unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
       help = CliStrings.START_MANAGER__MEMBERNAME__HELP)
@@ -1987,15 +1987,15 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
           unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
           help = CliStrings.START_MANAGER__J__HELP)
           Map<String, String> systepProps,
-      @CliOption(key = CliStrings.START_MANAGER__GEMFIREPROPS,
+      @CliOption(key = CliStrings.START_MANAGER__GEODEPROPS,
           unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
-          help = CliStrings.START_MANAGER__GEMFIREPROPS__HELP)
+          help = CliStrings.START_MANAGER__GEODEPROPS__HELP)
           Map<String, String> gemfireProps) {
     return ResultBuilder.createInfoResult("Not-implemented");
   }
 
   @CliCommand(value = CliStrings.START_JCONSOLE, help = CliStrings.START_JCONSOLE__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_MANAGER, CliStrings.TOPIC_GEMFIRE_JMX, CliStrings.TOPIC_GEMFIRE_M_AND_M })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_MANAGER, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_M_AND_M })
   public Result startJConsole(@CliOption(key = CliStrings.START_JCONSOLE__INTERVAL,
       unspecifiedDefaultValue = "4",
       help = CliStrings.START_JCONSOLE__INTERVAL__HELP)
@@ -2174,7 +2174,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.START_JVISUALVM, help = CliStrings.START_JVISUALVM__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_MANAGER, CliStrings.TOPIC_GEMFIRE_JMX, CliStrings.TOPIC_GEMFIRE_M_AND_M })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_MANAGER, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_M_AND_M })
   public Result startJVisualVM(@CliOption(key = CliStrings.START_JCONSOLE__J,
       optionContext = ConverterHint.STRING_LIST,
       unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE,
@@ -2254,7 +2254,7 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.START_PULSE, help = CliStrings.START_PULSE__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_MANAGER, CliStrings.TOPIC_GEMFIRE_JMX, CliStrings.TOPIC_GEMFIRE_M_AND_M })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_MANAGER, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_M_AND_M })
   // TODO change url parameter type to URL when I figure out the Converter logic in Gfsh
   public Result startPulse(@CliOption(key = CliStrings.START_PULSE__URL,
       unspecifiedDefaultValue = "http://localhost:7070/pulse",
@@ -2336,13 +2336,13 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
   }
 
   @CliCommand(value = CliStrings.START_VSD, help = CliStrings.START_VSD__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_M_AND_M, CliStrings.TOPIC_GEMFIRE_STATISTICS })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_M_AND_M, CliStrings.TOPIC_GEODE_STATISTICS })
   public Result startVsd(@CliOption(key = CliStrings.START_VSD__FILE, help = CliStrings.START_VSD__FILE__HELP)
   final String[] statisticsArchiveFilePathnames) {
     try {
       String gemfireHome = System.getenv("GEMFIRE");
 
-      assertState(!StringUtils.isBlank(gemfireHome), CliStrings.GEMFIRE_HOME_NOT_FOUND_ERROR_MESSAGE);
+      assertState(!StringUtils.isBlank(gemfireHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE);
 
       assertState(IOUtils.isExistingPathname(getPathToVsd()), String.format(CliStrings.START_VSD__NOT_FOUND_ERROR_MESSAGE,
           gemfireHome));
@@ -2447,12 +2447,12 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
 
   // NOTE as of 8.0, this command is no more!
   //@CliCommand(value=CliStrings.START_DATABROWSER, help=CliStrings.START_DATABROWSER__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_M_AND_M })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_M_AND_M })
   public Result startDataBrowser() {
     try {
       String gemfireHome = System.getenv("GEMFIRE");
 
-      assertState(!StringUtils.isBlank(gemfireHome), CliStrings.GEMFIRE_HOME_NOT_FOUND_ERROR_MESSAGE);
+      assertState(!StringUtils.isBlank(gemfireHome), CliStrings.GEODE_HOME_NOT_FOUND_ERROR_MESSAGE);
 
       if (isConnectedAndReady() && (getGfsh().getOperationInvoker() instanceof JmxOperationInvoker)) {
         String dataBrowserPath = getPathToDataBrowser();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java
index 7db1deb..08e36a4 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommands.java
@@ -63,7 +63,7 @@ public class MemberCommands implements CommandMarker {
   private static final GetMemberInformationFunction getMemberInformation = new GetMemberInformationFunction();
 
   @CliCommand(value = { CliStrings.LIST_MEMBER }, help = CliStrings.LIST_MEMBER__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEMFIRE_SERVER)
+  @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEODE_SERVER)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result listMember(
 		  @CliOption(key = { CliStrings.LIST_MEMBER__GROUP },
@@ -108,7 +108,7 @@ public class MemberCommands implements CommandMarker {
   }
 
   @CliCommand(value = { CliStrings.DESCRIBE_MEMBER }, help = CliStrings.DESCRIBE_MEMBER__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEMFIRE_SERVER)
+  @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEODE_SERVER)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result describeMember(
   	@CliOption(key = CliStrings.DESCRIBE_MEMBER__IDENTIFIER,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java
index 020b134..2f48e22 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommands.java
@@ -183,7 +183,7 @@ public class MiscellaneousCommands implements CommandMarker {
 
 
   @CliCommand(value = CliStrings.SHUTDOWN, help = CliStrings.SHUTDOWN__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_LIFECYCLE },
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_LIFECYCLE },
       interceptor = "com.gemstone.gemfire.management.internal.cli.commands.MiscellaneousCommands$Interceptor")
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.MANAGE)
   public Result shutdown(
@@ -325,7 +325,7 @@ public class MiscellaneousCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.GC, help = CliStrings.GC__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_DEBUG_UTIL })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.MANAGE)
   public Result gc(
       @CliOption(key = CliStrings.GC__GROUP, unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, help = CliStrings.GC__GROUP__HELP)
@@ -416,7 +416,7 @@ public class MiscellaneousCommands implements CommandMarker {
 
 
   @CliCommand(value = CliStrings.NETSTAT, help = CliStrings.NETSTAT__HELP)
-  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL })
+  @CliMetaData(relatedTopic = { CliStrings.TOPIC_GEODE_DEBUG_UTIL })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   //TODO : Verify the auto-completion for multiple values.
   public Result netstat(
@@ -570,7 +570,7 @@ public class MiscellaneousCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.SHOW_DEADLOCK, help = CliStrings.SHOW_DEADLOCK__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL })
+  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEODE_DEBUG_UTIL })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result showDeadlock(
       @CliOption(key = CliStrings.SHOW_DEADLOCK__DEPENDENCIES__FILE,
@@ -620,7 +620,7 @@ public class MiscellaneousCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.SHOW_LOG, help = CliStrings.SHOW_LOG_HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL })
+  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEODE_DEBUG_UTIL })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result showLog(
       @CliOption(key = CliStrings.SHOW_LOG_MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME, unspecifiedDefaultValue = CliMetaData.ANNOTATION_NULL_VALUE, help = CliStrings.SHOW_LOG_MEMBER_HELP, mandatory = true) String memberNameOrId,
@@ -768,7 +768,7 @@ public class MiscellaneousCommands implements CommandMarker {
     return result;
   }
   @CliCommand(value = CliStrings.EXPORT_LOGS, help = CliStrings.EXPORT_LOGS__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEMFIRE_SERVER, CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL })
+  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_DEBUG_UTIL })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result exportLogs(
       @CliOption(key = CliStrings.EXPORT_LOGS__DIR,
@@ -990,7 +990,7 @@ public class MiscellaneousCommands implements CommandMarker {
    * @return Stack Trace
    */
   @CliCommand(value = CliStrings.EXPORT_STACKTRACE, help = CliStrings.EXPORT_STACKTRACE__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL })
+  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEODE_DEBUG_UTIL })
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result exportStackTrace(
       @CliOption(key = CliStrings.EXPORT_STACKTRACE__MEMBER,
@@ -1091,7 +1091,7 @@ public class MiscellaneousCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.SHOW_METRICS, help = CliStrings.SHOW_METRICS__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEMFIRE_STATISTICS })
+  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEODE_STATISTICS })
   @ResourceOperation(resource = Resource.CLUSTER, operation= OperationCode.READ)
   public Result showMetrics(
       @CliOption(key = { CliStrings.SHOW_METRICS__MEMBER }, optionContext = ConverterHint.ALL_MEMBER_IDNAME, help = CliStrings.SHOW_METRICS__MEMBER__HELP) String memberNameOrId,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/PDXCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/PDXCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/PDXCommands.java
index 52af8f1..b9ffd02 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/PDXCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/PDXCommands.java
@@ -52,7 +52,7 @@ public class PDXCommands extends AbstractCommandsSupport{
 
 
   @CliCommand (value = CliStrings.CONFIGURE_PDX, help = CliStrings.CONFIGURE_PDX__HELP)
-  @CliMetaData (relatedTopic = CliStrings.TOPIC_GEMFIRE_REGION, writesToSharedConfiguration = true)
+  @CliMetaData (relatedTopic = CliStrings.TOPIC_GEODE_REGION, writesToSharedConfiguration = true)
   @ResourceOperation( resource=Resource.DATA, operation = OperationCode.MANAGE)
   public Result configurePDX(
       @CliOption (key = CliStrings.CONFIGURE_PDX__READ__SERIALIZED,
@@ -174,7 +174,7 @@ public class PDXCommands extends AbstractCommandsSupport{
   }
 
   @CliCommand (value = CliStrings.PDX_RENAME, help = CliStrings.PDX_RENAME__HELP)
-  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE})
+  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE })
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result pdxRename(
       @CliOption (key = CliStrings.PDX_RENAME_OLD,
@@ -230,7 +230,7 @@ public class PDXCommands extends AbstractCommandsSupport{
   
   // The pdx delete-field command has been disabled until it has native client support.
 //  @CliCommand (value = CliStrings.PDX_DELETE_FIELD, help = CliStrings.PDX_DELETE_FIELD__HELP)
-//  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEMFIRE_DISKSTORE})
+//  @CliMetaData(shellOnly=true, relatedTopic={CliStrings.TOPIC_GEODE_DISKSTORE})
 //  public Result pdxDeleteField( 
 //      @CliOption (key = CliStrings.PDX_CLASS,
 //      mandatory=true,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java
index 93d55f4..63f0ea2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/RegionCommands.java
@@ -76,7 +76,7 @@ public class RegionCommands implements CommandMarker {
   private static final GetRegionDescriptionFunction getRegionDescription = new GetRegionDescriptionFunction();
 
   @CliCommand(value = { CliStrings.LIST_REGION }, help = CliStrings.LIST_REGION__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEMFIRE_REGION)
+  @CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEODE_REGION)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result listRegion(
       @CliOption(key = { CliStrings.LIST_REGION__GROUP },
@@ -154,7 +154,7 @@ public class RegionCommands implements CommandMarker {
   }
 
   @CliCommand(value = { CliStrings.DESCRIBE_REGION }, help = CliStrings.DESCRIBE_REGION__HELP)
-  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEMFIRE_REGION, CliStrings.TOPIC_GEMFIRE_CONFIG } )
+  @CliMetaData(shellOnly = false, relatedTopic = { CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_CONFIG } )
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result describeRegion(
       @CliOption(key = CliStrings.DESCRIBE_REGION__NAME,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index 6b1a330..09a25a6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -121,7 +121,7 @@ public class ShellCommands implements CommandMarker {
   }
 
   @CliCommand(value = { CliStrings.CONNECT }, help = CliStrings.CONNECT__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEMFIRE_JMX, CliStrings.TOPIC_GEMFIRE_MANAGER })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_MANAGER })
   public Result connect(
     @CliOption(key = { CliStrings.CONNECT__LOCATOR },
       unspecifiedDefaultValue = ConnectionEndpointConverter.DEFAULT_LOCATOR_ENDPOINTS,
@@ -478,7 +478,7 @@ public class ShellCommands implements CommandMarker {
       if (!StringUtils.isBlank(gfSecurityPropertiesPathToUse)) {
         // User specified gfSecurity properties doesn't exist
         if (!IOUtils.isExistingPathname(gfSecurityPropertiesPathToUse)) {
-          gfshInstance.printAsSevere(CliStrings.format(CliStrings.GEMFIRE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ", gfSecurityPropertiesPathToUse));
+          gfshInstance.printAsSevere(CliStrings.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ", gfSecurityPropertiesPathToUse));
         }
         else {
           gfSecurityPropertiesUrl = new File(gfSecurityPropertiesPathToUse).toURI().toURL();
@@ -701,7 +701,7 @@ public class ShellCommands implements CommandMarker {
 
 
   @CliCommand(value = { CliStrings.DISCONNECT }, help = CliStrings.DISCONNECT__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEMFIRE_JMX, CliStrings.TOPIC_GEMFIRE_MANAGER })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_MANAGER })
   public Result disconnect() {
     Result result = null;
 
@@ -736,7 +736,7 @@ public class ShellCommands implements CommandMarker {
 
 
   @CliCommand(value = { CliStrings.DESCRIBE_CONNECTION }, help = CliStrings.DESCRIBE_CONNECTION__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEMFIRE_JMX })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX })
   public Result describeConnection() {
     Result result = null;
     try {
@@ -831,7 +831,7 @@ public class ShellCommands implements CommandMarker {
 
   //Enable when "use region" command is required. See #46110
   //  @CliCommand(value = { CliStrings.USE_REGION }, help = CliStrings.USE_REGION__HELP)
-  //  @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEMFIRE_REGION})
+  //  @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_REGION})
   //  public Result useRegion(
   //      @CliArgument(name = CliStrings.USE_REGION__REGION,
   //                   unspecifiedDefaultValue = "/",
@@ -845,7 +845,7 @@ public class ShellCommands implements CommandMarker {
   //  }
 
   @CliCommand(value = { CliStrings.DEBUG }, help = CliStrings.DEBUG__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_DEBUG_UTIL })
   public Result debug(
     @CliOption(key = CliStrings.DEBUG__STATE,
       unspecifiedDefaultValue = "OFF",
@@ -1026,7 +1026,7 @@ public class ShellCommands implements CommandMarker {
 
 
   @CliCommand(value = CliStrings.ENCRYPT, help = CliStrings.ENCRYPT__HELP)
-  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL })
+  @CliMetaData(shellOnly = true, relatedTopic = { CliStrings.TOPIC_GEODE_DEBUG_UTIL })
   public Result encryptPassword(
     @CliOption(key = CliStrings.ENCRYPT_STRING,
       help = CliStrings.ENCRYPT_STRING__HELP,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/StatusCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/StatusCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/StatusCommands.java
index bf0b044..ba4b0ac 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/StatusCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/StatusCommands.java
@@ -47,7 +47,7 @@ public class StatusCommands extends AbstractCommandsSupport implements CommandMa
 
   @SuppressWarnings("unchecked")
   @CliCommand (value = CliStrings.STATUS_SHARED_CONFIG, help = CliStrings.STATUS_SHARED_CONFIG_HELP)
-  @CliMetaData (relatedTopic = CliStrings.TOPIC_GEMFIRE_LOCATOR)
+  @CliMetaData (relatedTopic = CliStrings.TOPIC_GEODE_LOCATOR)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result statusSharedConfiguration() {
     final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
index 2e9fed1..47b547d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/WanCommands.java
@@ -75,7 +75,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.CREATE_GATEWAYSENDER, help = CliStrings.CREATE_GATEWAYSENDER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN, writesToSharedConfiguration=true)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN, writesToSharedConfiguration=true)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result createGatewaySender(
       @CliOption(key = CliStrings.CREATE_GATEWAYSENDER__GROUP,
@@ -192,7 +192,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.START_GATEWAYSENDER, help = CliStrings.START_GATEWAYSENDER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result startGatewaySender(
       @CliOption(key = CliStrings.START_GATEWAYSENDER__ID,
@@ -335,7 +335,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.PAUSE_GATEWAYSENDER, help = CliStrings.PAUSE_GATEWAYSENDER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result pauseGatewaySender(
       @CliOption(key = CliStrings.PAUSE_GATEWAYSENDER__ID,
@@ -428,7 +428,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.RESUME_GATEWAYSENDER, help = CliStrings.RESUME_GATEWAYSENDER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource=Resource.DATA, operation = OperationCode.MANAGE)
   public Result resumeGatewaySender(
       @CliOption(key = CliStrings.RESUME_GATEWAYSENDER__ID,
@@ -568,7 +568,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.STOP_GATEWAYSENDER, help = CliStrings.STOP_GATEWAYSENDER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result stopGatewaySender(
       @CliOption(key = CliStrings.STOP_GATEWAYSENDER__ID,
@@ -644,7 +644,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.CREATE_GATEWAYRECEIVER, help = CliStrings.CREATE_GATEWAYRECEIVER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation( resource=Resource.DATA, operation = OperationCode.MANAGE)
   public Result createGatewayReceiver(
       @CliOption(key = CliStrings.CREATE_GATEWAYRECEIVER__GROUP,
@@ -724,7 +724,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.LOAD_BALANCE_GATEWAYSENDER, help = CliStrings.LOAD_BALANCE_GATEWAYSENDER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result loadBalanceGatewaySender(
       @CliOption(key = CliStrings.LOAD_BALANCE_GATEWAYSENDER__ID,
@@ -790,7 +790,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.START_GATEWAYRECEIVER, help = CliStrings.START_GATEWAYRECEIVER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result startGatewayReceiver(
       @CliOption(key = CliStrings.START_GATEWAYRECEIVER__GROUP,
@@ -852,7 +852,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.STOP_GATEWAYRECEIVER, help = CliStrings.STOP_GATEWAYRECEIVER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.DATA, operation = OperationCode.MANAGE)
   public Result stopGatewayReceiver(
 
@@ -926,7 +926,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.LIST_GATEWAY, help = CliStrings.LIST_GATEWAY__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result listGateway(
       @CliOption(key = CliStrings.LIST_GATEWAY__MEMBER,
@@ -1017,7 +1017,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.STATUS_GATEWAYSENDER, help = CliStrings.STATUS_GATEWAYSENDER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result statusGatewaySender(
       @CliOption(key = CliStrings.STATUS_GATEWAYSENDER__ID,
@@ -1084,7 +1084,7 @@ public class WanCommands implements CommandMarker {
   }
 
   @CliCommand(value = CliStrings.STATUS_GATEWAYRECEIVER, help = CliStrings.STATUS_GATEWAYRECEIVER__HELP)
-  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEMFIRE_WAN)
+  @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
   @ResourceOperation(resource = Resource.CLUSTER, operation = OperationCode.READ)
   public Result statusGatewayReceiver(
       @CliOption(key = CliStrings.STATUS_GATEWAYRECEIVER__GROUP,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f606706e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java
index 4b93a37..2849a3f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/CliTopic.java
@@ -34,22 +34,22 @@ public class CliTopic implements Comparable<CliTopic> {
   private static final Map<String, String> nameDescriptionMap = new HashMap<String, String>();
 
   static {
-    nameDescriptionMap.put(CliStrings.DEFAULT_TOPIC_GEMFIRE,    CliStrings.DEFAULT_TOPIC_GEMFIRE__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_REGION,     CliStrings.TOPIC_GEMFIRE_REGION__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_WAN,        CliStrings.TOPIC_GEMFIRE_WAN__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_JMX,        CliStrings.TOPIC_GEMFIRE_JMX__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_DISKSTORE,  CliStrings.TOPIC_GEMFIRE_DISKSTORE__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_LOCATOR,    CliStrings.TOPIC_GEMFIRE_LOCATOR__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_SERVER,     CliStrings.TOPIC_GEMFIRE_SERVER__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_MANAGER,    CliStrings.TOPIC_GEMFIRE_MANAGER__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_STATISTICS, CliStrings.TOPIC_GEMFIRE_STATISTICS__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_LIFECYCLE,  CliStrings.TOPIC_GEMFIRE_LIFECYCLE__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_M_AND_M,    CliStrings.TOPIC_GEMFIRE_M_AND_M__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_DATA,       CliStrings.TOPIC_GEMFIRE_DATA__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_CONFIG,     CliStrings.TOPIC_GEMFIRE_CONFIG__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_FUNCTION,   CliStrings.TOPIC_GEMFIRE_FUNCTION__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_HELP,       CliStrings.TOPIC_GEMFIRE_HELP__DESC);
-    nameDescriptionMap.put(CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL, CliStrings.TOPIC_GEMFIRE_DEBUG_UTIL__DESC);
+    nameDescriptionMap.put(CliStrings.DEFAULT_TOPIC_GEODE,    CliStrings.DEFAULT_TOPIC_GEODE__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_REGION,     CliStrings.TOPIC_GEODE_REGION__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_WAN,        CliStrings.TOPIC_GEODE_WAN__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_JMX,        CliStrings.TOPIC_GEODE_JMX__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_DISKSTORE,  CliStrings.TOPIC_GEODE_DISKSTORE__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_LOCATOR,    CliStrings.TOPIC_GEODE_LOCATOR__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_SERVER,     CliStrings.TOPIC_GEODE_SERVER__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_MANAGER,    CliStrings.TOPIC_GEODE_MANAGER__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_STATISTICS, CliStrings.TOPIC_GEODE_STATISTICS__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_LIFECYCLE,  CliStrings.TOPIC_GEODE_LIFECYCLE__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_M_AND_M,    CliStrings.TOPIC_GEODE_M_AND_M__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_DATA,       CliStrings.TOPIC_GEODE_DATA__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_CONFIG,     CliStrings.TOPIC_GEODE_CONFIG__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_FUNCTION,   CliStrings.TOPIC_GEODE_FUNCTION__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_HELP,       CliStrings.TOPIC_GEODE_HELP__DESC);
+    nameDescriptionMap.put(CliStrings.TOPIC_GEODE_DEBUG_UTIL, CliStrings.TOPIC_GEODE_DEBUG_UTIL__DESC);
     nameDescriptionMap.put(CliStrings.TOPIC_GFSH,               CliStrings.TOPIC_GFSH__DESC);
   }
 


Mime
View raw message