http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
index 0df0107..af65874 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
@@ -15,173 +15,146 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.client.impl.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ClientService {
 
   public interface Iface {
 
-    public String getRootTabletLocation() throws org.apache.thrift.TException;
+    public java.lang.String getRootTabletLocation() throws 
org.apache.thrift.TException;
 
-    public String getInstanceId() throws org.apache.thrift.TException;
+    public java.lang.String getInstanceId() throws 
org.apache.thrift.TException;
 
-    public String getZooKeepers() throws org.apache.thrift.TException;
+    public java.lang.String getZooKeepers() throws 
org.apache.thrift.TException;
 
-    public List<String> 
bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
String tableId, List<String> files, String errorDir, boolean setTime) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
+    public java.util.List<java.lang.String> 
bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
java.lang.String tableId, java.util.List<java.lang.String> files, 
java.lang.String errorDir, boolean setTime) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
 
     public boolean isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid) throws org.apache.thrift.TException;
 
     public void ping(org.apache.accumulo.core.security.thrift.TCredentials 
credentials) throws ThriftSecurityException, org.apache.thrift.TException;
 
-    public List<TDiskUsage> getDiskUsage(Set<String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
+    public java.util.List<TDiskUsage> 
getDiskUsage(java.util.Set<java.lang.String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public Set<String> 
listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, org.apache.thrift.TException;
+    public java.util.Set<java.lang.String> 
listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, org.apache.thrift.TException;
 
-    public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException;
+    public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password) throws 
ThriftSecurityException, org.apache.thrift.TException;
 
-    public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal) throws ThriftSecurityException, org.apache.thrift.TException;
+    public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public void 
changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException;
+    public void 
changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password) throws 
ThriftSecurityException, org.apache.thrift.TException;
 
     public boolean authenticate(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) 
throws ThriftSecurityException, org.apache.thrift.TException;
 
     public boolean 
authenticateUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.accumulo.core.security.thrift.TCredentials toAuth) throws 
ThriftSecurityException, org.apache.thrift.TException;
 
-    public void 
changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, List<ByteBuffer> authorizations) throws ThriftSecurityException, 
org.apache.thrift.TException;
+    public void 
changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.util.List<java.nio.ByteBuffer> authorizations) 
throws ThriftSecurityException, org.apache.thrift.TException;
 
-    public List<ByteBuffer> 
getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal) throws ThriftSecurityException, org.apache.thrift.TException;
+    public java.util.List<java.nio.ByteBuffer> 
getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public boolean 
hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte sysPerm) throws ThriftSecurityException, 
org.apache.thrift.TException;
+    public boolean 
hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte sysPerm) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public boolean 
hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte tblPerm) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
+    public boolean 
hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte tblPerm) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public boolean 
hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte tblNspcPerm) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
+    public boolean 
hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte tblNspcPerm) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public void 
grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException;
+    public void 
grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public void 
revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException;
+    public void 
revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public void 
grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
+    public void 
grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte permission) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public void 
revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
+    public void 
revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte permission) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public void 
grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
+    public void 
grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte permission) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public void 
revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
+    public void 
revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte permission) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public Map<String,String> 
getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type) throws org.apache.thrift.TException;
+    public java.util.Map<java.lang.String,java.lang.String> 
getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type) throws org.apache.thrift.TException;
 
-    public Map<String,String> 
getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
tableName) throws ThriftTableOperationException, org.apache.thrift.TException;
+    public java.util.Map<java.lang.String,java.lang.String> 
getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableName) throws ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public Map<String,String> 
getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) 
throws ThriftTableOperationException, org.apache.thrift.TException;
+    public java.util.Map<java.lang.String,java.lang.String> 
getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String ns) throws ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public boolean checkClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String className, String interfaceMatch) throws org.apache.thrift.TException;
+    public boolean checkClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String className, java.lang.String interfaceMatch) throws 
org.apache.thrift.TException;
 
