accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1335105 [1/2] - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/impl/ core/src/main/java/org/apache/accumulo/core/conf/ core/src/main/java/org/apache/accumulo/core/constraints/ core/src/main/java/org/apache/...
Date Mon, 07 May 2012 16:34:40 GMT
Author: billie
Date: Mon May  7 16:34:37 2012
New Revision: 1335105

URL: http://svn.apache.org/viewvc?rev=1335105&view=rev
Log:
ACCUMULO-573 ACCUMULO-574 ACCUMULO-502 merged to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Column.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java
    accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1305403-1305434,1305436-1305459,1305461-1306572,1306574-1309371,1309373-1324770,1324772-1324853,1325064,1325854-1325858,1325931,1326655,1327193-1328079,1328081,1328482-1329419,1329421-1329497,1329499-1330266,1331389-1331455,1332720-1334979,1334981-1335072
  Merged /incubator/accumulo/branches/1.3/src:r1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
  Merged /incubator/accumulo/branches/1.4/src:r1201899-1300311,1300713-1302469,1302914-1303019,1303021-1303033,1303035-1303115,1303117,1303527-1303528,1303826-1303840,1303842-1303844,1303846,1303848-1303927,1303929-1303975,1303977-1303994,1303996-1304026,1304028-1304091,1304093-1305328,1305330-1305402
  Merged /incubator/accumulo/branches/1.3.5rc/src:r1209938
  Merged /incubator/accumulo/trunk/src:r1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495
  Merged /accumulo/branches/1.4:r1329792-1330266,1332720-1333108,1333110-1333189,1333191-1334979,1334981-1335045
  Merged /accumulo/trunk/src:r1329425,1333047,1333070
  Merged /incubator/accumulo/branches/1.4.0rc/src:r1305326
  Merged /accumulo/branches/1.3/src:r1309369,1328076

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/core:r1329792-1330266,1332720-1333108,1333110-1333189,1333191-1334979,1334981-1335045
  Merged /accumulo/branches/1.4/src/core:r1305403-1305434,1305436-1305459,1305461-1306572,1306574-1309371,1309373-1324770,1324772-1324853,1325064,1325854-1325858,1325931,1326655,1327193-1328079,1328081,1328482-1329419,1329421-1329497,1329499-1330266,1331389-1331455,1332720-1334979,1334981-1335072
  Merged /accumulo/trunk/src/core:r1329425,1333047,1333070
  Merged /incubator/accumulo/trunk/src/core:r1178656-1201898
  Merged /incubator/accumulo/branches/1.4/src/core:r1201899-1300311,1300713-1304026,1304028-1304091,1304093-1305402
  Merged /accumulo/branches/1.3/src/core:r1309369

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java Mon May  7 16:34:37 2012
@@ -21,11 +21,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.Map.Entry;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Mon May  7 16:34:37 2012
@@ -21,10 +21,8 @@ import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.TreeMap;
 import java.util.Map.Entry;
