accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1333109 - in /accumulo/branches/1.4/src/core/src: main/java/org/apache/accumulo/core/client/impl/ main/java/org/apache/accumulo/core/client/mapreduce/ main/java/org/apache/accumulo/core/conf/ main/java/org/apache/accumulo/core/constraints/...
Date Wed, 02 May 2012 16:58:21 GMT
Author: ecn
Date: Wed May  2 16:58:18 2012
New Revision: 1333109

URL: http://svn.apache.org/viewvc?rev=1333109&view=rev
Log:
ACCUMULO-266 deprecate IBW cruft in Value, fix many other deprecation warnings

Modified:
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Column.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Value.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.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/DebugCommand.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/DropUserCommand.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/GrantCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.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/SetAuthsCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java
    accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java
    accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java Wed May  2 16:58:18 2012
@@ -110,7 +110,6 @@ class OfflineIterator implements Iterato
   private KeyExtent currentExtent;
   private Connector conn;
   private String tableId;
-  private AuthInfo credentials;
   private Authorizations authorizations;
   private Instance instance;
   private ScannerOptions options;
@@ -134,7 +133,6 @@ class OfflineIterator implements Iterato
 
     this.tableId = table.toString();
     this.authorizations = authorizations;
-    this.credentials = credentials;
     this.readers = new ArrayList<SortedKeyValueIterator<Key,Value>>();
     
     try {
@@ -232,7 +230,7 @@ class OfflineIterator implements Iterato
     if (currentExtent != null && !extent.isPreviousExtent(currentExtent))
       throw new AccumuloException(" " + currentExtent + " is not previous extent " + extent);
     
-    String tablesDir = Constants.getTablesDir(AccumuloConfiguration.getSiteConfiguration());
+    String tablesDir = Constants.getTablesDir(instance.getConfiguration());
     List<String> absFiles = new ArrayList<String>();
     for (String relPath : relFiles) {
       if (relPath.startsWith(".."))
@@ -294,7 +292,7 @@ class OfflineIterator implements Iterato
     
     Configuration conf = CachedConfiguration.getInstance();
     
-    FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration());
+    FileSystem fs = FileUtil.getFileSystem(conf, instance.getConfiguration());
     
     for (SortedKeyValueIterator<Key,Value> reader : readers) {
       ((FileSKVIterator) reader).close();

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java Wed May  2 16:58:18 2012
@@ -24,10 +24,10 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.Map.Entry;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Wed May  2 16:58:18 2012
@@ -68,6 +68,7 @@ import org.apache.accumulo.core.data.Par
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
 import org.apache.accumulo.core.iterators.user.VersioningIterator;
 import org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.security.Authorizations;
@@ -1104,39 +1105,42 @@ public abstract class InputFormatBase<K,
       Scanner scanner;
       split = (RangeInputSplit) inSplit;
       log.debug("Initializing input split: " + split.range);
-      Instance instance = getInstance(attempt.getConfiguration());
-      String user = getUsername(attempt.getConfiguration());
-      byte[] password = getPassword(attempt.getConfiguration());
-      Authorizations authorizations = getAuthorizations(attempt.getConfiguration());
+      Configuration conf = attempt.getConfiguration();
+      Instance instance = getInstance(conf);
+      String user = getUsername(conf);
+      byte[] password = getPassword(conf);
+      Authorizations authorizations = getAuthorizations(conf);
       
       try {
         log.debug("Creating connector with user: " + user);
         Connector conn = instance.getConnector(user, password);
-        log.debug("Creating scanner for table: " + getTablename(attempt.getConfiguration()));
+        log.debug("Creating scanner for table: " + getTablename(conf));
         log.debug("Authorizations are: " + authorizations);
-        if (isOfflineScan(attempt.getConfiguration())) {
+        if (isOfflineScan(conf)) {
           scanner = new OfflineScanner(instance, new AuthInfo(user, ByteBuffer.wrap(password), instance.getInstanceID()), Tables.getTableId(instance,
-              getTablename(attempt.getConfiguration())), authorizations);
+              getTablename(conf)), authorizations);
         } else {
-          scanner = conn.createScanner(getTablename(attempt.getConfiguration()), authorizations);
+          scanner = conn.createScanner(getTablename(conf), authorizations);
         }
-        if (isIsolated(attempt.getConfiguration())) {
+        if (isIsolated(conf)) {
           log.info("Creating isolated scanner");
           scanner = new IsolatedScanner(scanner);
         }
-        if (usesLocalIterators(attempt.getConfiguration())) {
+        if (usesLocalIterators(conf)) {
           log.info("Using local iterators");
           scanner = new ClientSideIteratorScanner(scanner);
         }
-        setupMaxVersions(attempt.getConfiguration(), scanner);
-        setupRegex(attempt, scanner);
-        setupIterators(attempt.getConfiguration(), scanner);
+        setupMaxVersions(conf, scanner);
+        IteratorSetting is = new IteratorSetting(50, RegExFilter.class);
+        RegExFilter.setRegexs(is, conf.get(ROW_REGEX), conf.get(COLUMN_FAMILY_REGEX), conf.get(COLUMN_QUALIFIER_REGEX), null, false);
+        scanner.addScanIterator(is);
+        setupIterators(conf, scanner);
       } catch (Exception e) {
         throw new IOException(e);
       }
       
       // setup a scanner within the bounds of this split
-      for (Pair<Text,Text> c : getFetchedColumns(attempt.getConfiguration())) {
+      for (Pair<Text,Text> c : getFetchedColumns(conf)) {
         if (c.getSecond() != null) {
           log.debug("Fetching column " + c.getFirst() + ":" + c.getSecond());
           scanner.fetchColumn(c.getFirst(), c.getSecond());

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/constraints/Violations.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Column.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Column.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Column.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Column.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Value.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Value.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Value.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/data/Value.java Wed May  2 16:58:18 2012
@@ -20,8 +20,9 @@ package org.apache.accumulo.core.data;
  * limitations under the License.
  */
 
-import java.io.ByteArrayOutputStream;
+import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes;
 
+import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.DataOutputStream;
@@ -39,8 +40,6 @@ import org.apache.hadoop.io.WritableComp
 import org.apache.hadoop.io.WritableComparator;
 import org.apache.log4j.Logger;
 
-import static org.apache.accumulo.core.util.ByteBufferUtil.toBytes;
-
 /**
  * A byte sequence that is usable as a key or value. Based on {@link org.apache.hadoop.io.BytesWritable} only this class is NOT resizable and DOES NOT
  * distinguish between the size of the sequence and the current capacity as {@link org.apache.hadoop.io.BytesWritable} does. Hence its comparatively
@@ -249,6 +248,8 @@ public class Value implements WritableCo
   
   /**
    * Convert a long value to a byte array
+   * 
+   * @deprecated since 1.4.1. There is no replacement.
    */
   public static byte[] longToBytes(long val) throws IOException {
     return getBytes(new LongWritable(val));
@@ -256,6 +257,8 @@ public class Value implements WritableCo
   
   /**
    * Converts a byte array to a long value
+   * 
+   * @deprecated since 1.4.1. There is no replacement.
    */
   public static long bytesToLong(byte[] bytes) throws IOException {
     if (bytes == null || bytes.length == 0) {
@@ -266,6 +269,8 @@ public class Value implements WritableCo
   
   /**
    * Converts a string to a byte array in a consistent manner.
+   * 
+   * @deprecated since 1.4.1. There is no replacement.
    */
   public static byte[] stringToBytes(String s) throws UnsupportedEncodingException {
     if (s == null) {
@@ -276,6 +281,8 @@ public class Value implements WritableCo
   
   /**
    * Converts a byte array to a string in a consistent manner.
+   * 
+   * @deprecated since 1.4.1. There is no replacement.
    */
   public static String bytesToString(byte[] bytes) throws UnsupportedEncodingException {
     if (bytes == null || bytes.length == 0) {
@@ -287,6 +294,8 @@ public class Value implements WritableCo
   /**
    * @return The bytes of <code>w</code> gotten by running its {@link Writable#write(java.io.DataOutput)} method.
    * @see #getWritable(byte[], Writable)
+   * 
+   * @deprecated since 1.4.1. There is no replacement.
    */
   public static byte[] getBytes(final Writable w) throws IOException {
     if (w == null) {
@@ -313,6 +322,8 @@ public class Value implements WritableCo
    *          An empty Writable (usually made by calling the null-arg constructor).
    * @return The passed Writable after its readFields has been called fed by the passed <code>bytes</code> array or IllegalArgumentException if passed null or
    *         an empty <code>bytes</code> array.
+   * 
+   * @deprecated since 1.4.1. There is no replacement.
    */
   public static Writable getWritable(final byte[] bytes, final Writable w) throws IOException {
     if (bytes == null || bytes.length == 0) {

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BoundedRangeFileInputStream.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java Wed May  2 16:58:18 2012
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.iterato
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.TreeSet;
@@ -35,7 +34,6 @@ import org.apache.accumulo.core.iterator
 
 public class ColumnFamilySkippingIterator extends SkippingIterator implements InterruptibleIterator {
   
-  private static final Collection<ByteSequence> EMPTY_SET = Collections.emptySet();
   protected Set<ByteSequence> colFamSet = null;
   protected TreeSet<ByteSequence> sortedColFams = null;
   

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowDeletingIterator.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/LocalityGroupUtil.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/ShellCompletor.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java Wed May  2 16:58:18 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/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=1333109&r1=1333108&r2=1333109&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 Wed May  2 16:58:18 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;

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java Wed May  2 16:58:18 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/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=1333109&r1=1333108&r2=1333109&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 Wed May  2 16:58:18 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;

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DropUserCommand.java Wed May  2 16:58:18 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/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=1333109&r1=1333108&r2=1333109&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 Wed May  2 16:58:18 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;

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=1333109&r1=1333108&r2=1333109&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 Wed May  2 16:58:18 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;

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HiddenCommand.java Wed May  2 16:58:18 2012
@@ -20,8 +20,8 @@ import java.security.SecureRandom;
 import java.util.Random;
 
 import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.ShellCommandException;
 import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.ShellCommandException;
 import org.apache.accumulo.core.util.shell.ShellCommandException.ErrorCode;
 import org.apache.commons.cli.CommandLine;
 

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=1333109&r1=1333108&r2=1333109&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 Wed May  2 16:58:18 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 {

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=1333109&r1=1333108&r2=1333109&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 Wed May  2 16:58:18 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;

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=1333109&r1=1333108&r2=1333109&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 Wed May  2 16:58:18 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;

Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TableCommand.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java (original)
+++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/ClientSideIteratorTest.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java Wed May  2 16:58:18 2012
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.client.
 
 import static org.junit.Assert.assertTrue;
 
-import org.apache.accumulo.core.client.mapreduce.lib.partition.RangePartitioner;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapreduce.JobContext;

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/ColumnTest.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java Wed May  2 16:58:18 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/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/MutationTest.java Wed May  2 16:58:18 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"));

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/data/RangeTest.java Wed May  2 16:58:18 2012
@@ -22,11 +22,6 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.accumulo.core.data.Column;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.data.PartialKey;
-import org.apache.accumulo.core.data.Range;
 import org.apache.hadoop.io.Text;
 
 public class RangeTest extends TestCase {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestCachedBlockQueue.java Wed May  2 16:58:18 2012
@@ -21,8 +21,6 @@ package org.apache.accumulo.core.file.bl
 
 import java.util.LinkedList;
 
-import org.apache.accumulo.core.file.blockfile.cache.CachedBlockQueue;
-
 import junit.framework.TestCase;
 
 public class TestCachedBlockQueue extends TestCase {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java Wed May  2 16:58:18 2012
@@ -21,11 +21,6 @@ package org.apache.accumulo.core.file.bl
 
 import java.util.Random;
 
-import org.apache.accumulo.core.file.blockfile.cache.CachedBlock;
-import org.apache.accumulo.core.file.blockfile.cache.ClassSize;
-import org.apache.accumulo.core.file.blockfile.cache.HeapSize;
-import org.apache.accumulo.core.file.blockfile.cache.LruBlockCache;
-
 import junit.framework.TestCase;
 
 /**

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/file/rfile/CreateCompatTestFile.java Wed May  2 16:58:18 2012
@@ -24,7 +24,6 @@ import org.apache.accumulo.core.data.Byt
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.file.blockfile.impl.CachableBlockFile;
-import org.apache.accumulo.core.file.rfile.RFile;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/IterUtilTest.java Wed May  2 16:58:18 2012
@@ -33,10 +33,6 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.KeyExtent;
 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.IteratorUtil;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.iterators.SortedMapIterator;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.system.MultiIteratorTest;
 import org.apache.accumulo.core.iterators.user.AgeOffFilter;

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIteratorTest.java Wed May  2 16:58:18 2012
@@ -28,8 +28,6 @@ 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.SortedMapIterator;
-import org.apache.accumulo.core.iterators.system.ColumnFamilySkippingIterator;
-import org.apache.accumulo.core.iterators.system.CountingIterator;
 import org.apache.hadoop.io.Text;
 
 public class ColumnFamilySkippingIteratorTest extends TestCase {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/ColumnFilterTest.java Wed May  2 16:58:18 2012
@@ -23,7 +23,6 @@ import junit.framework.TestCase;
 import org.apache.accumulo.core.data.Column;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.system.ColumnQualifierFilter;
 import org.apache.hadoop.io.Text;
 
 public class ColumnFilterTest extends TestCase {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/DeletingIteratorTest.java Wed May  2 16:58:18 2012
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.iterato
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.TreeMap;
 import java.util.Map.Entry;
+import java.util.TreeMap;
 
 import junit.framework.TestCase;
 
@@ -29,7 +29,6 @@ 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.SortedMapIterator;
-import org.apache.accumulo.core.iterators.system.DeletingIterator;
 import org.apache.hadoop.io.Text;
 
 public class DeletingIteratorTest extends TestCase {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/MultiIteratorTest.java Wed May  2 16:58:18 2012
@@ -31,7 +31,6 @@ import org.apache.accumulo.core.data.Ran
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.SortedMapIterator;
-import org.apache.accumulo.core.iterators.system.MultiIterator;
 import org.apache.accumulo.core.util.LocalityGroupUtil;
 import org.apache.hadoop.io.Text;
 

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java Wed May  2 16:58:18 2012
@@ -29,7 +29,6 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.SortedMapIterator;
-import org.apache.accumulo.core.iterators.system.SourceSwitchingIterator;
 import org.apache.accumulo.core.iterators.system.SourceSwitchingIterator.DataSource;
 import org.apache.hadoop.io.Text;
 

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/system/TimeSettingIteratorTest.java Wed May  2 16:58:18 2012
@@ -19,14 +19,13 @@ package org.apache.accumulo.core.iterato
 import java.util.HashSet;
 import java.util.TreeMap;
 
+import junit.framework.TestCase;
+
 import org.apache.accumulo.core.data.ByteSequence;
 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.SortedMapIterator;
-import org.apache.accumulo.core.iterators.system.TimeSettingIterator;
-
-import junit.framework.TestCase;
 
 public class TimeSettingIteratorTest extends TestCase {
   

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeRowIteratorTest.java Wed May  2 16:58:18 2012
@@ -18,9 +18,9 @@ package org.apache.accumulo.core.iterato
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -34,7 +34,6 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.SortedMapIterator;
 import org.apache.accumulo.core.iterators.system.MultiIterator;
-import org.apache.accumulo.core.iterators.user.WholeRowIterator;
 import org.apache.hadoop.io.Text;
 
 public class WholeRowIteratorTest extends TestCase {
@@ -43,17 +42,17 @@ public class WholeRowIteratorTest extend
     SortedMap<Key,Value> map = new TreeMap<Key,Value>();
     SortedMap<Key,Value> map2 = new TreeMap<Key,Value>();
     final Map<Text,Boolean> toInclude = new HashMap<Text,Boolean>();
-    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1l), new Value(Value.getBytes(new Text("val1"))));
-    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2l), new Value(Value.getBytes(new Text("val2"))));
-    map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3l), new Value(Value.getBytes(new Text("val3"))));
-    map.put(new Key(new Text("r2"), new Text("cf2"), new Text("cq1"), new Text("cv1"), 4l), new Value(Value.getBytes(new Text("val4"))));
-    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 5l), new Value(Value.getBytes(new Text("val4"))));
-    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv2"), 6l), new Value(Value.getBytes(new Text("val4"))));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 7l), new Value(Value.getBytes(new Text(""))));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text(""), 8l), new Value(Value.getBytes(new Text("val1"))));
-    map.put(new Key(new Text("r4"), new Text("cf1"), new Text(""), new Text("cv1"), 9l), new Value(Value.getBytes(new Text("val1"))));
-    map.put(new Key(new Text("r4"), new Text(""), new Text("cq1"), new Text("cv1"), 10l), new Value(Value.getBytes(new Text("val1"))));
-    map.put(new Key(new Text(""), new Text("cf1"), new Text("cq1"), new Text("cv1"), 11l), new Value(Value.getBytes(new Text("val1"))));
+    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 1l), new Value("val1".getBytes()));
+    map.put(new Key(new Text("r1"), new Text("cf1"), new Text("cq2"), new Text("cv1"), 2l), new Value("val2".getBytes()));
+    map.put(new Key(new Text("r2"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 3l), new Value("val3".getBytes()));
+    map.put(new Key(new Text("r2"), new Text("cf2"), new Text("cq1"), new Text("cv1"), 4l), new Value("val4".getBytes()));
+    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 5l), new Value("val4".getBytes()));
+    map.put(new Key(new Text("r3"), new Text("cf1"), new Text("cq1"), new Text("cv2"), 6l), new Value("val4".getBytes()));
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text("cv1"), 7l), new Value("".getBytes()));
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text("cq1"), new Text(""), 8l), new Value("val1".getBytes()));
+    map.put(new Key(new Text("r4"), new Text("cf1"), new Text(""), new Text("cv1"), 9l), new Value("val1".getBytes()));
+    map.put(new Key(new Text("r4"), new Text(""), new Text("cq1"), new Text("cv1"), 10l), new Value("val1".getBytes()));
+    map.put(new Key(new Text(""), new Text("cf1"), new Text("cq1"), new Text("cv1"), 11l), new Value("val1".getBytes()));
     boolean b = true;
     int trueCount = 0;
     for (Key k : map.keySet()) {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java Wed May  2 16:58:18 2012
@@ -16,9 +16,9 @@
  */
 package org.apache.accumulo.core.security;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
-import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.util.ByteArraySet;
 import org.junit.Test;
 

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java Wed May  2 16:58:18 2012
@@ -20,9 +20,6 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.core.security.VisibilityEvaluator;
-import org.apache.accumulo.core.security.VisibilityParseException;
 import org.apache.accumulo.core.util.ByteArraySet;
 import org.junit.Test;
 

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/AddressUtilTest.java Wed May  2 16:58:18 2012
@@ -20,9 +20,7 @@ import java.net.InetSocketAddress;
 
 import junit.framework.TestCase;
 
-import org.apache.accumulo.core.util.AddressUtil;
 import org.apache.hadoop.io.Text;
-
 import org.apache.thrift.transport.TSocket;
 
 /**

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/EscapeTokenizerTest.java Wed May  2 16:58:18 2012
@@ -18,10 +18,10 @@ package org.apache.accumulo.core.util;
 
 import java.util.Iterator;
 
-import org.apache.accumulo.core.util.shell.commands.EscapeTokenizer;
-
 import junit.framework.TestCase;
 
+import org.apache.accumulo.core.util.shell.commands.EscapeTokenizer;
+
 public class EscapeTokenizerTest extends TestCase {
   
   public void test1() {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/LocalityGroupUtilTest.java Wed May  2 16:58:18 2012
@@ -25,7 +25,6 @@ import junit.framework.Assert;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
-import org.apache.accumulo.core.util.LocalityGroupUtil;
 import org.apache.accumulo.core.util.LocalityGroupUtil.LocalityGroupConfigurationError;
 import org.apache.hadoop.io.Text;
 import org.junit.Test;

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MergeTest.java Wed May  2 16:58:18 2012
@@ -16,17 +16,18 @@
  */
 package org.apache.accumulo.core.util;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.util.Merge;
 import org.apache.accumulo.core.util.Merge.Size;
 import org.apache.hadoop.io.Text;
 import org.junit.Test;
-import static org.junit.Assert.*;
 
 public class MergeTest {
   

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java Wed May  2 16:58:18 2012
@@ -22,7 +22,6 @@ import java.util.TreeSet;
 import junit.framework.TestCase;
 
 import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.util.MetadataTable;
 import org.apache.hadoop.io.Text;
 
 public class MetadataTableTest extends TestCase {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestStringUtil.java Wed May  2 16:58:18 2012
@@ -16,12 +16,11 @@
  */
 package org.apache.accumulo.core.util;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.accumulo.core.util.StringUtil;
 import org.junit.Test;
 
 public class TestStringUtil {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TestVersion.java Wed May  2 16:58:18 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.accumulo.core.util;
 
-import org.apache.accumulo.core.util.Version;
-
 import junit.framework.TestCase;
 
 public class TestVersion extends TestCase {

Modified: accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java?rev=1333109&r1=1333108&r2=1333109&view=diff
==============================================================================
--- accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java (original)
+++ accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/util/TextUtilTest.java Wed May  2 16:58:18 2012
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.util;
 
 import junit.framework.TestCase;
 
-import org.apache.accumulo.core.util.TextUtil;
 import org.apache.hadoop.io.Text;
 
 /**



Mime
View raw message