-    public boolean checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String tableId, String className, String interfaceMatch) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
+    public boolean checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableId, java.lang.String className, java.lang.String 
interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public boolean 
checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
namespaceId, String className, String interfaceMatch) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
+    public boolean 
checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String namespaceId, java.lang.String className, java.lang.String 
interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void 
getRootTabletLocation(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
getRootTabletLocation(org.apache.thrift.async.AsyncMethodCallback<java.lang.String>
 resultHandler) throws org.apache.thrift.TException;
 
-    public void getInstanceId(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
getInstanceId(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 
resultHandler) throws org.apache.thrift.TException;
 
-    public void getZooKeepers(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
getZooKeepers(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 
resultHandler) throws org.apache.thrift.TException;
 
-    public void bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long 
tid, String tableId, List<String> files, String errorDir, boolean setTime, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long 
tid, java.lang.String tableId, java.util.List<java.lang.String> files, 
java.lang.String errorDir, boolean setTime, 
org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 
resultHandler) throws org.apache.thrift.TException;
 
-    public void isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 
resultHandler) throws org.apache.thrift.TException;
 
-    public void ping(org.apache.accumulo.core.security.thrift.TCredentials 
credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void ping(org.apache.accumulo.core.security.thrift.TCredentials 
credentials, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) 
throws org.apache.thrift.TException;
 
-    public void getDiskUsage(Set<String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getDiskUsage(java.util.Set<java.lang.String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback<java.util.List<TDiskUsage>> 
resultHandler) throws org.apache.thrift.TException;
 
-    public void listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback<java.util.Set<java.lang.String>> 
resultHandler) throws org.apache.thrift.TException;
 
-    public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, ByteBuffer password, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, org.apache.thrift.async.AsyncMethodCallback<Void> 
resultHandler) throws org.apache.thrift.TException;
 
-    public void 
changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void authenticate(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void authenticate(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) 
throws org.apache.thrift.TException;
 
-    public void authenticateUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.accumulo.core.security.thrift.TCredentials toAuth, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void authenticateUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.accumulo.core.security.thrift.TCredentials toAuth, 
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) 
throws org.apache.thrift.TException;
 
-    public void 
changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, List<ByteBuffer> authorizations, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.util.List<java.nio.ByteBuffer> authorizations, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, 
org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.nio.ByteBuffer>>
 resultHandler) throws org.apache.thrift.TException;
 
-    public void 
hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte sysPerm, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte sysPerm, 
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) 
throws org.apache.thrift.TException;
 
-    public void hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, String tableName, byte tblPerm, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte tblPerm, 
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) 
throws org.apache.thrift.TException;
 
-    public void 
hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte tblNspcPerm, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte tblNspcPerm, 
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) 
throws org.apache.thrift.TException;
 
-    public void 
grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte permission, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte permission, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte permission, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte permission, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte permission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte permission, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte permission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte permission, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte permission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte permission, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte permission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte permission, 
org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type, 
org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>>
 resultHandler) throws org.apache.thrift.TException;
 
-    public void 
getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableName, 
org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>>
 resultHandler) throws org.apache.thrift.TException;
 
-    public void 
getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String ns, 
org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,java.lang.String>>
 resultHandler) throws org.apache.thrift.TException;
 
-    public void checkClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void checkClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String className, java.lang.String interfaceMatch, 
org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) 
throws org.apache.thrift.TException;
 
-    public void checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String tableId, String className, String interfaceMatch, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableId, java.lang.String className, java.lang.String 
interfaceMatch, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 
resultHandler) throws org.apache.thrift.TException;
 
-    public void 
checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
namespaceId, String className, String interfaceMatch, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String namespaceId, java.lang.String className, java.lang.String 
interfaceMatch, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 
resultHandler) throws org.apache.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
+  public static class Client extends 
org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
     public static class Factory implements 
org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -201,7 +174,7 @@ public class ClientService {
       super(iprot, oprot);
     }
 