-
-import org.apache.accumulo.core.conf.ConfigSanityCheck;
+import java.util.TreeMap;
 
 public class DefaultConfiguration extends AccumuloConfiguration {
   private static DefaultConfiguration instance = null;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java Mon May  7 16:34:37 2012
@@ -17,10 +17,9 @@
 package org.apache.accumulo.core.conf;
 
 import java.util.Iterator;
-import java.util.TreeMap;
 import java.util.Map.Entry;
+import java.util.TreeMap;
 
-import org.apache.accumulo.core.conf.ConfigSanityCheck;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.log4j.Logger;
 

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java Mon May  7 16:34:37 2012
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.constra
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.apache.accumulo.core.data.ConstraintViolationSummary;
 

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Column.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Column.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Column.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/Column.java Mon May  7 16:34:37 2012
@@ -21,8 +21,9 @@
  */
 package org.apache.accumulo.core.data;
 
-import java.io.DataInput;
+import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes;
 
+import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -31,8 +32,6 @@ import org.apache.accumulo.core.data.thr
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.io.WritableComparator;
 
-import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes;
-
 public class Column implements WritableComparable<Column> {
   
   static private int compareBytes(byte[] a, byte[] b) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java Mon May  7 16:34:37 2012
@@ -16,11 +16,11 @@
  */
 package org.apache.accumulo.core.data;
 
+import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes;
+
 import java.nio.ByteBuffer;
 import java.util.Map;
 
-import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes;
-
 public class KeyValue implements Map.Entry<Key,Value> {
   
   public Key key;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java Mon May  7 16:34:37 2012
@@ -22,8 +22,8 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.accumulo.core.data.ArrayByteSequence;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java Mon May  7 16:34:37 2012
@@ -19,7 +19,6 @@ package org.apache.accumulo.core.file.rf
 
 import java.io.IOException;
 import java.io.InputStream;
-
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java Mon May  7 16:34:37 2012
@@ -76,6 +76,12 @@ public interface SortedKeyValueIterator<
    * Seeks to the first key in the Range, restricting the resulting K,V pairs to those with the specified columns. An iterator does not have to stop at the end
    * of the range. The whole range is provided so that iterators can make optimizations.
    * 
+   * Seek may be called multiple times with different parameters after {@link #init} is called.
+   * 
+   * Iterators that examine groups of adjacent key/value pairs (e.g. rows) to determine their top key and value should be sure that they properly handle a seek
+   * to a key in the middle of such a group (e.g. the middle of a row). Even if the client always seeks to a range containing an entire group (a,c), the tablet
+   * server could send back a batch of entries corresponding to (a,b], then reseek the iterator to range (b,c) when the scan is continued.
+   * 
    * @param range
    *          <tt>Range</tt> of keys to iterate over.
    * @param columnFamilies

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java Mon May  7 16:34:37 2012
@@ -20,6 +20,9 @@ import org.apache.hadoop.io.Text;
 
 /**
  * @deprecated since 1.4
+ * 
+ * @see org.apache.accumulo.core.client.IteratorSetting.Column
+ * @see org.apache.accumulo.core.iterators.Combiner#setColumns(org.apache.accumulo.core.client.IteratorSetting, java.util.List)
  */
 public class PerColumnIteratorConfig {
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java Mon May  7 16:34:37 2012
@@ -27,8 +27,8 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
+import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 
 /**
  * An iterator for deleting whole rows.

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java Mon May  7 16:34:37 2012
@@ -18,9 +18,6 @@ package org.apache.accumulo.core.securit
 
 import java.io.Serializable;
 
-import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.ColumnVisibility;
-
 public interface VisibilityInterpreter extends Serializable {
   public abstract String getAbbreviatedValue();
   

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java Mon May  7 16:34:37 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.security;
 
-import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.ColumnVisibility;
 
 public class VisibilityInterpreterFactory {
   private static VisibilityInterpreter interpreter = null;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java Mon May  7 16:34:37 2012
@@ -24,8 +24,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java Mon May  7 16:34:37 2012
@@ -22,11 +22,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import jline.Completor;
+
 import org.apache.accumulo.core.util.shell.Shell.Command.CompletionSet;
 import org.apache.accumulo.core.util.shell.commands.QuotedStringTokenizer;
 
-import jline.Completor;
-
 public class ShellCompletor implements Completor {
   
   // private static final Logger log = Logger.getLogger(ShellCompletor.class);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java Mon May  7 16:34:37 2012
@@ -48,7 +48,7 @@ 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;
   }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java Mon May  7 16:34:37 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");

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java Mon May  7 16:34:37 2012
@@ -23,8 +23,8 @@ import java.util.Set;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 
 public class AuthenticateCommand extends Command {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java Mon May  7 16:34:37 2012
@@ -26,8 +26,8 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
@@ -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);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java Mon May  7 16:34:37 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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java Mon May  7 16:34:37 2012
@@ -168,12 +168,12 @@ 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");
     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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java Mon May  7 16:34:37 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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java Mon May  7 16:34:37 2012
@@ -23,8 +23,8 @@ import java.util.Set;
 
 import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 
 public class DebugCommand extends Command {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteCommand.java Mon May  7 16:34:37 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);
     

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteIterCommand.java Mon May  7 16:34:37 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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java Mon May  7 16:34:37 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);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteRowsCommand.java Mon May  7 16:34:37 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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteScanIterCommand.java Mon May  7 16:34:37 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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteTableCommand.java Mon May  7 16:34:37 2012
@@ -24,8 +24,8 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
@@ -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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java Mon May  7 16:34:37 2012
@@ -23,8 +23,8 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 
 public class DropUserCommand extends Command {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ExecfileCommand.java Mon May  7 16:34:37 2012
@@ -48,7 +48,7 @@ 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;
   }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetGroupsCommand.java Mon May  7 16:34:37 2012
@@ -17,8 +17,8 @@
 package org.apache.accumulo.core.util.shell.commands;
 
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.LocalityGroupUtil;
@@ -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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java Mon May  7 16:34:37 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);
     

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrantCommand.java Mon May  7 16:34:37 2012
@@ -25,8 +25,8 @@ import org.apache.accumulo.core.security
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionGroup;
@@ -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");

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java Mon May  7 16:34:37 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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HelpCommand.java Mon May  7 16:34:37 2012
@@ -105,9 +105,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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java Mon May  7 16:34:37 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,10 +92,8 @@ 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);
     

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java Mon May  7 16:34:37 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);
     

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListIterCommand.java Mon May  7 16:34:37 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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListScansCommand.java Mon May  7 16:34:37 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,11 +65,11 @@ 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;

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MaxRowCommand.java Mon May  7 16:34:37 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,18 +95,18 @@ 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;
   }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java Mon May  7 16:34:37 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

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NoTableCommand.java Mon May  7 16:34:37 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;
-  }
-  
 }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RenameTableCommand.java Mon May  7 16:34:37 2012
@@ -24,8 +24,8 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 
 public class RenameTableCommand extends Command {
@@ -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) {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/RevokeCommand.java Mon May  7 16:34:37 2012
@@ -25,8 +25,8 @@ import org.apache.accumulo.core.security
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionGroup;
@@ -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");

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java Mon May  7 16:34:37 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/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetAuthsCommand.java Mon May  7 16:34:37 2012
@@ -22,8 +22,8 @@ import java.util.Set;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionGroup;
@@ -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);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetGroupsCommand.java Mon May  7 16:34:37 2012
@@ -88,7 +88,7 @@ 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);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java Mon May  7 16:34:37 2012
@@ -220,12 +220,12 @@ 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");
-    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");
+    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(regexTypeOpt);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SleepCommand.java Mon May  7 16:34:37 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

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java Mon May  7 16:34:37 2012
@@ -23,8 +23,8 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 
 public class TableCommand extends Command {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java Mon May  7 16:34:37 2012
@@ -25,8 +25,8 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.Token;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.Token;
 import org.apache.commons.cli.CommandLine;
 
 public class UserCommand extends Command {

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java Mon May  7 16:34:37 2012
@@ -24,12 +24,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.apache.accumulo.core.client.BatchWriter;
-import org.apache.accumulo.core.client.ClientSideIteratorScanner;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java Mon May  7 16:34:37 2012
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.Constant
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.admin.FindMax;
 import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java Mon May  7 16:34:37 2012
@@ -24,10 +24,10 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
-import java.util.Map.Entry;
 
 import junit.framework.TestCase;
 
@@ -36,9 +36,6 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.client.impl.RootTabletLocator;
-import org.apache.accumulo.core.client.impl.TabletLocator;
-import org.apache.accumulo.core.client.impl.TabletLocatorImpl;
 import org.apache.accumulo.core.client.impl.TabletLocator.TabletLocation;
 import org.apache.accumulo.core.client.impl.TabletLocator.TabletServerMutations;
 import org.apache.accumulo.core.client.impl.TabletLocatorImpl.TabletLocationObtainer;

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java Mon May  7 16:34:37 2012
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertTru
 
 import java.util.HashSet;
 
-import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.conf.PropertyType;
 import org.junit.Test;
 
 /**

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java Mon May  7 16:34:37 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.data;
 
-import org.apache.accumulo.core.data.Column;
-
 import junit.framework.TestCase;
 
 public class ColumnTest extends TestCase {

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java Mon May  7 16:34:37 2012
@@ -22,7 +22,6 @@ import java.util.TreeSet;
 
 import junit.framework.TestCase;
 
-import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.hadoop.io.Text;
 
 public class KeyExtentTest extends TestCase {

Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java?rev=1335105&r1=1335104&r2=1335105&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java (original)
+++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java Mon May  7 16:34:37 2012
@@ -24,14 +24,11 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.accumulo.core.data.ColumnUpdate;
-import org.apache.accumulo.core.data.Mutation;
-import org.apache.accumulo.core.data.Value;
+import junit.framework.TestCase;
+
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.hadoop.io.Text;
 
-import junit.framework.TestCase;
-
 public class MutationTest extends TestCase {
   public void test1() {
     Mutation m = new Mutation(new Text("r1"));



Mime
View raw message