geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [4/5] geode git commit: GEODE-2818: add alias to any command's options that involves "group", "member", "jar" and replace CliString variables with GROUP, MEMBER, JAR, etc.
Date Wed, 14 Jun 2017 16:00:37 GMT
http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
index 2758429..0829495 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java
@@ -75,6 +75,13 @@ import java.text.MessageFormat;
  */
 public class CliStrings {
 
+  public static final String GROUP = "group";
+  public static final String GROUPS = "groups";
+  public static final String MEMBER = "member";
+  public static final String MEMBERS = "members";
+  public static final String JAR = "jar";
+  public static final String JARS = "jars";
+
   private static final String LOG_LEVEL_VALUES =
       "Possible values for log-level include: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF.";
 
@@ -301,7 +308,6 @@ public class CliStrings {
       "Alter a region with the given path and configuration.";
   public static final String ALTER_REGION__REGION = "name";
   public static final String ALTER_REGION__REGION__HELP = "Name/Path of the region to be altered.";
-  public static final String ALTER_REGION__GROUP = "group";
   public static final String ALTER_REGION__GROUP__HELP =
       "Group(s) of members on which the region will be altered.";
   public static final String ALTER_REGION__ENTRYEXPIRATIONIDLETIME = "entry-idle-time-expiration";
@@ -384,10 +390,9 @@ public class CliStrings {
   public static final String ALTER_RUNTIME_CONFIG = "alter runtime";
   public static final String ALTER_RUNTIME_CONFIG__HELP =
       "Alter a subset of member or members configuration properties while running.";
-  public static final String ALTER_RUNTIME_CONFIG__MEMBER = "member";
   public static final String ALTER_RUNTIME_CONFIG__MEMBER__HELP =
       "Name/Id of the member in whose configuration will be altered.";
-  public static final String ALTER_RUNTIME_CONFIG__GROUP = "group";
+
   public static final String ALTER_RUNTIME_CONFIG__GROUP__HELP =
       "Group of members whose configuration will be altered.";
   public static final String ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT =
@@ -481,7 +486,6 @@ public class CliStrings {
   public static final String COMPACT_DISK_STORE__NAME = "name";
   public static final String COMPACT_DISK_STORE__NAME__HELP =
       "Name of the disk store to be compacted.";
-  public static final String COMPACT_DISK_STORE__GROUP = "group";
   public static final String COMPACT_DISK_STORE__GROUP__HELP =
       "Group(s) of members that will perform disk compaction. If no group is specified the disk store will be compacted by all members.";
   public static final String COMPACT_DISK_STORE__DISKSTORE_0_DOESNOT_EXIST =
@@ -657,7 +661,6 @@ public class CliStrings {
   public static final String CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE = "listener-param";
   public static final String CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE__HELP =
       "Parameter name for the AsyncEventListener.  Optionally, parameter names may be followed by # and a value for the parameter.  Example: --listener-param=loadAll --listener-param=maxRead#1024";
-  public static final String CREATE_ASYNC_EVENT_QUEUE__GROUP = "group";
   public static final String CREATE_ASYNC_EVENT_QUEUE__GROUP__HELP =
       "Group(s) of members on which queue will be created. If no group is specified the queue will be created on all members.";
   public static final String CREATE_ASYNC_EVENT_QUEUE__ERROR_WHILE_CREATING_REASON_0 =
@@ -701,7 +704,6 @@ public class CliStrings {
   public static final String CREATE_DISK_STORE__DIRECTORY_AND_SIZE = "dir";
   public static final String CREATE_DISK_STORE__DIRECTORY_AND_SIZE__HELP =
       "Directories where the disk store files will be written, the directories will be created if they don't exist.  Optionally, directory names may be followed by # and the maximum number of megabytes that the disk store can use in the directory.  Example: --dir=/data/ds1 --dir=/data/ds2#5000";
-  public static final String CREATE_DISK_STORE__GROUP = "group";
   public static final String CREATE_DISK_STORE__GROUP__HELP =
       "Group(s) of members on which the disk store will be created. If no group is specified the disk store will be created on all members.";
   public static final String CREATE_DISK_STORE__DISK_USAGE_WARNING_PCT =
@@ -727,13 +729,11 @@ public class CliStrings {
   public static final String CREATE_INDEX__REGION = "region";
   public static final String CREATE_INDEX__REGION__HELP =
       "Name/Path of the region which corresponds to the \"from\" clause in a query.";
-  public static final String CREATE_INDEX__MEMBER = "member";
   public static final String CREATE_INDEX__MEMBER__HELP =
       "Name/Id of the member in which the index will be created.";
   public static final String CREATE_INDEX__TYPE = "type";
   public static final String CREATE_INDEX__TYPE__HELP =
       "Type of the index. Valid values are: range, key and hash.";
-  public static final String CREATE_INDEX__GROUP = "group";
   public static final String CREATE_INDEX__GROUP__HELP =
       "Group of members in which the index will be created.";
   public static final String CREATE_INDEX__INVALID__INDEX__TYPE__MESSAGE =
@@ -790,9 +790,7 @@ public class CliStrings {
       "Indexes successfully created. Use list indexes to get details.";
   public static final String CREATE_DEFINED_INDEXES__FAILURE__MSG =
       "Failed to create some or all indexes \"{0}\" due to following reasons";
-  public static final String CREATE_DEFINED_INDEXES__MEMBER = CREATE_INDEX__MEMBER;
   public static final String CREATE_DEFINED_INDEXES__MEMBER__HELP = CREATE_INDEX__MEMBER__HELP;
-  public static final String CREATE_DEFINED_INDEXES__GROUP = CREATE_INDEX__GROUP;
   public static final String CREATE_DEFINED_INDEXES__GROUP__HELP = CREATE_INDEX__GROUP__HELP;
   public static final String CREATE_DEFINED_INDEXES__MEMBER__MSG = CREATE_INDEX__MEMBER__MSG;
   public static final String CREATE_DEFINED_INDEXES__NUMBER__AND__MEMBER =
@@ -815,7 +813,6 @@ public class CliStrings {
   public static final String CREATE_REGION__REGIONSHORTCUT = "type";
   public static final String CREATE_REGION__REGIONSHORTCUT__HELP =
       "Type of region to create. The following types are pre-defined by the product (see RegionShortcut javadocs for more information): PARTITION, PARTITION_REDUNDANT, PARTITION_PERSISTENT, PARTITION_REDUNDANT_PERSISTENT, PARTITION_OVERFLOW, PARTITION_REDUNDANT_OVERFLOW, PARTITION_PERSISTENT_OVERFLOW, PARTITION_REDUNDANT_PERSISTENT_OVERFLOW, PARTITION_HEAP_LRU, PARTITION_REDUNDANT_HEAP_LRU, REPLICATE, REPLICATE_PERSISTENT, REPLICATE_OVERFLOW, REPLICATE_PERSISTENT_OVERFLOW, REPLICATE_HEAP_LRU, LOCAL, LOCAL_PERSISTENT, LOCAL_HEAP_LRU, LOCAL_OVERFLOW, LOCAL_PERSISTENT_OVERFLOW, PARTITION_PROXY, PARTITION_PROXY_REDUNDANT, and REPLICATE_PROXY.";
-  public static final String CREATE_REGION__GROUP = "group";
   public static final String CREATE_REGION__GROUP__HELP =
       "Group(s) of members on which the region will be created.";
   public static final String CREATE_REGION__USEATTRIBUTESFROM = "template-region";
@@ -1069,17 +1066,14 @@ public class CliStrings {
       "Deploy JARs to a member or members.  Only one of either --jar or --dir may be specified.";
   public static final String DEPLOY__DIR = "dir";
   public static final String DEPLOY__DIR__HELP = "Directory from which to deploy the JARs.";
-  public static final String DEPLOY__GROUP = "group";
   public static final String DEPLOY__GROUP__HELP =
       "Group(s) to which the specified JARs will be deployed. If not specified, deploy will occur on all members.";
-  public static final String DEPLOY__JAR = "jar";
   public static final String DEPLOY__JAR__HELP = "Path of the JAR to deploy.";
 
   /* describe config command */
   public static final String DESCRIBE_CONFIG = "describe config";
   public static final String DESCRIBE_CONFIG__HELP =
       "Display configuration details of a member or members.";
-  public static final String DESCRIBE_CONFIG__MEMBER = "member";
   public static final String DESCRIBE_CONFIG__MEMBER__HELP =
       "Name/Id of the member whose configuration will be described.";
   public static final String DESCRIBE_CONFIG__HIDE__DEFAULTS = "hide-defaults";
@@ -1097,7 +1091,6 @@ public class CliStrings {
   public static final String DESCRIBE_DISK_STORE = "describe disk-store";
   public static final String DESCRIBE_DISK_STORE__HELP =
       "Display information about a member's disk store.";
-  public static final String DESCRIBE_DISK_STORE__MEMBER = "member";
   public static final String DESCRIBE_DISK_STORE__MEMBER__HELP =
       "Name/Id of the member with the disk store to be described.";
   public static final String DESCRIBE_DISK_STORE__NAME = "name";
@@ -1182,7 +1175,6 @@ public class CliStrings {
   public static final String DESTROY_DISK_STORE__NAME = "name";
   public static final String DESTROY_DISK_STORE__NAME__HELP =
       "Name of the disk store that will be destroyed.";
-  public static final String DESTROY_DISK_STORE__GROUP = "group";
   public static final String DESTROY_DISK_STORE__GROUP__HELP =
       "Group(s) of members on which the disk store will be destroyed. If no group is specified the disk store will be destroyed on all members.";
   public static final String DESTROY_DISK_STORE__ERROR_WHILE_DESTROYING_REASON_0 =
@@ -1194,10 +1186,8 @@ public class CliStrings {
       "Destroy/Unregister a function. The default is for the function to be unregistered from all members.";
   public static final String DESTROY_FUNCTION__ID = "id";
   public static final String DESTROY_FUNCTION__ID__HELP = "ID of the function.";
-  public static final String DESTROY_FUNCTION__ONGROUPS = "groups";
   public static final String DESTROY_FUNCTION__ONGROUPS__HELP =
       "Groups of members from which this function will be unregistered.";
-  public static final String DESTROY_FUNCTION__ONMEMBER = "member";
   public static final String DESTROY_FUNCTION__ONMEMBER__HELP =
       "Name/Id of the member from which this function will be unregistered.";
   public static final String DESTROY_FUNCTION__MSG__CANNOT_EXECUTE = "Cannot execute";
@@ -1209,13 +1199,11 @@ public class CliStrings {
   public static final String DESTROY_INDEX__HELP = "Destroy/Remove the specified index.";
   public static final String DESTROY_INDEX__NAME = "name";
   public static final String DESTROY_INDEX__NAME__HELP = "Name of the index to remove.";
-  public static final String DESTROY_INDEX__MEMBER = "member";
   public static final String DESTROY_INDEX__MEMBER__HELP =
       "Name/Id of the member from which the index will be removed.";
   public static final String DESTROY_INDEX__REGION = "region";
   public static final String DESTROY_INDEX__REGION__HELP =
       "Name/Path of the region from which the index will be removed.";
-  public static final String DESTROY_INDEX__GROUP = "group";
   public static final String DESTROY_INDEX__GROUP__HELP =
       "Group of members from which the index will be removed.";
   public static final String DESTROY_INDEX__SUCCESS__MSG =
@@ -1290,10 +1278,8 @@ public class CliStrings {
       "Execute the function with the specified ID. By default will execute on all members.";
   public static final String EXECUTE_FUNCTION__ID = "id";
   public static final String EXECUTE_FUNCTION__ID__HELP = "ID of the function to execute.";
-  public static final String EXECUTE_FUNCTION__ONGROUPS = "groups";
   public static final String EXECUTE_FUNCTION__ONGROUPS__HELP =
       "Groups of members on which the function will be executed.";
-  public static final String EXECUTE_FUNCTION__ONMEMBER = "member";
   public static final String EXECUTE_FUNCTION__ONMEMBER__HELP =
       "Name/Id of the member on which the function will be executed.";
   public static final String EXECUTE_FUNCTION__ONREGION = "region";
@@ -1358,10 +1344,8 @@ public class CliStrings {
   public static final String EXPORT_CONFIG = "export config";
   public static final String EXPORT_CONFIG__HELP =
       "Export configuration properties for a member or members.";
-  public static final String EXPORT_CONFIG__GROUP = "group";
   public static final String EXPORT_CONFIG__GROUP__HELP =
       "Group(s) of members whose configuration will be exported.";
-  public static final String EXPORT_CONFIG__MEMBER = "member";
   public static final String EXPORT_CONFIG__MEMBER__HELP =
       "Name/Id of the member(s) whose configuration will be exported.";
   public static final String EXPORT_CONFIG__DIR = "dir";
@@ -1384,7 +1368,6 @@ public class CliStrings {
   public static final String EXPORT_DATA__FILE = "file";
   public static final String EXPORT_DATA__FILE__HELP =
       "File to which the exported data will be written. The file must have an extension of \".gfd\".";
-  public static final String EXPORT_DATA__MEMBER = "member";
   public static final String EXPORT_DATA__MEMBER__HELP =
       "Name/Id of a member which hosts the region. The data will be exported to the specified file on the host where the member is running.";
   public static final String EXPORT_DATA__MEMBER__NOT__FOUND = "Member {0} not found";
@@ -1398,10 +1381,8 @@ public class CliStrings {
   public static final String EXPORT_LOGS__DIR = "dir";
   public static final String EXPORT_LOGS__DIR__HELP =
       "Directory to which logs will be written.  This refers to a local directory when exporting logs using an http connection, but refers to the filesystem of the manager when connected via JMX. If not specified, logs are written to the location specified by the user.dir system property.";
-  public static final String EXPORT_LOGS__MEMBER = "member";
   public static final String EXPORT_LOGS__MEMBER__HELP =
       "Name/Id of the member whose log files will be exported.";
-  public static final String EXPORT_LOGS__GROUP = "group";
   public static final String EXPORT_LOGS__GROUP__HELP =
       "Group of members whose log files will be exported.";
   public static final String EXPORT_LOGS__MSG__CANNOT_EXECUTE = "Cannot execute";
@@ -1451,10 +1432,8 @@ public class CliStrings {
   public static final String EXPORT_STACKTRACE = "export stack-traces";
   public static final String EXPORT_STACKTRACE__HELP =
       "Export the stack trace for a member or members.";
-  public static final String EXPORT_STACKTRACE__MEMBER = "member";
   public static final String EXPORT_STACKTRACE__MEMBER__HELP =
       "Name/Id of the member whose stack trace will be exported.";
-  public static final String EXPORT_STACKTRACE__GROUP = "group";
   public static final String EXPORT_STACKTRACE__GROUP__HELP =
       "Group of members whose stack trace will be exported.";
   public static final String EXPORT_STACKTRACE_ALL_STACKS = "all-stacks";
@@ -1480,10 +1459,8 @@ public class CliStrings {
   public static final String GC = "gc";
   public static final String GC__HELP =
       "Force GC (Garbage Collection) on a member or members. The default is for garbage collection to occur on all caching members.";
-  public static final String GC__MEMBER = "member";
   public static final String GC__MEMBER__HELP =
       "Name/Id of the member on which garbage collection will be done.";
-  public static final String GC__GROUP = "group";
   public static final String GC__GROUP__HELP =
       "Group(s) of members on which garbage collection will be done.";
   public static final String GC__MSG__MEMBER_NOT_FOUND = "Member not found";
@@ -1571,7 +1548,6 @@ public class CliStrings {
   public static final String IMPORT_DATA__FILE = "file";
   public static final String IMPORT_DATA__FILE__HELP =
       "File from which the imported data will be read. The file must have an extension of \".gfd\".";
-  public static final String IMPORT_DATA__MEMBER = "member";
   public static final String IMPORT_DATA__MEMBER__HELP =
       "Name/Id of a member which hosts the region. The data will be imported from the specified file on the host where the member is running.";
   public static final String IMPORT_DATA__MEMBER__NOT__FOUND = "Member {0} not found.";
@@ -1647,7 +1623,6 @@ public class CliStrings {
   public static final String LIST_DEPLOYED = "list deployed";
   public static final String LIST_DEPLOYED__HELP =
       "Display a list of JARs that were deployed to members using the \"deploy\" command.";
-  public static final String LIST_DEPLOYED__GROUP = "group";
   public static final String LIST_DEPLOYED__GROUP__HELP =
       "Group(s) of members for which deployed JARs will be displayed.  If not specified, JARs for all members will be displayed.";
   public static final String LIST_DEPLOYED__NO_JARS_FOUND_MESSAGE = "No JAR Files Found";
@@ -1659,10 +1634,8 @@ public class CliStrings {
   public static final String LIST_FUNCTION__MATCHES = "matches";
   public static final String LIST_FUNCTION__MATCHES__HELP =
       "Pattern that the function ID must match in order to be included. Uses Java pattern matching rules, not UNIX. For example, to match any character any number of times use \".*\" instead of \"*\".";
-  public static final String LIST_FUNCTION__GROUP = "group";
   public static final String LIST_FUNCTION__GROUP__HELP =
       "Group(s) of members for which functions will be displayed.";
-  public static final String LIST_FUNCTION__MEMBER = "member";
   public static final String LIST_FUNCTION__MEMBER__HELP =
       "Name/Id of the member(s) for which functions will be displayed.";
   public static final String LIST_FUNCTION__NO_FUNCTIONS_FOUND_ERROR_MESSAGE = "No Functions Found";
@@ -1670,10 +1643,8 @@ public class CliStrings {
   public static final String LIST_GATEWAY = "list gateways";
   public static final String LIST_GATEWAY__HELP =
       "Display the Gateway Senders and Receivers for a member or members.";
-  public static final String LIST_GATEWAY__GROUP = "group";
   public static final String LIST_GATEWAY__GROUP__HELP =
       "Group(s) of members for which Gateway Senders and Receivers will be displayed.";
-  public static final String LIST_GATEWAY__MEMBER = "member";
   public static final String LIST_GATEWAY__MEMBER__HELP =
       "Member(s) for which Gateway Senders and Receivers will be displayed.";
   /* list index */
@@ -1698,7 +1669,6 @@ public class CliStrings {
   /* 'list member' command */
   public static final String LIST_MEMBER = "list members";
   public static final String LIST_MEMBER__HELP = "Display all or a subset of members.";
-  public static final String LIST_MEMBER__GROUP = "group";
   public static final String LIST_MEMBER__GROUP__HELP =
       "Group name for which members will be displayed.";
   public static final String LIST_MEMBER__MSG__NO_MEMBER_FOUND = NO_MEMBERS_FOUND_MESSAGE;
@@ -1706,10 +1676,8 @@ public class CliStrings {
   /* 'list region' command */
   public static final String LIST_REGION = "list regions";
   public static final String LIST_REGION__HELP = "Display regions of a member or members.";
-  public static final String LIST_REGION__GROUP = "group";
   public static final String LIST_REGION__GROUP__HELP =
       "Group of members for which regions will be displayed.";
-  public static final String LIST_REGION__MEMBER = "member";
   public static final String LIST_REGION__MEMBER__HELP =
       "Name/Id of the member for which regions will be displayed.";
   public static final String LIST_REGION__MSG__NOT_FOUND = "No Regions Found";
@@ -1755,10 +1723,8 @@ public class CliStrings {
   public static final String NETSTAT = "netstat";
   public static final String NETSTAT__HELP =
       "Report network information and statistics via the \"netstat\" operating system command.";
-  public static final String NETSTAT__MEMBER = "member";
   public static final String NETSTAT__MEMBER__HELP =
       "Name/Id of the member(s) on which to run the netstat command.";
-  public static final String NETSTAT__GROUP = "group";
   public static final String NETSTAT__GROUP__HELP =
       "Group of members on which to run the netstat command.";
   public static final String NETSTAT__FILE = "file";
@@ -1784,9 +1750,7 @@ public class CliStrings {
 
   /* pause gateway-sender */
   public static final String PAUSE_GATEWAYSENDER = "pause gateway-sender";
-  public static final String PAUSE_GATEWAYSENDER__ID = "id";;
-  public static final String PAUSE_GATEWAYSENDER__MEMBER = "member";
-  public static final String PAUSE_GATEWAYSENDER__GROUP = "group";
+  public static final String PAUSE_GATEWAYSENDER__ID = "id";
   public static final String PAUSE_GATEWAYSENDER__HELP =
       "Pause the Gateway Sender on a member or members.";
   public static final String PAUSE_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
@@ -1938,9 +1902,7 @@ public class CliStrings {
 
   /* resume gateway-sender */
   public static final String RESUME_GATEWAYSENDER = "resume gateway-sender";
-  public static final String RESUME_GATEWAYSENDER__ID = "id";;
-  public static final String RESUME_GATEWAYSENDER__MEMBER = "member";
-  public static final String RESUME_GATEWAYSENDER__GROUP = "group";
+  public static final String RESUME_GATEWAYSENDER__ID = "id";
   public static final String RESUME_GATEWAYSENDER__HELP =
       "Resume the Gateway Sender on a member or members.";
   public static final String RESUME_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
@@ -1977,7 +1939,7 @@ public class CliStrings {
       "Set GFSH variables that can be used by commands. "
           + "For example: if variable \"CACHE_SERVERS_GROUP\" is set then to use it with \""
           + CliStrings.LIST_MEMBER + "\", use \"" + CliStrings.LIST_MEMBER + " --"
-          + CliStrings.LIST_MEMBER__GROUP + "=${CACHE_SERVERS_GROUP}\". "
+          + CliStrings.GROUP + "=${CACHE_SERVERS_GROUP}\". "
           + "The \"echo\" command can be used to know the value of a variable.";
   public static final String SET_VARIABLE__VAR = "name";
   public static final String SET_VARIABLE__VAR__HELP =
@@ -2029,7 +1991,6 @@ public class CliStrings {
   /* Show Log command */
   public static final String SHOW_LOG = "show log";
   public static final String SHOW_LOG_HELP = "Display the log for a member.";
-  public static final String SHOW_LOG_MEMBER = "member";
   public static final String SHOW_LOG_MEMBER_HELP =
       "Name/Id of the member whose log file will be displayed.";
   public static final String SHOW_LOG_LINE_NUM = "lines";
@@ -2047,7 +2008,6 @@ public class CliStrings {
   public static final String SHOW_METRICS__REGION = "region";
   public static final String SHOW_METRICS__REGION__HELP =
       "Name/Path of the region whose metrics will be displayed/exported.";
-  public static final String SHOW_METRICS__MEMBER = "member";
   public static final String SHOW_METRICS__MEMBER__HELP =
       "Name/Id of the member whose metrics will be displayed/exported.";
   public static final String SHOW_METRICS__CATEGORY = "categories";
@@ -2112,10 +2072,8 @@ public class CliStrings {
   public static final String CHANGE_LOGLEVEL = "change loglevel";
   public static final String CHANGE_LOGLEVEL__HELP =
       "This command changes log-level run time on specified servers.";
-  public static final String CHANGE_LOGLEVEL__GROUPS = "groups";
   public static final String CHANGE_LOGLEVEL__GROUPS__HELP =
       "Groups of members to change the log-level";
-  public static final String CHANGE_LOGLEVEL__MEMBER = "members";
   public static final String CHANGE_LOGLEVEL__MEMBER__HELP =
       "Name/Id of the member to change the log-level";
   public static final String CHANGE_LOGLEVEL__LOGLEVEL = "loglevel";
@@ -2143,10 +2101,8 @@ public class CliStrings {
   public static final String CREATE_GATEWAYRECEIVER = "create gateway-receiver";
   public static final String CREATE_GATEWAYRECEIVER__HELP =
       "Create the Gateway Receiver on a member or members.";
-  public static final String CREATE_GATEWAYRECEIVER__GROUP = "group";
   public static final String CREATE_GATEWAYRECEIVER__GROUP__HELP =
       "Group(s) of members on which to create the Gateway Receiver.";
-  public static final String CREATE_GATEWAYRECEIVER__MEMBER = "member";
   public static final String CREATE_GATEWAYRECEIVER__MEMBER__HELP =
       "Name/Id of the member on which to create the Gateway Receiver.";
   public static final String CREATE_GATEWAYRECEIVER__STARTPORT = "start-port";
@@ -2178,8 +2134,6 @@ public class CliStrings {
 
   /* start gateway-receiver */
   public static final String START_GATEWAYRECEIVER = "start gateway-receiver";
-  public static final String START_GATEWAYRECEIVER__MEMBER = "member";
-  public static final String START_GATEWAYRECEIVER__GROUP = "group";
   public static final String START_GATEWAYRECEIVER__HELP =
       "Start the Gateway Receiver on a member or members.";
   public static final String START_GATEWAYRECEIVER__GROUP__HELP =
@@ -2191,10 +2145,8 @@ public class CliStrings {
   public static final String CREATE_GATEWAYSENDER = "create gateway-sender";
   public static final String CREATE_GATEWAYSENDER__HELP =
       "Create the Gateway Sender on a member or members.";
-  public static final String CREATE_GATEWAYSENDER__GROUP = "group";
   public static final String CREATE_GATEWAYSENDER__GROUP__HELP =
       "Group(s) of members on which to create the Gateway Sender.";
-  public static final String CREATE_GATEWAYSENDER__MEMBER = "member";
   public static final String CREATE_GATEWAYSENDER__MEMBER__HELP =
       "Name/Id of the member on which to create the Gateway Sender.";
   public static final String CREATE_GATEWAYSENDER__ID = "id";
@@ -2266,10 +2218,8 @@ public class CliStrings {
       "Start the Gateway Sender on a member or members.";
   public static final String START_GATEWAYSENDER__ID = "id";
   public static final String START_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
-  public static final String START_GATEWAYSENDER__GROUP = "group";
   public static final String START_GATEWAYSENDER__GROUP__HELP =
       "Group(s) of members on which to start the Gateway Sender.";
-  public static final String START_GATEWAYSENDER__MEMBER = "member";
   public static final String START_GATEWAYSENDER__MEMBER__HELP =
       "Name/Id of the member on which to start the Gateway Sender.";
 
@@ -2278,10 +2228,8 @@ public class CliStrings {
   public static final String DESTROY_GATEWAYSENDER = "destroy gateway-sender";
   public static final String DESTROY_GATEWAYSENDER__HELP =
       "Destroy the Gateway Sender on a member or members.";
-  public static final String DESTROY_GATEWAYSENDER__GROUP = "group";
   public static final String DESTROY_GATEWAYSENDER__GROUP__HELP =
       "Group(s) of members on which to destroy the Gateway Sender.";
-  public static final String DESTROY_GATEWAYSENDER__MEMBER = "member";
   public static final String DESTROY_GATEWAYSENDER__MEMBER__HELP =
       "Name/Id of the member on which to destroy the Gateway Sender.";
   public static final String DESTROY_GATEWAYSENDER__ID = "id";
@@ -2363,7 +2311,6 @@ public class CliStrings {
   public static final String START_LOCATOR__FORCE = "force";
   public static final String START_LOCATOR__FORCE__HELP =
       "Whether to allow the PID file from a previous Locator run to be overwritten.";
-  public static final String START_LOCATOR__GROUP = "group";
   public static final String START_LOCATOR__GROUP__HELP = "Group(s) the Locator will be a part of.";
   public static final String START_LOCATOR__HOSTNAME_FOR_CLIENTS = "hostname-for-clients";
 
@@ -2461,7 +2408,6 @@ public class CliStrings {
   public static final String START_MANAGER__BIND_ADDRESS = "bind-address";
   public static final String START_MANAGER__BIND_ADDRESS__HELP =
       "IP address the Manager listen on for JMX-RMI client connections. The default is to bind to all local addresses.";
-  public static final String START_MANAGER__GROUP = "group";
   public static final String START_MANAGER__GROUP__HELP =
       "Group(s) this Manager will be a part of.";
   public static final String START_MANAGER__MAXHEAP = "max-heap";
@@ -2508,7 +2454,6 @@ public class CliStrings {
   public static final String START_SERVER__FORCE = "force";
   public static final String START_SERVER__FORCE__HELP =
       "Whether to allow the PID file from a previous Cache Server run to be overwritten.";
-  public static final String START_SERVER__GROUP = "group";
   public static final String START_SERVER__GROUP__HELP =
       "Group(s) the Cache Server will be a part of.";
   public static final String START_SERVER__INCLUDE_SYSTEM_CLASSPATH = "include-system-classpath";
@@ -2705,10 +2650,8 @@ public class CliStrings {
   public static final String STATUS_GATEWAYRECEIVER = "status gateway-receiver";
   public static final String STATUS_GATEWAYRECEIVER__HELP =
       "Display the status of a Gateway Receiver.";
-  public static final String STATUS_GATEWAYRECEIVER__GROUP = "group";
   public static final String STATUS_GATEWAYRECEIVER__GROUP__HELP =
       "Group(s) of Gateway Receivers for which to display status.";
-  public static final String STATUS_GATEWAYRECEIVER__MEMBER = "member";
   public static final String STATUS_GATEWAYRECEIVER__MEMBER__HELP =
       "Name/Id of the Gateway Receiver for which to display status.";
 
@@ -2717,10 +2660,8 @@ public class CliStrings {
   public static final String STATUS_GATEWAYSENDER__HELP = "Display the status of a Gateway Sender.";
   public static final String STATUS_GATEWAYSENDER__ID = "id";
   public static final String STATUS_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
-  public static final String STATUS_GATEWAYSENDER__GROUP = "group";
   public static final String STATUS_GATEWAYSENDER__GROUP__HELP =
       "Group(s) of Gateway Senders for which to display status.";
-  public static final String STATUS_GATEWAYSENDER__MEMBER = "member";
   public static final String STATUS_GATEWAYSENDER__MEMBER__HELP =
       "Name/Id of the Gateway Sender for which to display status.";
 
@@ -2767,8 +2708,6 @@ public class CliStrings {
 
   /* stop gateway-reciver */
   public static final String STOP_GATEWAYRECEIVER = "stop gateway-receiver";
-  public static final String STOP_GATEWAYRECEIVER__MEMBER = "member";
-  public static final String STOP_GATEWAYRECEIVER__GROUP = "group";
   public static final String STOP_GATEWAYRECEIVER__HELP =
       "Stop the Gateway Receiver on a member or members.";
   public static final String STOP_GATEWAYRECEIVER__GROUP__HELP =
@@ -2778,9 +2717,7 @@ public class CliStrings {
 
   /* stop gateway-sender */
   public static final String STOP_GATEWAYSENDER = "stop gateway-sender";
-  public static final String STOP_GATEWAYSENDER__ID = "id";;
-  public static final String STOP_GATEWAYSENDER__MEMBER = "member";
-  public static final String STOP_GATEWAYSENDER__GROUP = "group";
+  public static final String STOP_GATEWAYSENDER__ID = "id";
   public static final String STOP_GATEWAYSENDER__HELP =
       "Stop the Gateway Sender on a member or members.";
   public static final String STOP_GATEWAYSENDER__ID__HELP = "ID of the Gateway Sender.";
@@ -2840,10 +2777,8 @@ public class CliStrings {
   /* undeploy command */
   public static final String UNDEPLOY = "undeploy";
   public static final String UNDEPLOY__HELP = "Undeploy JARs from a member or members.";
-  public static final String UNDEPLOY__GROUP = "group";
   public static final String UNDEPLOY__GROUP__HELP =
       "Group(s) of members from which to undeploy JARs. If not specified, undeploy will occur on all members.";
-  public static final String UNDEPLOY__JAR = "jar";
   public static final String UNDEPLOY__JAR__HELP =
       "JAR(s) to be undeployed.  If not specified, all JARs will be undeployed.";
   public static final String UNDEPLOY__NO_JARS_FOUND_MESSAGE = "No JAR Files Found";
@@ -3006,10 +2941,8 @@ public class CliStrings {
       "The id used to identify the durable client";
   public static final String LIST_DURABLE_CQS__HELP =
       "List durable client cqs associated with the specified durable client id.";
-  public static final String LIST_DURABLE_CQS__MEMBER = "member";
   public static final String LIST_DURABLE_CQS__MEMBER__HELP =
       "Name/Id of the member for which the durable client is registered and durable cqs will be displayed.";
-  public static final String LIST_DURABLE_CQS__GROUP = "group";
   public static final String LIST_DURABLE_CQS__GROUP__HELP =
       "Group of members for which the durable client is registered and durable cqs will be displayed.";
   public static final String LIST_DURABLE_CQS__NO__CQS__FOR__CLIENT =
@@ -3035,10 +2968,8 @@ public class CliStrings {
   public static final String CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID = DURABLE_CLIENT_ID;
   public static final String CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID__HELP =
       "The id of the durable client";
-  public static final String CLOSE_DURABLE_CQS__MEMBER = "member";
   public static final String CLOSE_DURABLE_CQS__MEMBER__HELP =
       "Name/Id of the member for which the durable client is registered and the cq to be closed.";
-  public static final String CLOSE_DURABLE_CQS__GROUP = "group";
   public static final String CLOSE_DURABLE_CQS__GROUP__HELP =
       "Group of members for which the durable client is registered and the cq to be closed.";
   public static final String CLOSE_DURABLE_CQS__FAILURE__HEADER =
@@ -3055,10 +2986,8 @@ public class CliStrings {
   public static final String CLOSE_DURABLE_CLIENTS__CLIENT__ID = DURABLE_CLIENT_ID;
   public static final String CLOSE_DURABLE_CLIENTS__CLIENT__ID__HELP =
       "The id used to identify the durable client.";
-  public static final String CLOSE_DURABLE_CLIENTS__MEMBER = "member";
   public static final String CLOSE_DURABLE_CLIENTS__MEMBER__HELP =
       "Name/Id of the member for which the durable client is to be closed.";
-  public static final String CLOSE_DURABLE_CLIENTS__GROUP = "group";
   public static final String CLOSE_DURABLE_CLIENTS__GROUP__HELP =
       "Group of members for which the durable client is to be closed.";
   public static final String CLOSE_DURABLE_CLIENTS__FAILURE__HEADER =
@@ -3075,10 +3004,8 @@ public class CliStrings {
   public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME = "durable-cq-name";
   public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME__HELP =
       "The name that identifies the cq.";
-  public static final String COUNT_DURABLE_CQ_EVENTS__MEMBER = "member";
   public static final String COUNT_DURABLE_CQ_EVENTS__MEMBER__HELP =
       "Name/Id of the member for which the subscription events are to be counted.";
-  public static final String COUNT_DURABLE_CQ_EVENTS__GROUP = "group";
   public static final String COUNT_DURABLE_CQ_EVENTS__GROUP__HELP =
       "Group of members for which the subscription queue events are to be counted.";
   public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE_CLIENT_NOT_FOUND =
@@ -3230,6 +3157,8 @@ public class CliStrings {
   public static final String START_SERVER__MSG__PASSWORD_MUST_BE_SPECIFIED =
       "password must be specified.";
 
+
+
   /**
    * Creates a MessageFormat with the given pattern and uses it to format the given argument.
    *

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
index 25d0cc3..9f06ea3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java
@@ -53,10 +53,8 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
   @RequestMapping(method = RequestMethod.POST, value = "/config")
   @ResponseBody
   public String alterRuntime(
-      @RequestParam(value = CliStrings.ALTER_RUNTIME_CONFIG__GROUP,
-          required = false) final String group,
-      @RequestParam(value = CliStrings.ALTER_RUNTIME_CONFIG__MEMBER,
-          required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String group,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
       @RequestParam(value = CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT,
           required = false) final Integer archiveDiskSpaceLimit,
       @RequestParam(value = CliStrings.ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT,
@@ -86,11 +84,11 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.ALTER_RUNTIME_CONFIG);
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.ALTER_RUNTIME_CONFIG__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(group)) {
-      command.addOption(CliStrings.ALTER_RUNTIME_CONFIG__GROUP, group);
+      command.addOption(CliStrings.GROUP, group);
     }
 
     if (hasValue(archiveDiskSpaceLimit)) {
@@ -166,7 +164,7 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
           defaultValue = "true") final Boolean hideDefaults) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESCRIBE_CONFIG);
 
-    command.addOption(CliStrings.DESCRIBE_CONFIG__MEMBER, decode(memberNameId));
+    command.addOption(CliStrings.MEMBER, decode(memberNameId));
     command.addOption(CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS, String.valueOf(hideDefaults));
 
     return processCommand(command.toString());
@@ -174,22 +172,18 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle
 
   @RequestMapping(method = RequestMethod.GET, value = "/config")
   public Callable<ResponseEntity<String>> exportConfig(
-      @RequestParam(value = CliStrings.EXPORT_CONFIG__GROUP,
-          required = false) final String[] groups,
-      @RequestParam(value = CliStrings.EXPORT_CONFIG__MEMBER,
-          required = false) final String[] members,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members,
       @RequestParam(value = CliStrings.EXPORT_CONFIG__DIR,
           required = false) final String directory) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.EXPORT_CONFIG);
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.EXPORT_CONFIG__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     if (hasValue(members)) {
-      command.addOption(CliStrings.EXPORT_CONFIG__MEMBER,
-          StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
     }
 
     if (hasValue(directory)) {

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
index ce2ed54..fb63184 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java
@@ -133,7 +133,7 @@ public class DataCommandsController extends AbstractCommandsController {
       @RequestParam(CliStrings.EXPORT_DATA__FILE) final String file) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.EXPORT_DATA);
 
-    command.addOption(CliStrings.EXPORT_DATA__MEMBER, decode(memberNameId));
+    command.addOption(CliStrings.MEMBER, decode(memberNameId));
     command.addOption(CliStrings.EXPORT_DATA__REGION, decode(regionNamePath));
     command.addOption(CliStrings.EXPORT_DATA__FILE, decode(file));
 
@@ -147,7 +147,7 @@ public class DataCommandsController extends AbstractCommandsController {
       @RequestParam(CliStrings.IMPORT_DATA__FILE) final String file) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.IMPORT_DATA);
 
-    command.addOption(CliStrings.IMPORT_DATA__MEMBER, decode(memberNameId));
+    command.addOption(CliStrings.MEMBER, decode(memberNameId));
     command.addOption(CliStrings.IMPORT_DATA__REGION, decode(regionNamePath));
     command.addOption(CliStrings.IMPORT_DATA__FILE, decode(file));
 

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
index 35f57ef..23c5083 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java
@@ -48,13 +48,12 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
 
   @RequestMapping(method = RequestMethod.GET, value = "/deployed")
   @ResponseBody
-  public String listDeployed(@RequestParam(value = CliStrings.LIST_DEPLOYED__GROUP,
-      required = false) final String[] groups) {
+  public String listDeployed(
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_DEPLOYED);
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.LIST_DEPLOYED__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return processCommand(command.toString());
@@ -66,19 +65,18 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
   // @RequestPart(RESOURCES_REQUEST_PARAMETER) final Resource[] jarFileResources,
   public String deploy(
       @RequestParam(RESOURCES_REQUEST_PARAMETER) final MultipartFile[] jarFileResources,
-      @RequestParam(value = CliStrings.DEPLOY__GROUP, required = false) final String[] groups,
-      @RequestParam(value = CliStrings.DEPLOY__JAR, required = false) final String jarFileName,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+      @RequestParam(value = CliStrings.JAR, required = false) final String jarFileName,
       @RequestParam(value = CliStrings.DEPLOY__DIR, required = false) final String directory)
       throws IOException {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.DEPLOY);
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.DEPLOY__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     if (hasValue(jarFileName)) {
-      command.addOption(CliStrings.DEPLOY__JAR, jarFileName);
+      command.addOption(CliStrings.JAR, jarFileName);
     }
 
     if (hasValue(directory)) {
@@ -93,18 +91,16 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle
   @RequestMapping(method = RequestMethod.DELETE, value = "/deployed")
   @ResponseBody
   public String undeploy(
-      @RequestParam(value = CliStrings.UNDEPLOY__GROUP, required = false) final String[] groups,
-      @RequestParam(value = CliStrings.UNDEPLOY__JAR,
-          required = false) final String[] jarFileNames) {
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+      @RequestParam(value = CliStrings.JAR, required = false) final String[] jarFileNames) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.UNDEPLOY);
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.UNDEPLOY__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     if (hasValue(jarFileNames)) {
-      command.addOption(CliStrings.UNDEPLOY__JAR,
+      command.addOption(CliStrings.JAR,
           StringUtils.join(jarFileNames, StringUtils.COMMA_DELIMITER));
     }
 

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
index fa074c3..c613a8a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java
@@ -72,15 +72,13 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.POST, value = "/diskstores/{name}", params = "op=compact")
   public Callable<ResponseEntity<String>> compactDiskStore(
       @PathVariable("name") final String diskStoreNameId,
-      @RequestParam(value = CliStrings.COMPACT_DISK_STORE__GROUP,
-          required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.COMPACT_DISK_STORE);
 
     command.addOption(CliStrings.COMPACT_DISK_STORE__NAME, decode(diskStoreNameId));
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.COMPACT_DISK_STORE__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return getProcessCommandCallable(command.toString());
@@ -110,8 +108,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
           defaultValue = "90") final Float diskUsageWarningPercentage,
       @RequestParam(value = CliStrings.CREATE_DISK_STORE__DISK_USAGE_CRITICAL_PCT,
           defaultValue = "99") final Integer diskUsageCriticalPercentage,
-      @RequestParam(value = CliStrings.CREATE_DISK_STORE__GROUP,
-          required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_DISK_STORE);
 
     command.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStoreNameId);
@@ -136,8 +133,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
         String.valueOf(diskUsageCriticalPercentage));
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.CREATE_DISK_STORE__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return processCommand(command.toString());
@@ -146,9 +142,9 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.GET, value = "/diskstores/{name}")
   @ResponseBody
   public String describeDiskStore(@PathVariable("name") final String diskStoreNameId,
-      @RequestParam(CliStrings.DESCRIBE_DISK_STORE__MEMBER) final String memberNameId) {
+      @RequestParam(CliStrings.MEMBER) final String memberNameId) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESCRIBE_DISK_STORE);
-    command.addOption(CliStrings.DESCRIBE_DISK_STORE__MEMBER, memberNameId);
+    command.addOption(CliStrings.MEMBER, memberNameId);
     command.addOption(CliStrings.DESCRIBE_DISK_STORE__NAME, decode(diskStoreNameId));
     return processCommand(command.toString());
   }
@@ -157,15 +153,13 @@ public class DiskStoreCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.DELETE, value = "/diskstores/{name}")
   @ResponseBody
   public String destroyDiskStore(@PathVariable("name") final String diskStoreNameId,
-      @RequestParam(value = CliStrings.DESTROY_DISK_STORE__GROUP,
-          required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESTROY_DISK_STORE);
 
     command.addOption(CliStrings.DESTROY_DISK_STORE__NAME, decode(diskStoreNameId));
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.DESTROY_DISK_STORE__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return processCommand(command.toString());

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
index 8f31f7a..4562cd5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java
@@ -49,21 +49,18 @@ public class DurableClientCommandsController extends AbstractCommandsController
   @ResponseBody
   public String listDurableClientContinuousQueries(
       @PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
-      @RequestParam(value = CliStrings.LIST_DURABLE_CQS__MEMBER,
-          required = false) final String memberNameId,
-      @RequestParam(value = CliStrings.LIST_DURABLE_CQS__GROUP,
-          required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_DURABLE_CQS);
 
     command.addOption(CliStrings.LIST_DURABLE_CQS__DURABLECLIENTID, decode(durableClientId));
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.LIST_DURABLE_CQS__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.LIST_DURABLE_CQS__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return processCommand(command.toString());
@@ -74,10 +71,8 @@ public class DurableClientCommandsController extends AbstractCommandsController
   @ResponseBody
   public String countDurableClientContinuousQueryEvents(
       @PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
-      @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER,
-          required = false) final String memberNameId,
-      @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP,
-          required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     return internalCountDurableClientContinuousQueryEvents(decode(durableClientId), null,
         memberNameId, groups);
   }
@@ -88,10 +83,8 @@ public class DurableClientCommandsController extends AbstractCommandsController
   public String countDurableClientContinuousQueryEvents(
       @PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
       @PathVariable("durable-cq-name") final String durableCqName,
-      @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER,
-          required = false) final String memberNameId,
-      @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP,
-          required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     return internalCountDurableClientContinuousQueryEvents(decode(durableClientId),
         decode(durableCqName), memberNameId, groups);
   }
@@ -108,12 +101,11 @@ public class DurableClientCommandsController extends AbstractCommandsController
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return processCommand(command.toString());
@@ -124,21 +116,18 @@ public class DurableClientCommandsController extends AbstractCommandsController
   @ResponseBody
   public String closeDurableClient(
       @PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
-      @RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER,
-          required = false) final String memberNameId,
-      @RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__GROUP,
-          required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CLIENTS);
 
     command.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__CLIENT__ID, decode(durableClientId));
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return processCommand(command.toString());
@@ -150,22 +139,19 @@ public class DurableClientCommandsController extends AbstractCommandsController
   public String closeDurableContinuousQuery(
       @PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
       @PathVariable("durable-cq-name") final String durableCqName,
-      @RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__MEMBER,
-          required = false) final String memberNameId,
-      @RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__GROUP,
-          required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CQS);
 
     command.addOption(CliStrings.CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID, decode(durableClientId));
     command.addOption(CliStrings.CLOSE_DURABLE_CQS__NAME, decode(durableCqName));
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.CLOSE_DURABLE_CQS__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.CLOSE_DURABLE_CQS__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return processCommand(command.toString());

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
index ddfd936..87afc24 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java
@@ -42,9 +42,8 @@ public class ExportLogController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.GET, value = "/logs")
   public ResponseEntity<InputStreamResource> exportLogs(
       @RequestParam(value = CliStrings.EXPORT_LOGS__DIR, required = false) final String directory,
-      @RequestParam(value = CliStrings.EXPORT_LOGS__GROUP, required = false) final String[] groups,
-      @RequestParam(value = CliStrings.EXPORT_LOGS__MEMBER,
-          required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
       @RequestParam(value = CliStrings.EXPORT_LOGS__LOGLEVEL,
           required = false) final String logLevel,
       @RequestParam(value = CliStrings.EXPORT_LOGS__UPTO_LOGLEVEL,
@@ -65,12 +64,11 @@ public class ExportLogController extends AbstractCommandsController {
     command.addOption(CliStrings.EXPORT_LOGS__DIR, decode(directory));
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.EXPORT_LOGS__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.EXPORT_LOGS__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(logLevel)) {

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
index 508c335..855947e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java
@@ -50,22 +50,18 @@ public class FunctionCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.GET, value = "/functions")
   @ResponseBody
   public String listFunctions(
-      @RequestParam(value = CliStrings.LIST_FUNCTION__GROUP,
-          required = false) final String[] groups,
-      @RequestParam(value = CliStrings.LIST_FUNCTION__MEMBER,
-          required = false) final String[] members,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members,
       @RequestParam(value = CliStrings.LIST_FUNCTION__MATCHES,
           required = false) final String matches) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_FUNCTION);
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.LIST_FUNCTION__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     if (hasValue(members)) {
-      command.addOption(CliStrings.LIST_FUNCTION__MEMBER,
-          StringUtils.join(members, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.MEMBER, StringUtils.join(members, StringUtils.COMMA_DELIMITER));
     }
 
     if (hasValue(matches)) {
@@ -78,10 +74,8 @@ public class FunctionCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.POST, value = "/functions/{id}")
   public Callable<ResponseEntity<String>> executeFunction(
       @PathVariable("id") final String functionId,
-      @RequestParam(value = CliStrings.EXECUTE_FUNCTION__ONGROUPS,
-          required = false) final String groupName,
-      @RequestParam(value = CliStrings.EXECUTE_FUNCTION__ONMEMBER,
-          required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUPS, required = false) final String groupName,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
       @RequestParam(value = CliStrings.EXECUTE_FUNCTION__ONREGION,
           required = false) final String regionNamePath,
       @RequestParam(value = CliStrings.EXECUTE_FUNCTION__ARGUMENTS,
@@ -95,11 +89,11 @@ public class FunctionCommandsController extends AbstractCommandsController {
     command.addOption(CliStrings.EXECUTE_FUNCTION__ID, decode(functionId));
 
     if (hasValue(groupName)) {
-      command.addOption(CliStrings.EXECUTE_FUNCTION__ONGROUPS, groupName);
+      command.addOption(CliStrings.GROUPS, groupName);
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.EXECUTE_FUNCTION__ONMEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(regionNamePath)) {
@@ -124,20 +118,18 @@ public class FunctionCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.DELETE, value = "/functions/{id}")
   @ResponseBody
   public String destroyFunction(@PathVariable("id") final String functionId,
-      @RequestParam(value = CliStrings.DESTROY_FUNCTION__ONGROUPS,
-          required = false) final String groupName,
-      @RequestParam(value = CliStrings.DESTROY_FUNCTION__ONMEMBER,
-          required = false) final String memberNameId) {
+      @RequestParam(value = CliStrings.GROUPS, required = false) final String groupName,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.DESTROY_FUNCTION);
 
     command.addOption(CliStrings.DESTROY_FUNCTION__ID, decode(functionId));
 
     if (hasValue(groupName)) {
-      command.addOption(CliStrings.DESTROY_FUNCTION__ONGROUPS, groupName);
+      command.addOption(CliStrings.GROUPS, groupName);
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.DESTROY_FUNCTION__ONMEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     return processCommand(command.toString());

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java
index fc260eb..296156f 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/IndexCommandsController.java
@@ -60,10 +60,8 @@ public class IndexCommandsController extends AbstractCommandsController {
   public String createIndex(@RequestParam(CliStrings.CREATE_INDEX__NAME) final String name,
       @RequestParam(CliStrings.CREATE_INDEX__EXPRESSION) final String expression,
       @RequestParam(CliStrings.CREATE_INDEX__REGION) final String regionNamePath,
-      @RequestParam(value = CliStrings.CREATE_INDEX__GROUP,
-          required = false) final String groupName,
-      @RequestParam(value = CliStrings.CREATE_INDEX__MEMBER,
-          required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
       @RequestParam(value = CliStrings.CREATE_INDEX__TYPE,
           defaultValue = DEFAULT_INDEX_TYPE) final String type) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_INDEX);
@@ -74,11 +72,11 @@ public class IndexCommandsController extends AbstractCommandsController {
     command.addOption(CliStrings.CREATE_INDEX__TYPE, type);
 
     if (hasValue(groupName)) {
-      command.addOption(CliStrings.CREATE_INDEX__GROUP, groupName);
+      command.addOption(CliStrings.GROUP, groupName);
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.CREATE_INDEX__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     return processCommand(command.toString());
@@ -87,18 +85,16 @@ public class IndexCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.POST, value = "/indexes", params = "op=create-defined")
   @ResponseBody
   public String createDefinedIndexes(
-      @RequestParam(value = CliStrings.CREATE_DEFINED_INDEXES__GROUP,
-          required = false) final String groupName,
-      @RequestParam(value = CliStrings.CREATE_DEFINED_INDEXES__MEMBER,
-          required = false) final String memberNameId) {
+      @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_DEFINED_INDEXES);
 
     if (hasValue(groupName)) {
-      command.addOption(CliStrings.CREATE_DEFINED_INDEXES__GROUP, groupName);
+      command.addOption(CliStrings.GROUP, groupName);
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.CREATE_DEFINED_INDEXES__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     return processCommand(command.toString());
@@ -130,10 +126,8 @@ public class IndexCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.DELETE, value = "/indexes")
   @ResponseBody
   public String destroyIndexes(
-      @RequestParam(value = CliStrings.DESTROY_INDEX__GROUP,
-          required = false) final String groupName,
-      @RequestParam(value = CliStrings.DESTROY_INDEX__MEMBER,
-          required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
       @RequestParam(value = CliStrings.DESTROY_INDEX__REGION,
           required = false) final String regionNamePath) {
     return internalDestroyIndex(null, groupName, memberNameId, regionNamePath);
@@ -142,10 +136,8 @@ public class IndexCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.DELETE, value = "/indexes/{name}")
   @ResponseBody
   public String destroyIndex(@PathVariable("name") final String indexName,
-      @RequestParam(value = CliStrings.DESTROY_INDEX__GROUP,
-          required = false) final String groupName,
-      @RequestParam(value = CliStrings.DESTROY_INDEX__MEMBER,
-          required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
       @RequestParam(value = CliStrings.DESTROY_INDEX__REGION,
           required = false) final String regionNamePath) {
     return internalDestroyIndex(decode(indexName), groupName, memberNameId, regionNamePath);
@@ -160,11 +152,11 @@ public class IndexCommandsController extends AbstractCommandsController {
     }
 
     if (hasValue(groupName)) {
-      command.addOption(CliStrings.DESTROY_INDEX__GROUP, groupName);
+      command.addOption(CliStrings.GROUP, groupName);
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.DESTROY_INDEX__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(regionNamePath)) {

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java
index 56eea26..66e82ee 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MemberCommandsController.java
@@ -50,8 +50,8 @@ public class MemberCommandsController extends AbstractCommandsController {
   // public String listMembers(@RequestParam(value = "group", required = false) final String
   // groupName,
   // @RequestParam(value = "group", required = false) final String[] groupNames) {
-  public String listMembers(@RequestParam(value = CliStrings.LIST_MEMBER__GROUP,
-      required = false) final String groupName) {
+  public String listMembers(
+      @RequestParam(value = CliStrings.GROUP, required = false) final String groupName) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_MEMBER);
 
     // logger.info(String.format("Request Body: %1$s", requestParameters));
@@ -62,7 +62,7 @@ public class MemberCommandsController extends AbstractCommandsController {
     // final String groupName = requestParameters.getFirst("group");
 
     if (hasValue(groupName)) {
-      command.addOption(CliStrings.LIST_MEMBER__GROUP, groupName);
+      command.addOption(CliStrings.GROUP, groupName);
     }
 
     return processCommand(command.toString());

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
index 9b13b5f..fd28fed 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java
@@ -48,10 +48,8 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
   @ResponseBody
   public String exportStackTraces(
       @RequestParam(value = CliStrings.EXPORT_STACKTRACE__FILE, required = false) final String file,
-      @RequestParam(value = CliStrings.EXPORT_STACKTRACE__GROUP,
-          required = false) final String groupName,
-      @RequestParam(value = CliStrings.EXPORT_STACKTRACE__MEMBER,
-          required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
       @RequestParam(value = CliStrings.EXPORT_STACKTRACE__FAIL__IF__FILE__PRESENT,
           required = false) final boolean failIfFilePresent) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.EXPORT_STACKTRACE);
@@ -61,11 +59,11 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
     }
 
     if (hasValue(groupName)) {
-      command.addOption(CliStrings.EXPORT_STACKTRACE__GROUP, groupName);
+      command.addOption(CliStrings.GROUP, groupName);
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.EXPORT_STACKTRACE__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(failIfFilePresent)) {
@@ -80,12 +78,11 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
   @RequestMapping(method = RequestMethod.POST, value = "/gc")
   @ResponseBody
   public String gc(
-      @RequestParam(value = CliStrings.GC__GROUP, required = false) final String[] groups) {
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.GC);
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.GC__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     return processCommand(command.toString());
@@ -96,7 +93,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
   @ResponseBody
   public String gc(@PathVariable("member") final String memberNameId) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.GC);
-    command.addOption(CliStrings.GC__MEMBER, decode(memberNameId));
+    command.addOption(CliStrings.MEMBER, decode(memberNameId));
     return processCommand(command.toString());
   }
 
@@ -104,15 +101,15 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
   @RequestMapping(method = RequestMethod.GET, value = "/netstat")
   @ResponseBody
   public String netstat(
-      @RequestParam(value = CliStrings.NETSTAT__MEMBER, required = false) final String[] members,
-      @RequestParam(value = CliStrings.NETSTAT__GROUP, required = false) final String group,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String[] members,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String group,
       @RequestParam(value = CliStrings.NETSTAT__FILE, required = false) final String file,
       @RequestParam(value = CliStrings.NETSTAT__WITHLSOF,
           defaultValue = "false") final Boolean withLsof) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.NETSTAT);
 
-    addCommandOption(null, command, CliStrings.NETSTAT__MEMBER, members);
-    addCommandOption(null, command, CliStrings.NETSTAT__GROUP, group);
+    addCommandOption(null, command, CliStrings.MEMBER, members);
+    addCommandOption(null, command, CliStrings.GROUP, group);
     addCommandOption(null, command, CliStrings.NETSTAT__FILE, file);
     addCommandOption(null, command, CliStrings.NETSTAT__WITHLSOF, withLsof);
 
@@ -136,7 +133,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
       @RequestParam(value = CliStrings.SHOW_LOG_LINE_NUM, defaultValue = "0") final Integer lines) {
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.SHOW_LOG);
 
-    command.addOption(CliStrings.SHOW_LOG_MEMBER, decode(memberNameId));
+    command.addOption(CliStrings.MEMBER, decode(memberNameId));
     command.addOption(CliStrings.SHOW_LOG_LINE_NUM, String.valueOf(lines));
 
     return processCommand(command.toString());
@@ -146,8 +143,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
   @RequestMapping(method = RequestMethod.GET, value = "/metrics")
   @ResponseBody
   public String showMetrics(
-      @RequestParam(value = CliStrings.SHOW_METRICS__MEMBER,
-          required = false) final String memberNameId,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId,
       @RequestParam(value = CliStrings.SHOW_METRICS__REGION,
           required = false) final String regionNamePath,
       @RequestParam(value = CliStrings.SHOW_METRICS__FILE, required = false) final String file,
@@ -158,7 +154,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
     CommandStringBuilder command = new CommandStringBuilder(CliStrings.SHOW_METRICS);
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.SHOW_METRICS__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     if (hasValue(regionNamePath)) {
@@ -234,11 +230,11 @@ public class MiscellaneousCommandsController extends AbstractCommandsController
     command.addOption(CliStrings.CHANGE_LOGLEVEL__LOGLEVEL, decode(logLevel));
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.CHANGE_LOGLEVEL__GROUPS, decode(groups));
+      command.addOption(CliStrings.GROUP, decode(groups));
     }
 
     if (hasValue(members)) {
-      command.addOption(CliStrings.CHANGE_LOGLEVEL__MEMBER, decode(members));
+      command.addOption(CliStrings.MEMBER, decode(members));
     }
 
     return processCommand(command.toString());

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
index df49e49..02d9bcb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java
@@ -50,8 +50,7 @@ public class QueueCommandsController extends AbstractCommandsController {
       @RequestParam(CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER) final String listener,
       @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE,
           required = false) final String[] listenerParametersValues,
-      @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP,
-          required = false) final String[] groups,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
       @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL,
           defaultValue = "false") final Boolean parallel,
       @RequestParam(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE__ENABLEBATCHCONFLATION,
@@ -91,8 +90,7 @@ public class QueueCommandsController extends AbstractCommandsController {
     }
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL,

http://git-wip-us.apache.org/repos/asf/geode/blob/db8e1df3/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
index baf24e5..21f85bf 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java
@@ -48,17 +48,16 @@ public class RegionCommandsController extends AbstractCommandsController {
   @RequestMapping(method = RequestMethod.GET, value = "/regions")
   @ResponseBody
   public String listRegions(
-      @RequestParam(value = CliStrings.LIST_REGION__GROUP, required = false) final String groupName,
-      @RequestParam(value = CliStrings.LIST_REGION__MEMBER,
-          required = false) final String memberNameId) {
+      @RequestParam(value = CliStrings.GROUP, required = false) final String groupName,
+      @RequestParam(value = CliStrings.MEMBER, required = false) final String memberNameId) {
     final CommandStringBuilder command = new CommandStringBuilder(CliStrings.LIST_REGION);
 
     if (hasValue(groupName)) {
-      command.addOption(CliStrings.LIST_REGION__GROUP, groupName);
+      command.addOption(CliStrings.GROUP, groupName);
     }
 
     if (hasValue(memberNameId)) {
-      command.addOption(CliStrings.LIST_REGION__MEMBER, memberNameId);
+      command.addOption(CliStrings.MEMBER, memberNameId);
     }
 
     return processCommand(command.toString());
@@ -76,7 +75,7 @@ public class RegionCommandsController extends AbstractCommandsController {
   @ResponseBody
   public String alterRegion(final WebRequest request,
       @PathVariable("name") final String regionNamePath,
-      @RequestParam(value = CliStrings.ALTER_REGION__GROUP, required = false) final String[] groups,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
       @RequestParam(value = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME,
           required = false) final Integer entryIdleTimeExpiration,
       @RequestParam(value = CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIMEACTION,
@@ -114,8 +113,7 @@ public class RegionCommandsController extends AbstractCommandsController {
     command.addOption(CliStrings.ALTER_REGION__REGION, decode(regionNamePath));
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.ALTER_REGION__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     addCommandOption(request, command, CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME,
@@ -159,8 +157,7 @@ public class RegionCommandsController extends AbstractCommandsController {
           required = false) final String regionType,
       @RequestParam(value = CliStrings.CREATE_REGION__USEATTRIBUTESFROM,
           required = false) final String regionTemplate,
-      @RequestParam(value = CliStrings.CREATE_REGION__GROUP,
-          required = false) final String[] groups,
+      @RequestParam(value = CliStrings.GROUP, required = false) final String[] groups,
       @RequestParam(value = CliStrings.CREATE_REGION__SKIPIFEXISTS,
           defaultValue = "true") final Boolean skipIfExists,
       @RequestParam(value = CliStrings.CREATE_REGION__KEYCONSTRAINT,
@@ -241,8 +238,7 @@ public class RegionCommandsController extends AbstractCommandsController {
     }
 
     if (hasValue(groups)) {
-      command.addOption(CliStrings.CREATE_REGION__GROUP,
-          StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
+      command.addOption(CliStrings.GROUP, StringUtils.join(groups, StringUtils.COMMA_DELIMITER));
     }
 
     command.addOption(CliStrings.CREATE_REGION__SKIPIFEXISTS,


Mime
View raw message