-    public String getRootTabletLocation() throws org.apache.thrift.TException
+    public java.lang.String getRootTabletLocation() throws 
org.apache.thrift.TException
     {
       send_getRootTabletLocation();
       return recv_getRootTabletLocation();
@@ -213,7 +186,7 @@ public class ClientService {
       sendBase("getRootTabletLocation", args);
     }
 
-    public String recv_getRootTabletLocation() throws 
org.apache.thrift.TException
+    public java.lang.String recv_getRootTabletLocation() throws 
org.apache.thrift.TException
     {
       getRootTabletLocation_result result = new getRootTabletLocation_result();
       receiveBase(result, "getRootTabletLocation");
@@ -223,7 +196,7 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getRootTabletLocation failed: unknown result");
     }
 
-    public String getInstanceId() throws org.apache.thrift.TException
+    public java.lang.String getInstanceId() throws org.apache.thrift.TException
     {
       send_getInstanceId();
       return recv_getInstanceId();
@@ -235,7 +208,7 @@ public class ClientService {
       sendBase("getInstanceId", args);
     }
 
-    public String recv_getInstanceId() throws org.apache.thrift.TException
+    public java.lang.String recv_getInstanceId() throws 
org.apache.thrift.TException
     {
       getInstanceId_result result = new getInstanceId_result();
       receiveBase(result, "getInstanceId");
@@ -245,7 +218,7 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getInstanceId failed: unknown result");
     }
 
-    public String getZooKeepers() throws org.apache.thrift.TException
+    public java.lang.String getZooKeepers() throws org.apache.thrift.TException
     {
       send_getZooKeepers();
       return recv_getZooKeepers();
@@ -257,7 +230,7 @@ public class ClientService {
       sendBase("getZooKeepers", args);
     }
 
-    public String recv_getZooKeepers() throws org.apache.thrift.TException
+    public java.lang.String recv_getZooKeepers() throws 
org.apache.thrift.TException
     {
       getZooKeepers_result result = new getZooKeepers_result();
       receiveBase(result, "getZooKeepers");
@@ -267,13 +240,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getZooKeepers failed: unknown result");
     }
 
-    public List<String> 
bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
String tableId, List<String> files, String errorDir, boolean setTime) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
+    public java.util.List<java.lang.String> 
bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
java.lang.String tableId, java.util.List<java.lang.String> files, 
java.lang.String errorDir, boolean setTime) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException
     {
       send_bulkImportFiles(tinfo, credentials, tid, tableId, files, errorDir, 
setTime);
       return recv_bulkImportFiles();
     }
 
-    public void 
send_bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
String tableId, List<String> files, String errorDir, boolean setTime) throws 
org.apache.thrift.TException
+    public void 
send_bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
java.lang.String tableId, java.util.List<java.lang.String> files, 
java.lang.String errorDir, boolean setTime) throws org.apache.thrift.TException
     {
       bulkImportFiles_args args = new bulkImportFiles_args();
       args.setTinfo(tinfo);
@@ -286,7 +259,7 @@ public class ClientService {
       sendBase("bulkImportFiles", args);
     }
 
-    public List<String> recv_bulkImportFiles() throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException
+    public java.util.List<java.lang.String> recv_bulkImportFiles() throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       bulkImportFiles_result result = new bulkImportFiles_result();
       receiveBase(result, "bulkImportFiles");
@@ -349,13 +322,13 @@ public class ClientService {
       return;
     }
 
-    public List<TDiskUsage> getDiskUsage(Set<String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
+    public java.util.List<TDiskUsage> 
getDiskUsage(java.util.Set<java.lang.String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_getDiskUsage(tables, credentials);
       return recv_getDiskUsage();
     }
 
-    public void send_getDiskUsage(Set<String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
org.apache.thrift.TException
+    public void send_getDiskUsage(java.util.Set<java.lang.String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
org.apache.thrift.TException
     {
       getDiskUsage_args args = new getDiskUsage_args();
       args.setTables(tables);
@@ -363,7 +336,7 @@ public class ClientService {
       sendBase("getDiskUsage", args);
     }
 
-    public List<TDiskUsage> recv_getDiskUsage() throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
+    public java.util.List<TDiskUsage> recv_getDiskUsage() throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       getDiskUsage_result result = new getDiskUsage_result();
       receiveBase(result, "getDiskUsage");
@@ -379,7 +352,7 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getDiskUsage failed: unknown result");
     }
 
-    public Set<String> 
listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, org.apache.thrift.TException
+    public java.util.Set<java.lang.String> 
listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, org.apache.thrift.TException
     {
       send_listLocalUsers(tinfo, credentials);
       return recv_listLocalUsers();
@@ -393,7 +366,7 @@ public class ClientService {
       sendBase("listLocalUsers", args);
     }
 
-    public Set<String> recv_listLocalUsers() throws ThriftSecurityException, 
org.apache.thrift.TException
+    public java.util.Set<java.lang.String> recv_listLocalUsers() throws 
ThriftSecurityException, org.apache.thrift.TException
     {
       listLocalUsers_result result = new listLocalUsers_result();
       receiveBase(result, "listLocalUsers");
@@ -406,13 +379,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "listLocalUsers failed: unknown result");
     }
 
-    public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException
+    public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password) throws 
ThriftSecurityException, org.apache.thrift.TException
     {
       send_createLocalUser(tinfo, credentials, principal, password);
       recv_createLocalUser();
     }
 
-    public void 
send_createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, ByteBuffer password) throws org.apache.thrift.TException
+    public void 
send_createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password) throws 
org.apache.thrift.TException
     {
       createLocalUser_args args = new createLocalUser_args();
       args.setTinfo(tinfo);
@@ -432,13 +405,13 @@ public class ClientService {
       return;
     }
 
-    public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal) throws ThriftSecurityException, org.apache.thrift.TException
+    public void dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal) throws ThriftSecurityException, 
org.apache.thrift.TException
     {
       send_dropLocalUser(tinfo, credentials, principal);
       recv_dropLocalUser();
     }
 
