accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1335000 - /accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/
Date Mon, 07 May 2012 13:06:04 GMT
Author: billie
Date: Mon May  7 13:06:02 2012
New Revision: 1335000

URL: http://svn.apache.org/viewvc?rev=1335000&view=rev
Log:
ACCUMULO-573 committed patch with a few additional grammar and usage changes

Modified:
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectrowCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java Mon May  7 13:06:02 2012
@@ -48,8 +48,8 @@ public class AboutCommand extends Comman
   @Override
   public Options getOptions() {
     Options opts = new Options();
-    verboseOption = new Option("v", "verbose", false, "displays details session information");
+    verboseOption = new Option("v", "verbose", false, "display detailed session information");
     opts.addOption(verboseOption);
     return opts;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java Mon May  7 13:06:02 2012
@@ -82,18 +82,18 @@ public class AddSplitsCommand extends Co
   
   @Override
   public String description() {
-    return "add split points to an existing table";
+    return "adds split points to an existing table";
   }
   
   @Override
   public Options getOptions() {
     Options o = new Options();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "name of a table to add split points to");
+    tableOpt = new Option(Shell.tableOption, "table", true, "name of the table to add split points to");
     tableOpt.setArgName("tableName");
     tableOpt.setRequired(false);
     
-    optSplitsFile = new Option("sf", "splits-file", true, "file with newline separated list of rows to add to table");
+    optSplitsFile = new Option("sf", "splits-file", true, "file with a newline-separated list of rows to split the table with");
     optSplitsFile.setArgName("filename");
     
     base64Opt = new Option("b64", "base64encoded", false, "decode encoded split points");
@@ -113,4 +113,4 @@ public class AddSplitsCommand extends Co
   public int numArgs() {
     return Shell.NO_FIXED_ARG_LENGTH_CHECK;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java Mon May  7 13:06:02 2012
@@ -75,7 +75,7 @@ public class CloneTableCommand extends C
   
   @Override
   public String description() {
-    return "clone a table";
+    return "clones a table";
   }
   
   public void registerCompletion(Token root, Map<Command.CompletionSet,Set<String>> completionSet) {
@@ -87,7 +87,7 @@ public class CloneTableCommand extends C
     Options o = new Options();
     setPropsOption = new Option("s", "set", true, "set initial properties before the table comes online. Expects <prop>=<value>{,<prop>=<value>}");
     o.addOption(setPropsOption);
-    excludePropsOption = new Option("e", "exclude", true, "properties that should not be copied from source table. Expects <prop>{,<prop>}");
+    excludePropsOption = new Option("e", "exclude", true, "exclude properties that should not be copied from source table. Expects <prop>{,<prop>}");
     o.addOption(excludePropsOption);
     noFlushOption = new Option("nf", "noFlush", false, "do not flush table data in memory before cloning.");
     o.addOption(noFlushOption);
@@ -98,4 +98,4 @@ public class CloneTableCommand extends C
   public int numArgs() {
     return 2;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java Mon May  7 13:06:02 2012
@@ -59,7 +59,7 @@ public class ConfigCommand extends Comma
   }
   
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
-  IOException, ClassNotFoundException {
+      IOException, ClassNotFoundException {
     reader = shellState.getReader();
     
     String tableName = cl.getOptionValue(tableOpt.getOpt());
@@ -73,13 +73,13 @@ public class ConfigCommand extends Comma
         throw new BadArgumentException("Invalid '=' operator in delete operation.", fullCommand, fullCommand.indexOf('='));
       if (tableName != null) {
         if (!Property.isValidTablePropertyKey(property))
-          Shell.log.warn("Invalid per-table property : " + property + ", still removing from zookeeper if its there.");
-
+          Shell.log.warn("Invalid per-table property : " + property + ", still removing from zookeeper if it's there.");
+        
         shellState.getConnector().tableOperations().removeProperty(tableName, property);
         Shell.log.debug("Successfully deleted table configuration option.");
       } else {
         if (!Property.isValidZooPropertyKey(property))
-          Shell.log.warn("Invalid per-table property : " + property + ", still removing from zookeeper if its there.");
+          Shell.log.warn("Invalid per-table property : " + property + ", still removing from zookeeper if it's there.");
         shellState.getConnector().instanceOperations().removeProperty(property);
         Shell.log.debug("Successfully deleted system configuration option");
       }
@@ -99,7 +99,7 @@ public class ConfigCommand extends Comma
         
         if (property.equals(Property.TABLE_DEFAULT_SCANTIME_VISIBILITY.getKey()))
           new ColumnVisibility(value); // validate that it is a valid expression
-
+          
         shellState.getConnector().tableOperations().setProperty(tableName, property, value);
         Shell.log.debug("Successfully set table configuration option.");
       } else {
@@ -217,7 +217,7 @@ public class ConfigCommand extends Comma
     Options o = new Options();
     OptionGroup og = new OptionGroup();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "display/set/delete properties for specified table");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to display/set/delete properties for");
     deleteOpt = new Option("d", "delete", true, "delete a per-table property");
     setOpt = new Option("s", "set", true, "set a per-table property");
     filterOpt = new Option("f", "filter", true, "show only properties that contain this string");

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java Mon May  7 13:06:02 2012
@@ -204,13 +204,13 @@ public class CreateTableCommand extends 
     
     createTableOptCopyConfig = new Option("cc", "copy-config", true, "table to copy configuration from");
     createTableOptCopySplits = new Option("cs", "copy-splits", true, "table to copy current splits from");
-    createTableOptSplit = new Option("sf", "splits-file", true, "file with newline separated list of rows to create a pre-split table");
+    createTableOptSplit = new Option("sf", "splits-file", true, "file with a newline-separated list of rows to split the table with");
     createTableOptAgg = new Option("a", "aggregator", true, "comma separated column=aggregator");
     createTableOptTimeLogical = new Option("tl", "time-logical", false, "use logical time");
     createTableOptTimeMillis = new Option("tm", "time-millis", false, "use time in milliseconds");
-    createTableNoDefaultIters = new Option("ndi", "no-default-iterators", false, "prevents creation of the normal default iterator set");
+    createTableNoDefaultIters = new Option("ndi", "no-default-iterators", false, "prevent creation of the normal default iterator set");
     createTableOptEVC = new Option("evc", "enable-visibility-constraint", false,
-        "prevents users from writing data they can not read.  When enabling this may want to consider disabling bulk import and alter table");
+        "prevent users from writing data they cannot read.  When enabling this, consider disabling bulk import and alter table.");
     createTableOptFormatter = new Option("f", "formatter", true, "default formatter to set");
     
     createTableOptCopyConfig.setArgName("table");

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java Mon May  7 13:06:02 2012
@@ -56,7 +56,7 @@ public class DUCommand extends Command {
   
   @Override
   public String description() {
-    return "Prints how much space is used by files referenced by a table.  When multiple tables are specified it prints how much space is used by files shared between tables, if any.";
+    return "prints how much space is used by files referenced by a table.  When multiple tables are specified it prints how much space is used by files shared between tables, if any.";
   }
   
   @Override

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java Mon May  7 13:06:02 2012
@@ -72,11 +72,11 @@ public class DeleteCommand extends Comma
   public Options getOptions() {
     Options o = new Options();
     
-    deleteOptAuths = new Option("l", "authorization-label", true, "formatted authorization label expression");
+    deleteOptAuths = new Option("l", "visibility-label", true, "formatted visibility");
     deleteOptAuths.setArgName("expression");
     o.addOption(deleteOptAuths);
     
-    timestampOpt = new Option("t", "timestamp", true, "timestamp to use for insert");
+    timestampOpt = new Option("t", "timestamp", true, "timestamp to use for deletion");
     timestampOpt.setArgName("timestamp");
     o.addOption(timestampOpt);
     
@@ -87,4 +87,4 @@ public class DeleteCommand extends Comma
   public int numArgs() {
     return 3;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java Mon May  7 13:06:02 2012
@@ -72,16 +72,16 @@ public class DeleteIterCommand extends C
   public Options getOptions() {
     Options o = new Options();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "tableName");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to delete the iterator from");
     tableOpt.setArgName("table");
     
     nameOpt = new Option("n", "name", true, "iterator to delete");
     nameOpt.setArgName("itername");
     nameOpt.setRequired(true);
     
-    mincScopeOpt = new Option(IteratorScope.minc.name(), "minor-compaction", false, "applied at minor compaction");
-    majcScopeOpt = new Option(IteratorScope.majc.name(), "major-compaction", false, "applied at major compaction");
-    scanScopeOpt = new Option(IteratorScope.scan.name(), "scan-time", false, "applied at scan time");
+    mincScopeOpt = new Option(IteratorScope.minc.name(), "minor-compaction", false, "remove from minor compaction scope");
+    majcScopeOpt = new Option(IteratorScope.majc.name(), "major-compaction", false, "remove from major compaction scope");
+    scanScopeOpt = new Option(IteratorScope.scan.name(), "scan-time", false, "remove from scan scope");
     
     o.addOption(tableOpt);
     o.addOption(nameOpt);

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java Mon May  7 13:06:02 2012
@@ -78,10 +78,10 @@ public class DeleteManyCommand extends S
   
   @Override
   public Options getOptions() {
-    forceOpt = new Option("f", "force", false, "forces deletion without prompting");
+    forceOpt = new Option("f", "force", false, "force deletion without prompting");
     Options opts = super.getOptions();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "table to be created");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to delete entries from");
     tableOpt.setArgName("table");
     
     opts.addOption(forceOpt);
@@ -89,4 +89,4 @@ public class DeleteManyCommand extends S
     return opts;
   }
   
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java Mon May  7 13:06:02 2012
@@ -54,7 +54,7 @@ public class DeleteRowsCommand extends C
   
   @Override
   public String description() {
-    return "delete a range of rows in a table.  Note that rows matching the start row ARE NOT deleted, but rows matching the end row ARE deleted.";
+    return "deletes a range of rows in a table.  Note that rows matching the start row ARE NOT deleted, but rows matching the end row ARE deleted.";
   }
   
   @Override
@@ -65,7 +65,7 @@ public class DeleteRowsCommand extends C
   @Override
   public Options getOptions() {
     Options o = new Options();
-    tableOpt = new Option(Shell.tableOption, "tableName", true, "table to delete row range");
+    tableOpt = new Option(Shell.tableOption, "tableName", true, "table to delete a row range from");
     tableOpt.setArgName("table");
     tableOpt.setRequired(false);
     optStartRow = new Option("b", "begin-row", true, "begin row");

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java Mon May  7 13:06:02 2012
@@ -25,6 +25,7 @@ import org.apache.accumulo.core.util.she
 import org.apache.accumulo.core.util.shell.Shell.Command;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionGroup;
 import org.apache.commons.cli.Options;
 
 public class DeleteScanIterCommand extends Command {
@@ -73,8 +74,6 @@ public class DeleteScanIterCommand exten
       } else {
         Shell.log.info("No iterator named " + name + " found for table " + tableName);
       }
-    } else {
-      throw new IllegalArgumentException("Must specify one of " + nameOpt.getArgName() + " or " + allOpt.getArgName());
     }
     
     return 0;
@@ -92,15 +91,19 @@ public class DeleteScanIterCommand exten
     tableOpt = new Option(Shell.tableOption, "table", true, "tableName");
     tableOpt.setArgName("table");
     
+    OptionGroup nameGroup = new OptionGroup();
+    
     nameOpt = new Option("n", "name", true, "iterator to delete");
     nameOpt.setArgName("itername");
     
-    allOpt = new Option("a", "all", false, "delete all for tableName");
+    allOpt = new Option("a", "all", false, "delete all scan iterators");
     allOpt.setArgName("all");
     
+    nameGroup.addOption(nameOpt);
+    nameGroup.addOption(allOpt);
+    nameGroup.setRequired(true);
     o.addOption(tableOpt);
-    o.addOption(nameOpt);
-    o.addOption(allOpt);
+    o.addOptionGroup(nameGroup);
     
     return o;
   }

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java Mon May  7 13:06:02 2012
@@ -67,7 +67,7 @@ public class DeleteTableCommand extends 
   public Options getOptions() {
     
     Options o = new Options();
-    tableOpt = new Option(Shell.tableOption, "tableName", true, "deletes a table");
+    tableOpt = new Option(Shell.tableOption, "tableName", true, "table to delete");
     o.addOption(tableOpt);
     return o;
     

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java Mon May  7 13:06:02 2012
@@ -48,8 +48,8 @@ public class ExecfileCommand extends Com
   @Override
   public Options getOptions() {
     Options opts = new Options();
-    verboseOption = new Option("v", "verbose", false, "displays command prompt as commands are executed");
+    verboseOption = new Option("v", "verbose", false, "display command prompt as commands are executed");
     opts.addOption(verboseOption);
     return opts;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java Mon May  7 13:06:02 2012
@@ -71,7 +71,7 @@ public class GetGroupsCommand extends Co
   public Options getOptions() {
     Options opts = new Options();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "get locality groups for specified table");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to fetch locality groups from");
     tableOpt.setArgName("table");
     tableOpt.setRequired(false);
     opts.addOption(tableOpt);

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java Mon May  7 13:06:02 2012
@@ -139,17 +139,17 @@ public class GetSplitsCommand extends Co
   public Options getOptions() {
     Options opts = new Options();
     
-    outputFileOpt = new Option("o", "output", true, "specifies a local file to write the splits to");
+    outputFileOpt = new Option("o", "output", true, "local file to write the splits to");
     outputFileOpt.setArgName("file");
     
-    maxSplitsOpt = new Option("m", "max", true, "specifies the maximum number of splits to create");
+    maxSplitsOpt = new Option("m", "max", true, "maximum number of splits to return (evenly spaced)");
     maxSplitsOpt.setArgName("num");
     
     base64Opt = new Option("b64", "base64encoded", false, "encode the split points");
     
     verboseOpt = new Option("v", "verbose", false, "print out the tablet information with start/end rows");
     
-    tableOpt = new Option(Shell.tableOption, "tableName", true, "table to get splits on");
+    tableOpt = new Option(Shell.tableOption, "tableName", true, "table to get splits for");
     tableOpt.setArgName("table");
     tableOpt.setRequired(false);
     
@@ -161,4 +161,4 @@ public class GetSplitsCommand extends Co
     
     return opts;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java Mon May  7 13:06:02 2012
@@ -100,9 +100,9 @@ public class GrantCommand extends Comman
     Options o = new Options();
     OptionGroup group = new OptionGroup();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "grant a table permission on this table");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to grant a table permission for");
     systemOpt = new Option("s", "system", false, "grant a system permission");
-    tablePatternOpt = new Option("p", "pattern", true, "regex pattern of tables to grant permissions on");
+    tablePatternOpt = new Option("p", "pattern", true, "regex pattern of tables to grant permissions for");
     tablePatternOpt.setArgName("pattern");
     
     tableOpt.setArgName("table");
@@ -125,4 +125,4 @@ public class GrantCommand extends Comman
   public int numArgs() {
     return 1;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java Mon May  7 13:06:02 2012
@@ -98,7 +98,7 @@ public class GrepCommand extends ScanCom
   @Override
   public Options getOptions() {
     Options opts = super.getOptions();
-    numThreadsOpt = new Option("nt", "num-threads", true, "num threads");
+    numThreadsOpt = new Option("nt", "num-threads", true, "number of threads to use");
     tableOpt = new Option(Shell.tableOption, "tableName", true, "table to grep through");
     tableOpt.setArgName("table");
     tableOpt.setRequired(false);

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java Mon May  7 13:06:02 2012
@@ -102,9 +102,9 @@ public class HelpCommand extends Command
   @Override
   public Options getOptions() {
     Options o = new Options();
-    disablePaginationOpt = new Option("np", "no-pagination", false, "disables pagination of output");
+    disablePaginationOpt = new Option("np", "no-pagination", false, "disable pagination of output");
     o.addOption(disablePaginationOpt);
-    noWrapOpt = new Option("nw", "no-wrap", false, "disables wrapping of output");
+    noWrapOpt = new Option("nw", "no-wrap", false, "disable wrapping of output");
     o.addOption(noWrapOpt);
     return o;
   }

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java Mon May  7 13:06:02 2012
@@ -80,8 +80,7 @@ public class HistoryCommand extends Comm
   
   @Override
   public String description() {
-    
-    return ("Generates a list of commands previously executed");
+    return ("generates a list of commands previously executed");
   }
   
   @Override
@@ -93,13 +92,11 @@ public class HistoryCommand extends Comm
   public Options getOptions() {
     Options o = new Options();
     
-    clearHist = new Option("c", "Clears History, takes no arguments.", false, "Clears History File");
-    clearHist.setArgName("");
+    clearHist = new Option("c", "clear", false, "clear history file");
     clearHist.setRequired(false);
-    clearHist.setArgs(0);
     
     o.addOption(clearHist);
     
     return o;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java Mon May  7 13:06:02 2012
@@ -95,7 +95,7 @@ public class InsertCommand extends Comma
   @Override
   public Options getOptions() {
     Options o = new Options();
-    insertOptAuths = new Option("l", "authorization-label", true, "formatted authorization label expression");
+    insertOptAuths = new Option("l", "visibility-label", true, "formatted visibility");
     insertOptAuths.setArgName("expression");
     o.addOption(insertOptAuths);
     
@@ -110,4 +110,4 @@ public class InsertCommand extends Comma
   public int numArgs() {
     return 4;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java Mon May  7 13:06:02 2012
@@ -101,16 +101,16 @@ public class ListIterCommand extends Com
   public Options getOptions() {
     Options o = new Options();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "tableName");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to list the configured iterators on");
     tableOpt.setArgName("table");
     
-    nameOpt = new Option("n", "name", true, "iterator to delete");
+    nameOpt = new Option("n", "name", true, "iterator to list");
     nameOpt.setArgName("itername");
     
     scopeOpts = new EnumMap<IteratorScope,Option>(IteratorScope.class);
-    scopeOpts.put(IteratorScope.minc, new Option(IteratorScope.minc.name(), "minor-compaction", false, "applied at minor compaction"));
-    scopeOpts.put(IteratorScope.majc, new Option(IteratorScope.majc.name(), "major-compaction", false, "applied at major compaction"));
-    scopeOpts.put(IteratorScope.scan, new Option(IteratorScope.scan.name(), "scan-time", false, "applied at scan time"));
+    scopeOpts.put(IteratorScope.minc, new Option(IteratorScope.minc.name(), "minor-compaction", false, "list iterator for minor compaction scope"));
+    scopeOpts.put(IteratorScope.majc, new Option(IteratorScope.majc.name(), "major-compaction", false, "list iterator for major compaction scope"));
+    scopeOpts.put(IteratorScope.scan, new Option(IteratorScope.scan.name(), "scan-time", false, "list iterator for scan scope"));
     
     o.addOption(tableOpt);
     o.addOption(nameOpt);

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java Mon May  7 13:06:02 2012
@@ -32,7 +32,7 @@ public class ListScansCommand extends Co
   
   @Override
   public String description() {
-    return "list what scans are currently running in accumulo. See the accumulo.core.client.admin.ActiveScan javadoc for more information about columns.";
+    return "lists what scans are currently running in accumulo. See the accumulo.core.client.admin.ActiveScan javadoc for more information about columns.";
   }
   
   @Override
@@ -65,14 +65,14 @@ public class ListScansCommand extends Co
   public Options getOptions() {
     Options opts = new Options();
     
-    tserverOption = new Option("ts", "tabletServer", true, "list scans for a specific tablet server");
+    tserverOption = new Option("ts", "tabletServer", true, "tablet server to list scans for");
     tserverOption.setArgName("tablet server");
     opts.addOption(tserverOption);
     
-    disablePaginationOpt = new Option("np", "no-pagination", false, "disables pagination of output");
+    disablePaginationOpt = new Option("np", "no-pagination", false, "disable pagination of output");
     opts.addOption(disablePaginationOpt);
     
     return opts;
   }
   
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java Mon May  7 13:06:02 2012
@@ -30,7 +30,7 @@ import org.apache.commons.cli.ParseExcep
 import org.apache.hadoop.io.Text;
 
 public class MaxRowCommand extends ScanCommand {
-  private Option tableOpt, optAuths, optStartRow, optEndRow, optStartRowExclusice, optEndRowExclusice;
+  private Option tableOpt, optAuths, optStartRow, optEndRow, optStartRowExclusive, optEndRowExclusive;
   
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
       IOException, ParseException {
@@ -51,8 +51,8 @@ public class MaxRowCommand extends ScanC
     Text startRow = cl.hasOption(optStartRow.getOpt()) ? new Text(cl.getOptionValue(optStartRow.getOpt())) : null;
     Text endRow = cl.hasOption(optEndRow.getOpt()) ? new Text(cl.getOptionValue(optEndRow.getOpt())) : null;
     
-    boolean startInclusive = !cl.hasOption(optStartRowExclusice.getOpt());
-    boolean endInclusive = !cl.hasOption(optEndRowExclusice.getOpt());
+    boolean startInclusive = !cl.hasOption(optStartRowExclusive.getOpt());
+    boolean endInclusive = !cl.hasOption(optEndRowExclusive.getOpt());
     try {
       Text max = shellState.getConnector().tableOperations().getMaxRow(tableName, getAuths(cl, shellState), startRow, startInclusive, endRow, endInclusive);
       if (max != null)
@@ -75,7 +75,7 @@ public class MaxRowCommand extends ScanC
   
   @Override
   public String description() {
-    return "find the max row in a table within a given range";
+    return "finds the max row in a table within a given range";
   }
   
   @Override
@@ -95,19 +95,19 @@ public class MaxRowCommand extends ScanC
     optEndRow = new Option("e", "end-row", true, "end row");
     optEndRow.setArgName("end-row");
     
-    optStartRowExclusice = new Option("be", "begin-exclusive", false, "make start row exclusive, by defaults it inclusive");
-    optStartRowExclusice.setArgName("begin-exclusive");
+    optStartRowExclusive = new Option("be", "begin-exclusive", false, "make start row exclusive (by default it's inclusive)");
+    optStartRowExclusive.setArgName("begin-exclusive");
     
-    optEndRowExclusice = new Option("ee", "end-exclusive", false, "make end row exclusive, by defaults it inclusive");
-    optEndRowExclusice.setArgName("end-exclusive");
+    optEndRowExclusive = new Option("ee", "end-exclusive", false, "make end row exclusive (by default it's inclusive)");
+    optEndRowExclusive.setArgName("end-exclusive");
     
     opts.addOption(tableOpt);
     opts.addOption(optAuths);
     opts.addOption(optStartRow);
     opts.addOption(optEndRow);
-    opts.addOption(optStartRowExclusice);
-    opts.addOption(optEndRowExclusice);
+    opts.addOption(optStartRowExclusive);
+    opts.addOption(optEndRowExclusive);
     
     return opts;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java Mon May  7 13:06:02 2012
@@ -81,7 +81,7 @@ public class MergeCommand extends Comman
   
   @Override
   public String description() {
-    return "merge tablets in a table";
+    return "merges tablets in a table";
   }
   
   @Override
@@ -109,4 +109,4 @@ public class MergeCommand extends Comman
     return o;
   }
   
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java Mon May  7 13:06:02 2012
@@ -19,12 +19,8 @@ package org.apache.accumulo.core.util.sh
 import org.apache.accumulo.core.util.shell.Shell;
 import org.apache.accumulo.core.util.shell.Shell.Command;
 import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
 
 public class NoTableCommand extends Command {
-  private Option tableOpt;
-  
   @Override
   public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
     shellState.setTableName("");
@@ -45,12 +41,4 @@ public class NoTableCommand extends Comm
   public int numArgs() {
     return 0;
   }
-  
-  public Options getOptions() {
-    Options o = new Options();
-    tableOpt = new Option(Shell.tableOption, "tableName", true, "Returns to a no table state");
-    o.addOption(tableOpt);
-    return o;
-  }
-  
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java Mon May  7 13:06:02 2012
@@ -45,7 +45,7 @@ public class RenameTableCommand extends 
   
   @Override
   public String description() {
-    return "rename a table";
+    return "renames a table";
   }
   
   public void registerCompletion(Token root, Map<Command.CompletionSet,Set<String>> completionSet) {
@@ -56,4 +56,4 @@ public class RenameTableCommand extends 
   public int numArgs() {
     return 2;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java Mon May  7 13:06:02 2012
@@ -84,7 +84,7 @@ public class RevokeCommand extends Comma
     Options o = new Options();
     OptionGroup group = new OptionGroup();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "revoke a table permission on this table");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to revoke a table permission for");
     systemOpt = new Option("s", "system", false, "revoke a system permission");
     
     tableOpt.setArgName("table");
@@ -107,4 +107,4 @@ public class RevokeCommand extends Comma
   public int numArgs() {
     return 1;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java Mon May  7 13:06:02 2012
@@ -65,7 +65,7 @@ public class ScanCommand extends Command
       shellState.checkTableState();
       tableName = shellState.getTableName();
     }
-
+    
     // handle first argument, if present, the authorizations list to
     // scan with
     Authorizations auths = getAuths(cl, shellState);
@@ -166,7 +166,7 @@ public class ScanCommand extends Command
       throw new IllegalArgumentException("Options -" + scanOptRow.getOpt() + " AND (-" + scanOptStartRow.getOpt() + " OR -" + scanOptEndRow.getOpt()
           + ") are mutally exclusive ");
     }
-
+    
     if (cl.hasOption(scanOptRow.getOpt())) {
       return new Range(new Text(cl.getOptionValue(scanOptRow.getOpt())));
     } else {
@@ -199,10 +199,10 @@ public class ScanCommand extends Command
     scanOptEndRow = new Option("e", "end-row", true, "end row (inclusive)");
     scanOptRow = new Option("r", "row", true, "row to scan");
     scanOptColumns = new Option("c", "columns", true, "comma-separated columns");
-    timestampOpt = new Option("st", "show-timestamps", false, "enables displaying timestamps");
-    disablePaginationOpt = new Option("np", "no-pagination", false, "disables pagination of output");
+    timestampOpt = new Option("st", "show-timestamps", false, "display timestamps");
+    disablePaginationOpt = new Option("np", "no-pagination", false, "disable pagination of output");
     tableOpt = new Option(Shell.tableOption, "tableName", true, "table to be scanned");
-    showFewOpt = new Option("f", "show few", true, "Only shows certain amount of characters");
+    showFewOpt = new Option("f", "show few", true, "show only a specified number of characters");
     formatterOpt = new Option("fm", "formatter", true, "fully qualified name of the formatter class to use");
     
     scanOptAuths.setArgName("comma-separated-authorizations");

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectCommand.java Mon May  7 13:06:02 2012
@@ -73,7 +73,7 @@ public class SelectCommand extends Comma
   
   @Override
   public String description() {
-    return "scans for and displays a single record";
+    return "scans for and displays a single entry";
   }
   
   @Override
@@ -86,9 +86,9 @@ public class SelectCommand extends Comma
     Options o = new Options();
     selectOptAuths = new Option("s", "scan-authorizations", true, "scan authorizations");
     selectOptAuths.setArgName("comma-separated-authorizations");
-    timestampOpt = new Option("st", "show-timestamps", false, "enables displaying timestamps");
-    disablePaginationOpt = new Option("np", "no-pagination", false, "disables pagination of output");
-    tableOpt = new Option(Shell.tableOption, "tableName", true, "table");
+    timestampOpt = new Option("st", "show-timestamps", false, "enable displaying timestamps");
+    disablePaginationOpt = new Option("np", "no-pagination", false, "disable pagination of output");
+    tableOpt = new Option(Shell.tableOption, "tableName", true, "table to select entry from");
     tableOpt.setArgName("table");
     tableOpt.setRequired(false);
     

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectrowCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectrowCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectrowCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SelectrowCommand.java Mon May  7 13:06:02 2012
@@ -85,10 +85,10 @@ public class SelectrowCommand extends Co
     selectrowOptAuths = new Option("s", "scan-authorizations", true, "scan authorizations");
     selectrowOptAuths.setArgName("comma-separated-authorizations");
     
-    timestampOpt = new Option("st", "show-timestamps", false, "enables displaying timestamps");
-    disablePaginationOpt = new Option("np", "no-pagination", false, "disables pagination of output");
+    timestampOpt = new Option("st", "show-timestamps", false, "enable displaying timestamps");
+    disablePaginationOpt = new Option("np", "no-pagination", false, "disable pagination of output");
     
-    tableOpt = new Option(Shell.tableOption, "tableName", true, "table to row select");
+    tableOpt = new Option(Shell.tableOption, "tableName", true, "table to select row from");
     tableOpt.setArgName("table");
     tableOpt.setRequired(false);
     

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java Mon May  7 13:06:02 2012
@@ -57,10 +57,10 @@ public class SetAuthsCommand extends Com
   public Options getOptions() {
     Options o = new Options();
     OptionGroup setOrClear = new OptionGroup();
-    scanOptAuths = new Option("s", "scan-authorizations", true, "set the scan authorizations");
+    scanOptAuths = new Option("s", "scan-authorizations", true, "scan authorizations to set");
     scanOptAuths.setArgName("comma-separated-authorizations");
     setOrClear.addOption(scanOptAuths);
-    clearOptAuths = new Option("c", "clear-authorizations", false, "clears the scan authorizations");
+    clearOptAuths = new Option("c", "clear-authorizations", false, "clear the scan authorizations");
     setOrClear.addOption(clearOptAuths);
     setOrClear.setRequired(true);
     o.addOptionGroup(setOrClear);
@@ -74,4 +74,4 @@ public class SetAuthsCommand extends Com
   public int numArgs() {
     return 0;
   }
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java Mon May  7 13:06:02 2012
@@ -88,11 +88,11 @@ public class SetGroupsCommand extends Co
   public Options getOptions() {
     Options opts = new Options();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "get locality groups for specified table");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to fetch locality groups for");
     tableOpt.setArgName("table");
     tableOpt.setRequired(false);
     opts.addOption(tableOpt);
     return opts;
   }
   
-}
\ No newline at end of file
+}

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java Mon May  7 13:06:02 2012
@@ -216,7 +216,7 @@ public class SetIterCommand extends Comm
   public Options getOptions() {
     Options o = new Options();
     
-    tableOpt = new Option(Shell.tableOption, "table", true, "tableName");
+    tableOpt = new Option(Shell.tableOption, "table", true, "table to set the iterator on");
     tableOpt.setArgName("table");
     
     priorityOpt = new Option("p", "priority", true, "the order in which the iterator is applied");
@@ -231,13 +231,13 @@ public class SetIterCommand extends Comm
     scanScopeOpt = new Option(IteratorScope.scan.name(), "scan-time", false, "applied at scan time");
     
     OptionGroup typeGroup = new OptionGroup();
-    classnameTypeOpt = new Option("class", "class-name", true, "a java class type");
+    classnameTypeOpt = new Option("class", "class-name", true, "a java class that implements SortedKeyValueIterator");
     classnameTypeOpt.setArgName("name");
-    aggTypeOpt = new Option("agg", "aggregator", false, "an aggregating type");
-    regexTypeOpt = new Option("regex", "regular-expression", false, "a regex matching type");
-    versionTypeOpt = new Option("vers", "version", false, "a versioning type");
-    reqvisTypeOpt = new Option("reqvis", "require-visibility", false, "a type that omits entries with empty visibilities");
-    ageoffTypeOpt = new Option("ageoff", "ageoff", false, "an aging off type");
+    aggTypeOpt = new Option("agg", "aggregator", false, "an aggregating iterator");
+    regexTypeOpt = new Option("regex", "regular-expression", false, "a regex matching iterator");
+    versionTypeOpt = new Option("vers", "version", false, "a versioning iterator");
+    reqvisTypeOpt = new Option("reqvis", "require-visibility", false, "an iterator that omits entries with empty visibilities");
+    ageoffTypeOpt = new Option("ageoff", "ageoff", false, "an aging off iterator");
     
     typeGroup.addOption(classnameTypeOpt);
     typeGroup.addOption(aggTypeOpt);

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java?rev=1335000&r1=1334999&r2=1335000&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java Mon May  7 13:06:02 2012
@@ -31,7 +31,7 @@ public class SleepCommand extends Comman
   
   @Override
   public String description() {
-    return "sleep for the given number of seconds";
+    return "sleeps for the given number of seconds";
   }
   
   @Override
@@ -39,4 +39,4 @@ public class SleepCommand extends Comman
     return 1;
   }
   
-}
\ No newline at end of file
+}



Mime
View raw message