-    public void send_dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal) throws org.apache.thrift.TException
+    public void send_dropLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal) throws org.apache.thrift.TException
     {
       dropLocalUser_args args = new dropLocalUser_args();
       args.setTinfo(tinfo);
@@ -457,13 +430,13 @@ public class ClientService {
       return;
     }
 
-    public void 
changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException
+    public void 
changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password) throws 
ThriftSecurityException, org.apache.thrift.TException
     {
       send_changeLocalUserPassword(tinfo, credentials, principal, password);
       recv_changeLocalUserPassword();
     }
 
-    public void 
send_changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, ByteBuffer password) throws org.apache.thrift.TException
+    public void 
send_changeLocalUserPassword(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password) throws 
org.apache.thrift.TException
     {
       changeLocalUserPassword_args args = new changeLocalUserPassword_args();
       args.setTinfo(tinfo);
@@ -538,13 +511,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "authenticateUser failed: unknown result");
     }
 
-    public void 
changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, List<ByteBuffer> authorizations) throws ThriftSecurityException, 
org.apache.thrift.TException
+    public void 
changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.util.List<java.nio.ByteBuffer> authorizations) 
throws ThriftSecurityException, org.apache.thrift.TException
     {
       send_changeAuthorizations(tinfo, credentials, principal, authorizations);
       recv_changeAuthorizations();
     }
 
-    public void 
send_changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, List<ByteBuffer> authorizations) throws org.apache.thrift.TException
+    public void 
send_changeAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.util.List<java.nio.ByteBuffer> authorizations) 
throws org.apache.thrift.TException
     {
       changeAuthorizations_args args = new changeAuthorizations_args();
       args.setTinfo(tinfo);
@@ -564,13 +537,13 @@ public class ClientService {
       return;
     }
 
-    public List<ByteBuffer> 
getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal) throws ThriftSecurityException, org.apache.thrift.TException
+    public java.util.List<java.nio.ByteBuffer> 
getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal) throws ThriftSecurityException, 
org.apache.thrift.TException
     {
       send_getUserAuthorizations(tinfo, credentials, principal);
       return recv_getUserAuthorizations();
     }
 
-    public void 
send_getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal) throws org.apache.thrift.TException
+    public void 
send_getUserAuthorizations(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal) throws org.apache.thrift.TException
     {
       getUserAuthorizations_args args = new getUserAuthorizations_args();
       args.setTinfo(tinfo);
@@ -579,7 +552,7 @@ public class ClientService {
       sendBase("getUserAuthorizations", args);
     }
 
-    public List<ByteBuffer> recv_getUserAuthorizations() throws 
ThriftSecurityException, org.apache.thrift.TException
+    public java.util.List<java.nio.ByteBuffer> recv_getUserAuthorizations() 
throws ThriftSecurityException, org.apache.thrift.TException
     {
       getUserAuthorizations_result result = new getUserAuthorizations_result();
       receiveBase(result, "getUserAuthorizations");
@@ -592,13 +565,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getUserAuthorizations failed: unknown result");
     }
 
-    public boolean 
hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte sysPerm) throws ThriftSecurityException, 
org.apache.thrift.TException
+    public boolean 
hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte sysPerm) throws ThriftSecurityException, 
org.apache.thrift.TException
     {
       send_hasSystemPermission(tinfo, credentials, principal, sysPerm);
       return recv_hasSystemPermission();
     }
 
-    public void 
send_hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte sysPerm) throws org.apache.thrift.TException
+    public void 
send_hasSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte sysPerm) throws org.apache.thrift.TException
     {
       hasSystemPermission_args args = new hasSystemPermission_args();
       args.setTinfo(tinfo);
@@ -621,13 +594,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "hasSystemPermission failed: unknown result");
     }
 
-    public boolean 
hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte tblPerm) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException
+    public boolean 
hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte tblPerm) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_hasTablePermission(tinfo, credentials, principal, tableName, 
tblPerm);
       return recv_hasTablePermission();
     }
 
-    public void 
send_hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte tblPerm) throws org.apache.thrift.TException
+    public void 
send_hasTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte tblPerm) throws 
org.apache.thrift.TException
     {
       hasTablePermission_args args = new hasTablePermission_args();
       args.setTinfo(tinfo);
@@ -654,13 +627,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "hasTablePermission failed: unknown result");
     }
 
-    public boolean 
hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte tblNspcPerm) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException
+    public boolean 
hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte tblNspcPerm) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_hasNamespacePermission(tinfo, credentials, principal, ns, 
tblNspcPerm);
       return recv_hasNamespacePermission();
     }
 
-    public void 
send_hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte tblNspcPerm) throws org.apache.thrift.TException
+    public void 
send_hasNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte tblNspcPerm) throws 
org.apache.thrift.TException
     {
       hasNamespacePermission_args args = new hasNamespacePermission_args();
       args.setTinfo(tinfo);
@@ -687,13 +660,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "hasNamespacePermission failed: unknown result");
     }
 
-    public void 
grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException
+    public void 
grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException
     {
       send_grantSystemPermission(tinfo, credentials, principal, permission);
       recv_grantSystemPermission();
     }
 
-    public void 
send_grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte permission) throws org.apache.thrift.TException
+    public void 
send_grantSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte permission) throws org.apache.thrift.TException
     {
       grantSystemPermission_args args = new grantSystemPermission_args();
       args.setTinfo(tinfo);
@@ -713,13 +686,13 @@ public class ClientService {
       return;
     }
 
-    public void 
revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException
+    public void 
revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException
     {
       send_revokeSystemPermission(tinfo, credentials, principal, permission);
       recv_revokeSystemPermission();
     }
 
-    public void 
send_revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, byte permission) throws org.apache.thrift.TException
+    public void 
send_revokeSystemPermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, byte permission) throws org.apache.thrift.TException
     {
       revokeSystemPermission_args args = new revokeSystemPermission_args();
       args.setTinfo(tinfo);
@@ -739,13 +712,13 @@ public class ClientService {
       return;
     }
 
-    public void 
grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException
+    public void 
grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte permission) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_grantTablePermission(tinfo, credentials, principal, tableName, 
permission);
       recv_grantTablePermission();
     }
 
-    public void 
send_grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte permission) throws 
org.apache.thrift.TException
+    public void 
send_grantTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte permission) throws 
org.apache.thrift.TException
     {
       grantTablePermission_args args = new grantTablePermission_args();
       args.setTinfo(tinfo);
@@ -769,13 +742,13 @@ public class ClientService {
       return;
     }
 
-    public void 
revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException
+    public void 
revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte permission) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_revokeTablePermission(tinfo, credentials, principal, tableName, 
permission);
       recv_revokeTablePermission();
     }
 
-    public void 
send_revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String tableName, byte permission) throws 
org.apache.thrift.TException
+    public void 
send_revokeTablePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String tableName, byte permission) throws 
org.apache.thrift.TException
     {
       revokeTablePermission_args args = new revokeTablePermission_args();
       args.setTinfo(tinfo);
@@ -799,13 +772,13 @@ public class ClientService {
       return;
     }
 
-    public void 
grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException
+    public void 
grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte permission) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_grantNamespacePermission(tinfo, credentials, principal, ns, 
permission);
       recv_grantNamespacePermission();
     }
 
-    public void 
send_grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, String ns, byte permission) throws 
org.apache.thrift.TException
+    public void 
send_grantNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte permission) throws 
org.apache.thrift.TException
     {
       grantNamespacePermission_args args = new grantNamespacePermission_args();
       args.setTinfo(tinfo);
@@ -829,13 +802,13 @@ public class ClientService {
       return;
     }
 
-    public void 
revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, String ns, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException
+    public void 
revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte permission) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_revokeNamespacePermission(tinfo, credentials, principal, ns, 
permission);
       recv_revokeNamespacePermission();
     }
 
-    public void 
send_revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, String ns, byte permission) throws 
org.apache.thrift.TException
+    public void 
send_revokeNamespacePermission(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.lang.String ns, byte permission) throws 
org.apache.thrift.TException
     {
       revokeNamespacePermission_args args = new 
revokeNamespacePermission_args();
       args.setTinfo(tinfo);
@@ -859,7 +832,7 @@ public class ClientService {
       return;
     }
 
-    public Map<String,String> 
getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type) throws org.apache.thrift.TException
+    public java.util.Map<java.lang.String,java.lang.String> 
getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type) throws org.apache.thrift.TException
     {
       send_getConfiguration(tinfo, credentials, type);
       return recv_getConfiguration();
@@ -874,7 +847,7 @@ public class ClientService {
       sendBase("getConfiguration", args);
     }
 
-    public Map<String,String> recv_getConfiguration() throws 
org.apache.thrift.TException
+    public java.util.Map<java.lang.String,java.lang.String> 
recv_getConfiguration() throws org.apache.thrift.TException
     {
       getConfiguration_result result = new getConfiguration_result();
       receiveBase(result, "getConfiguration");
@@ -884,13 +857,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getConfiguration failed: unknown result");
     }
 
-    public Map<String,String> 
getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
tableName) throws ThriftTableOperationException, org.apache.thrift.TException
+    public java.util.Map<java.lang.String,java.lang.String> 
getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableName) throws ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_getTableConfiguration(tinfo, credentials, tableName);
       return recv_getTableConfiguration();
     }
 
-    public void 
send_getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
tableName) throws org.apache.thrift.TException
+    public void 
send_getTableConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableName) throws org.apache.thrift.TException
     {
       getTableConfiguration_args args = new getTableConfiguration_args();
       args.setTinfo(tinfo);
@@ -899,7 +872,7 @@ public class ClientService {
       sendBase("getTableConfiguration", args);
     }
 
-    public Map<String,String> recv_getTableConfiguration() throws 
ThriftTableOperationException, org.apache.thrift.TException
+    public java.util.Map<java.lang.String,java.lang.String> 
recv_getTableConfiguration() throws ThriftTableOperationException, 
org.apache.thrift.TException
     {
       getTableConfiguration_result result = new getTableConfiguration_result();
       receiveBase(result, "getTableConfiguration");
@@ -912,13 +885,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getTableConfiguration failed: unknown result");
     }
 
-    public Map<String,String> 
getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) 
throws ThriftTableOperationException, org.apache.thrift.TException
+    public java.util.Map<java.lang.String,java.lang.String> 
getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String ns) throws ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_getNamespaceConfiguration(tinfo, credentials, ns);
       return recv_getNamespaceConfiguration();
     }
 
-    public void 
send_getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String ns) throws org.apache.thrift.TException
+    public void 
send_getNamespaceConfiguration(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String ns) throws org.apache.thrift.TException
     {
       getNamespaceConfiguration_args args = new 
getNamespaceConfiguration_args();
       args.setTinfo(tinfo);
@@ -927,7 +900,7 @@ public class ClientService {
       sendBase("getNamespaceConfiguration", args);
     }
 
-    public Map<String,String> recv_getNamespaceConfiguration() throws 
ThriftTableOperationException, org.apache.thrift.TException
+    public java.util.Map<java.lang.String,java.lang.String> 
recv_getNamespaceConfiguration() throws ThriftTableOperationException, 
org.apache.thrift.TException
     {
       getNamespaceConfiguration_result result = new 
getNamespaceConfiguration_result();
       receiveBase(result, "getNamespaceConfiguration");
@@ -940,13 +913,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getNamespaceConfiguration failed: unknown result");
     }
 
-    public boolean checkClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String className, String interfaceMatch) throws org.apache.thrift.TException
+    public boolean checkClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String className, java.lang.String interfaceMatch) throws 
org.apache.thrift.TException
     {
       send_checkClass(tinfo, credentials, className, interfaceMatch);
       return recv_checkClass();
     }
 
-    public void send_checkClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String className, String interfaceMatch) throws org.apache.thrift.TException
+    public void send_checkClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String className, java.lang.String interfaceMatch) throws 
org.apache.thrift.TException
     {
       checkClass_args args = new checkClass_args();
       args.setTinfo(tinfo);
@@ -966,13 +939,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "checkClass failed: unknown result");
     }
 
-    public boolean checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String tableId, String className, String interfaceMatch) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
+    public boolean checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableId, java.lang.String className, java.lang.String 
interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_checkTableClass(tinfo, credentials, tableId, className, 
interfaceMatch);
       return recv_checkTableClass();
     }
 
-    public void 
send_checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
tableId, String className, String interfaceMatch) throws 
org.apache.thrift.TException
+    public void 
send_checkTableClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableId, java.lang.String className, java.lang.String 
interfaceMatch) throws org.apache.thrift.TException
     {
       checkTableClass_args args = new checkTableClass_args();
       args.setTinfo(tinfo);
@@ -999,13 +972,13 @@ public class ClientService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "checkTableClass failed: unknown result");
     }
 
-    public boolean 
checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
namespaceId, String className, String interfaceMatch) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
+    public boolean 
checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String namespaceId, java.lang.String className, java.lang.String 
interfaceMatch) throws ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException
     {
       send_checkNamespaceClass(tinfo, credentials, namespaceId, className, 
interfaceMatch);
       return recv_checkNamespaceClass();
     }
 
-    public void 
send_checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
namespaceId, String className, String interfaceMatch) throws 
org.apache.thrift.TException
+    public void 
send_checkNamespaceClass(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String namespaceId, java.lang.String className, java.lang.String 
interfaceMatch) throws org.apache.thrift.TException
     {
       checkNamespaceClass_args args = new checkNamespaceClass_args();
       args.setTinfo(tinfo);
@@ -1050,15 +1023,15 @@ public class ClientService {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void 
getRootTabletLocation(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
+    public void 
getRootTabletLocation(org.apache.thrift.async.AsyncMethodCallback<java.lang.String>
 resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getRootTabletLocation_call method_call = new 
getRootTabletLocation_call(resultHandler, this, ___protocolFactory, 
___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getRootTabletLocation_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      public 
getRootTabletLocation_call(org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+    public static class getRootTabletLocation_call extends 
org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      public 
getRootTabletLocation_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.String>
 resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -1069,9 +1042,9 @@ public class ClientService {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws org.apache.thrift.TException {
+      public java.lang.String getResult() throws org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not 
finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1079,15 +1052,15 @@ public class ClientService {
       }
     }
 
-    public void getInstanceId(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
+    public void 
getInstanceId(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getInstanceId_call method_call = new getInstanceId_call(resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getInstanceId_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      public getInstanceId_call(org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+    public static class getInstanceId_call extends 
org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      public 
getInstanceId_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.String>
 resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -1098,9 +1071,9 @@ public class ClientService {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws org.apache.thrift.TException {
+      public java.lang.String getResult() throws org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not 
finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1108,15 +1081,15 @@ public class ClientService {
       }
     }
 
-    public void getZooKeepers(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
+    public void 
getZooKeepers(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getZooKeepers_call method_call = new getZooKeepers_call(resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getZooKeepers_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      public getZooKeepers_call(org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+    public static class getZooKeepers_call extends 
org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      public 
getZooKeepers_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.String>
 resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -1127,9 +1100,9 @@ public class ClientService {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws org.apache.thrift.TException {
+      public java.lang.String getResult() throws org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not 
finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1137,22 +1110,22 @@ public class ClientService {
       }
     }
 
-    public void bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long 
tid, String tableId, List<String> files, String errorDir, boolean setTime, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long 
tid, java.lang.String tableId, java.util.List<java.lang.String> files, 
java.lang.String errorDir, boolean setTime, 
org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       bulkImportFiles_call method_call = new bulkImportFiles_call(tinfo, 
credentials, tid, tableId, files, errorDir, setTime, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class bulkImportFiles_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+    public static class bulkImportFiles_call extends 
org.apache.thrift.async.TAsyncMethodCall<java.util.List<java.lang.String>> {
       private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
       private long tid;
-      private String tableId;
-      private List<String> files;
-      private String errorDir;
+      private java.lang.String tableId;
+      private java.util.List<java.lang.String> files;
+      private java.lang.String errorDir;
       private boolean setTime;
-      public bulkImportFiles_call(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long 
tid, String tableId, List<String> files, String errorDir, boolean setTime, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public bulkImportFiles_call(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, long 
tid, java.lang.String tableId, java.util.List<java.lang.String> files, 
java.lang.String errorDir, boolean setTime, 
org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tinfo = tinfo;
         this.credentials = credentials;
@@ -1177,9 +1150,9 @@ public class ClientService {
         prot.writeMessageEnd();
       }
 
-      public List<String> getResult() throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException {
+      public java.util.List<java.lang.String> getResult() throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not 
finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1187,17 +1160,17 @@ public class ClientService {
       }
     }
 
-    public void isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       isActive_call method_call = new isActive_call(tinfo, tid, resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class isActive_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+    public static class isActive_call extends 
org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
       private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private long tid;
-      public isActive_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public isActive_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tinfo = tinfo;
         this.tid = tid;
@@ -1212,9 +1185,9 @@ public class ClientService {
         prot.writeMessageEnd();
       }
 
-      public boolean getResult() throws org.apache.thrift.TException {
+      public java.lang.Boolean getResult() throws org.apache.thrift.TException 
{
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not 
finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1222,16 +1195,16 @@ public class ClientService {
       }
     }
 
-    public void ping(org.apache.accumulo.core.security.thrift.TCredentials 
credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void ping(org.apache.accumulo.core.security.thrift.TCredentials 
credentials, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
       ping_call method_call = new ping_call(credentials, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class ping_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+    public static class ping_call extends 
org.apache.thrift.async.TAsyncMethodCall<Void> {
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
-      public ping_call(org.apache.accumulo.core.security.thrift.TCredentials 
credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public ping_call(org.apache.accumulo.core.security.thrift.TCredentials 
credentials, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.credentials = credentials;
       }
@@ -1244,27 +1217,27 @@ public class ClientService {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws ThriftSecurityException, 
org.apache.thrift.TException {
+      public Void getResult() throws ThriftSecurityException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not 
finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_ping();
+        return null;
       }
     }
 
-    public void getDiskUsage(Set<String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getDiskUsage(java.util.Set<java.lang.String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback<java.util.List<TDiskUsage>> 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getDiskUsage_call method_call = new getDiskUsage_call(tables, 
credentials, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getDiskUsage_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private Set<String> tables;
+    public static class getDiskUsage_call extends 
org.apache.thrift.async.TAsyncMethodCall<java.util.List<TDiskUsage>> {
+      private java.util.Set<java.lang.String> tables;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
-      public getDiskUsage_call(Set<String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getDiskUsage_call(java.util.Set<java.lang.String> tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback<java.util.List<TDiskUsage>> 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tables = tables;
         this.credentials = crede

<TRUNCATED>

Reply via email to