[14/15] accumulo git commit: ACCUMULO-898 refactoring and deprecation of old tracing

[billie]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6b5f5ef4/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 638a8b7..d5d5b40 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
@@ -58,59 +58,59 @@ import org.slf4j.LoggerFactory;
 
     public String getZooKeepers() throws org.apache.thrift.TException;
 
-    public List<String> bulkImportFiles(org.apache.accumulo.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 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 boolean isActive(org.apache.accumulo.trace.thrift.TInfo tinfo, long 
tid) throws 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 Set<String> listLocalUsers(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) 
throws ThriftSecurityException, 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 void createLocalUser(org.apache.accumulo.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, 
String principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public void dropLocalUser(org.apache.accumulo.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, 
String principal) throws ThriftSecurityException, org.apache.thrift.TException;
 
-    public void changeLocalUserPassword(org.apache.accumulo.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, String 
principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public boolean authenticate(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) 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.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 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.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, String 
principal, List<ByteBuffer> authorizations) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public List<ByteBuffer> 
getUserAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal) 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 boolean hasSystemPermission(org.apache.accumulo.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, String 
principal, byte sysPerm) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public boolean hasTablePermission(org.apache.accumulo.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, String 
principal, String tableName, byte tblPerm) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
 
-    public boolean 
hasNamespacePermission(org.apache.accumulo.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, String 
principal, String ns, byte tblNspcPerm) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
 
-    public void grantSystemPermission(org.apache.accumulo.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, String 
principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public void revokeSystemPermission(org.apache.accumulo.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, String 
principal, byte permission) throws ThriftSecurityException, 
org.apache.thrift.TException;
 
-    public void grantTablePermission(org.apache.accumulo.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, String 
principal, String tableName, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
 
-    public void revokeTablePermission(org.apache.accumulo.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, String 
principal, String tableName, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
 
-    public void 
grantNamespacePermission(org.apache.accumulo.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, String 
principal, String ns, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
 
-    public void 
revokeNamespacePermission(org.apache.accumulo.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, String 
principal, String ns, byte permission) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
 
-    public Map<String,String> 
getConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type) throws 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 Map<String,String> 
getTableConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
tableName) throws ThriftTableOperationException, 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 Map<String,String> 
getNamespaceConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) 
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 boolean checkClass(org.apache.accumulo.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, 
String className, String interfaceMatch) throws org.apache.thrift.TException;
 
-    public boolean checkTableClass(org.apache.accumulo.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, 
String tableId, String className, String interfaceMatch) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-    public boolean checkNamespaceClass(org.apache.accumulo.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, String 
namespaceId, String className, String interfaceMatch) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
   }
 
@@ -122,59 +122,59 @@ import org.slf4j.LoggerFactory;
 
     public void getZooKeepers(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void bulkImportFiles(org.apache.accumulo.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, String tableId, List<String> files, String errorDir, boolean setTime, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void isActive(org.apache.accumulo.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 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 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 listLocalUsers(org.apache.accumulo.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 resultHandler) throws 
org.apache.thrift.TException;
 
-    public void createLocalUser(org.apache.accumulo.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, 
String principal, ByteBuffer password, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void dropLocalUser(org.apache.accumulo.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, 
String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-    public void changeLocalUserPassword(org.apache.accumulo.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, String 
principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void authenticate(org.apache.accumulo.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 resultHandler) throws 
org.apache.thrift.TException;
 
-    public void authenticateUser(org.apache.accumulo.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 resultHandler) throws 
org.apache.thrift.TException;
 
-    public void changeAuthorizations(org.apache.accumulo.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, String 
principal, List<ByteBuffer> authorizations, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getUserAuthorizations(org.apache.accumulo.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, String 
principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void hasSystemPermission(org.apache.accumulo.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, String 
principal, byte sysPerm, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void hasTablePermission(org.apache.accumulo.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, 
String principal, String tableName, byte tblPerm, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void hasNamespacePermission(org.apache.accumulo.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, String 
principal, String ns, byte tblNspcPerm, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void grantSystemPermission(org.apache.accumulo.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, String 
principal, byte permission, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void revokeSystemPermission(org.apache.accumulo.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, String 
principal, byte permission, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void grantTablePermission(org.apache.accumulo.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, String 
principal, String tableName, byte permission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void revokeTablePermission(org.apache.accumulo.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, String 
principal, String tableName, byte permission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
grantNamespacePermission(org.apache.accumulo.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, String 
principal, String ns, byte permission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
revokeNamespacePermission(org.apache.accumulo.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, String 
principal, String ns, byte permission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getConfiguration(org.apache.accumulo.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 
resultHandler) throws org.apache.thrift.TException;
 
-    public void getTableConfiguration(org.apache.accumulo.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, String 
tableName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
getNamespaceConfiguration(org.apache.accumulo.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, String ns, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void checkClass(org.apache.accumulo.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, String 
className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void checkTableClass(org.apache.accumulo.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, 
String tableId, String className, String interfaceMatch, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void checkNamespaceClass(org.apache.accumulo.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, String 
namespaceId, String className, String interfaceMatch, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
   }
 
@@ -264,13 +264,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getZooKeepers failed: unknown result");
     }
 
-    public List<String> bulkImportFiles(org.apache.accumulo.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 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
     {
       send_bulkImportFiles(tinfo, credentials, tid, tableId, files, errorDir, 
setTime);
       return recv_bulkImportFiles();
     }
 
-    public void send_bulkImportFiles(org.apache.accumulo.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, 
String tableId, List<String> files, String errorDir, boolean setTime) throws 
org.apache.thrift.TException
     {
       bulkImportFiles_args args = new bulkImportFiles_args();
       args.setTinfo(tinfo);
@@ -299,13 +299,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "bulkImportFiles failed: unknown result");
     }
 
-    public boolean isActive(org.apache.accumulo.trace.thrift.TInfo tinfo, long 
tid) throws org.apache.thrift.TException
+    public boolean isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid) throws org.apache.thrift.TException
     {
       send_isActive(tinfo, tid);
       return recv_isActive();
     }
 
-    public void send_isActive(org.apache.accumulo.trace.thrift.TInfo tinfo, 
long tid) throws org.apache.thrift.TException
+    public void send_isActive(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, long tid) throws org.apache.thrift.TException
     {
       isActive_args args = new isActive_args();
       args.setTinfo(tinfo);
@@ -376,13 +376,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getDiskUsage failed: unknown result");
     }
 
-    public Set<String> listLocalUsers(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) 
throws ThriftSecurityException, 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
     {
       send_listLocalUsers(tinfo, credentials);
       return recv_listLocalUsers();
     }
 
-    public void send_listLocalUsers(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) 
throws org.apache.thrift.TException
+    public void 
send_listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
org.apache.thrift.TException
     {
       listLocalUsers_args args = new listLocalUsers_args();
       args.setTinfo(tinfo);
@@ -403,13 +403,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "listLocalUsers failed: unknown result");
     }
 
-    public void createLocalUser(org.apache.accumulo.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, 
String principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException
     {
       send_createLocalUser(tinfo, credentials, principal, password);
       recv_createLocalUser();
     }
 
-    public void send_createLocalUser(org.apache.accumulo.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, String 
principal, ByteBuffer password) throws org.apache.thrift.TException
     {
       createLocalUser_args args = new createLocalUser_args();
       args.setTinfo(tinfo);
@@ -429,13 +429,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void dropLocalUser(org.apache.accumulo.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, 
String principal) throws ThriftSecurityException, org.apache.thrift.TException
     {
       send_dropLocalUser(tinfo, credentials, principal);
       recv_dropLocalUser();
     }
 
-    public void send_dropLocalUser(org.apache.accumulo.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, 
String principal) throws org.apache.thrift.TException
     {
       dropLocalUser_args args = new dropLocalUser_args();
       args.setTinfo(tinfo);
@@ -454,13 +454,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void changeLocalUserPassword(org.apache.accumulo.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, String 
principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException
     {
       send_changeLocalUserPassword(tinfo, credentials, principal, password);
       recv_changeLocalUserPassword();
     }
 
-    public void 
send_changeLocalUserPassword(org.apache.accumulo.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, String 
principal, ByteBuffer password) throws org.apache.thrift.TException
     {
       changeLocalUserPassword_args args = new changeLocalUserPassword_args();
       args.setTinfo(tinfo);
@@ -480,13 +480,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public boolean authenticate(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) 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
     {
       send_authenticate(tinfo, credentials);
       return recv_authenticate();
     }
 
-    public void send_authenticate(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) 
throws org.apache.thrift.TException
+    public void send_authenticate(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) 
throws org.apache.thrift.TException
     {
       authenticate_args args = new authenticate_args();
       args.setTinfo(tinfo);
@@ -507,13 +507,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "authenticate failed: unknown result");
     }
 
-    public boolean authenticateUser(org.apache.accumulo.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 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
     {
       send_authenticateUser(tinfo, credentials, toAuth);
       return recv_authenticateUser();
     }
 
-    public void send_authenticateUser(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.accumulo.core.security.thrift.TCredentials toAuth) throws 
org.apache.thrift.TException
+    public void 
send_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 
org.apache.thrift.TException
     {
       authenticateUser_args args = new authenticateUser_args();
       args.setTinfo(tinfo);
@@ -535,13 +535,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "authenticateUser failed: unknown result");
     }
 
-    public void changeAuthorizations(org.apache.accumulo.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, String 
principal, List<ByteBuffer> authorizations) throws ThriftSecurityException, 
org.apache.thrift.TException
     {
       send_changeAuthorizations(tinfo, credentials, principal, authorizations);
       recv_changeAuthorizations();
     }
 
-    public void 
send_changeAuthorizations(org.apache.accumulo.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, String 
principal, List<ByteBuffer> authorizations) throws org.apache.thrift.TException
     {
       changeAuthorizations_args args = new changeAuthorizations_args();
       args.setTinfo(tinfo);
@@ -561,13 +561,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public List<ByteBuffer> 
getUserAuthorizations(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal) 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
     {
       send_getUserAuthorizations(tinfo, credentials, principal);
       return recv_getUserAuthorizations();
     }
 
-    public void 
send_getUserAuthorizations(org.apache.accumulo.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, String 
principal) throws org.apache.thrift.TException
     {
       getUserAuthorizations_args args = new getUserAuthorizations_args();
       args.setTinfo(tinfo);
@@ -589,13 +589,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getUserAuthorizations failed: unknown result");
     }
 
-    public boolean hasSystemPermission(org.apache.accumulo.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, 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.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, String 
principal, byte sysPerm) throws org.apache.thrift.TException
     {
       hasSystemPermission_args args = new hasSystemPermission_args();
       args.setTinfo(tinfo);
@@ -618,13 +618,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "hasSystemPermission failed: unknown result");
     }
 
-    public boolean hasTablePermission(org.apache.accumulo.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, String 
principal, 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.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, String 
principal, String tableName, byte tblPerm) throws org.apache.thrift.TException
     {
       hasTablePermission_args args = new hasTablePermission_args();
       args.setTinfo(tinfo);
@@ -651,13 +651,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "hasTablePermission failed: unknown result");
     }
 
-    public boolean 
hasNamespacePermission(org.apache.accumulo.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, String 
principal, 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.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, String 
principal, String ns, byte tblNspcPerm) throws org.apache.thrift.TException
     {
       hasNamespacePermission_args args = new hasNamespacePermission_args();
       args.setTinfo(tinfo);
@@ -684,13 +684,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "hasNamespacePermission failed: unknown result");
     }
 
-    public void grantSystemPermission(org.apache.accumulo.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, 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.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, String 
principal, byte permission) throws org.apache.thrift.TException
     {
       grantSystemPermission_args args = new grantSystemPermission_args();
       args.setTinfo(tinfo);
@@ -710,13 +710,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void revokeSystemPermission(org.apache.accumulo.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, 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.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, String 
principal, byte permission) throws org.apache.thrift.TException
     {
       revokeSystemPermission_args args = new revokeSystemPermission_args();
       args.setTinfo(tinfo);
@@ -736,13 +736,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void grantTablePermission(org.apache.accumulo.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, String 
principal, 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.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, String 
principal, String tableName, byte permission) throws 
org.apache.thrift.TException
     {
       grantTablePermission_args args = new grantTablePermission_args();
       args.setTinfo(tinfo);
@@ -766,13 +766,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void revokeTablePermission(org.apache.accumulo.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, String 
principal, 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.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, String 
principal, String tableName, byte permission) throws 
org.apache.thrift.TException
     {
       revokeTablePermission_args args = new revokeTablePermission_args();
       args.setTinfo(tinfo);
@@ -796,13 +796,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void 
grantNamespacePermission(org.apache.accumulo.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, String 
principal, 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.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, 
String principal, String ns, byte permission) throws 
org.apache.thrift.TException
     {
       grantNamespacePermission_args args = new grantNamespacePermission_args();
       args.setTinfo(tinfo);
@@ -826,13 +826,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void 
revokeNamespacePermission(org.apache.accumulo.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, String 
principal, 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.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, 
String principal, String ns, byte permission) throws 
org.apache.thrift.TException
     {
       revokeNamespacePermission_args args = new 
revokeNamespacePermission_args();
       args.setTinfo(tinfo);
@@ -856,13 +856,13 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public Map<String,String> 
getConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type) throws 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
     {
       send_getConfiguration(tinfo, credentials, type);
       return recv_getConfiguration();
     }
 
-    public void send_getConfiguration(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type) throws org.apache.thrift.TException
+    public void 
send_getConfiguration(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
ConfigurationType type) throws org.apache.thrift.TException
     {
       getConfiguration_args args = new getConfiguration_args();
       args.setTinfo(tinfo);
@@ -881,13 +881,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getConfiguration failed: unknown result");
     }
 
-    public Map<String,String> 
getTableConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
tableName) throws ThriftTableOperationException, 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
     {
       send_getTableConfiguration(tinfo, credentials, tableName);
       return recv_getTableConfiguration();
     }
 
-    public void 
send_getTableConfiguration(org.apache.accumulo.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, String 
tableName) throws org.apache.thrift.TException
     {
       getTableConfiguration_args args = new getTableConfiguration_args();
       args.setTinfo(tinfo);
@@ -909,13 +909,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getTableConfiguration failed: unknown result");
     }
 
-    public Map<String,String> 
getNamespaceConfiguration(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String ns) 
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
     {
       send_getNamespaceConfiguration(tinfo, credentials, ns);
       return recv_getNamespaceConfiguration();
     }
 
-    public void 
send_getNamespaceConfiguration(org.apache.accumulo.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, 
String ns) throws org.apache.thrift.TException
     {
       getNamespaceConfiguration_args args = new 
getNamespaceConfiguration_args();
       args.setTinfo(tinfo);
@@ -937,13 +937,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getNamespaceConfiguration failed: unknown result");
     }
 
-    public boolean checkClass(org.apache.accumulo.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, 
String className, String interfaceMatch) throws org.apache.thrift.TException
     {
       send_checkClass(tinfo, credentials, className, interfaceMatch);
       return recv_checkClass();
     }
 
-    public void send_checkClass(org.apache.accumulo.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, 
String className, String interfaceMatch) throws org.apache.thrift.TException
     {
       checkClass_args args = new checkClass_args();
       args.setTinfo(tinfo);
@@ -963,13 +963,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "checkClass failed: unknown result");
     }
 
-    public boolean checkTableClass(org.apache.accumulo.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, 
String tableId, String className, 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.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, String 
tableId, String className, String interfaceMatch) throws 
org.apache.thrift.TException
     {
       checkTableClass_args args = new checkTableClass_args();
       args.setTinfo(tinfo);
@@ -996,13 +996,13 @@ import org.slf4j.LoggerFactory;
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "checkTableClass failed: unknown result");
     }
 
-    public boolean checkNamespaceClass(org.apache.accumulo.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, String 
namespaceId, String className, 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.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, String 
namespaceId, String className, String interfaceMatch) throws 
org.apache.thrift.TException
     {
       checkNamespaceClass_args args = new checkNamespaceClass_args();
       args.setTinfo(tinfo);
@@ -1134,7 +1134,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void bulkImportFiles(org.apache.accumulo.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, String tableId, List<String> files, String errorDir, boolean setTime, 
org.apache.thrift.async.AsyncMethodCallback 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;
@@ -1142,14 +1142,14 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class bulkImportFiles_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      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 boolean setTime;
-      public bulkImportFiles_call(org.apache.accumulo.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, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tinfo = tinfo;
         this.credentials = credentials;
@@ -1184,7 +1184,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void isActive(org.apache.accumulo.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 resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       isActive_call method_call = new isActive_call(tinfo, tid, resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1192,9 +1192,9 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class isActive_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private long tid;
-      public isActive_call(org.apache.accumulo.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 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;
@@ -1286,7 +1286,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void listLocalUsers(org.apache.accumulo.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 resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       listLocalUsers_call method_call = new listLocalUsers_call(tinfo, 
credentials, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1294,9 +1294,9 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class listLocalUsers_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
-      public listLocalUsers_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 
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 listLocalUsers_call(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tinfo = tinfo;
         this.credentials = credentials;
@@ -1321,7 +1321,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void createLocalUser(org.apache.accumulo.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, 
String principal, ByteBuffer password, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       createLocalUser_call method_call = new createLocalUser_call(tinfo, 
credentials, principal, password, resultHandler, this, ___protocolFactory, 
___transport);
       this.___currentMethod = method_call;
@@ -1329,11 +1329,11 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class createLocalUser_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
       private String principal;
       private ByteBuffer password;
-      public createLocalUser_call(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, ByteBuffer password, 
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 createLocalUser_call(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, 
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;
@@ -1362,7 +1362,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void dropLocalUser(org.apache.accumulo.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, 
String principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
       dropLocalUser_call method_call = new dropLocalUser_call(tinfo, 
credentials, principal, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1370,10 +1370,10 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class dropLocalUser_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
       private String principal;
-      public dropLocalUser_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, 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 dropLocalUser_call(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tinfo = tinfo;
         this.credentials = credentials;
@@ -1400,7 +1400,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void changeLocalUserPassword(org.apache.accumulo.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, String 
principal, ByteBuffer password, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       changeLocalUserPassword_call method_call = new 
changeLocalUserPassword_call(tinfo, credentials, principal, password, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1408,11 +1408,11 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class changeLocalUserPassword_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
       private String principal;
       private ByteBuffer password;
-      public 
changeLocalUserPassword_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, ByteBuffer password, 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 
changeLocalUserPassword_call(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, 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;
@@ -1441,7 +1441,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void authenticate(org.apache.accumulo.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 resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       authenticate_call method_call = new authenticate_call(tinfo, 
credentials, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1449,9 +1449,9 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class authenticate_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
-      public authenticate_call(org.apache.accumulo.trace.thrift.TInfo tinfo, 
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 authenticate_call(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tinfo = tinfo;
         this.credentials = credentials;
@@ -1476,7 +1476,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void authenticateUser(org.apache.accumulo.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 resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       authenticateUser_call method_call = new authenticateUser_call(tinfo, 
credentials, toAuth, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1484,10 +1484,10 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class authenticateUser_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
       private org.apache.accumulo.core.security.thrift.TCredentials toAuth;
-      public authenticateUser_call(org.apache.accumulo.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, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public authenticateUser_call(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, 
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;
@@ -1514,7 +1514,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void changeAuthorizations(org.apache.accumulo.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, String 
principal, List<ByteBuffer> authorizations, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       changeAuthorizations_call method_call = new 
changeAuthorizations_call(tinfo, credentials, principal, authorizations, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1522,11 +1522,11 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class changeAuthorizations_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
       private String principal;
       private List<ByteBuffer> authorizations;
-      public changeAuthorizations_call(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, List<ByteBuffer> authorizations, 
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 
changeAuthorizations_call(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, 
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;
@@ -1555,7 +1555,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void getUserAuthorizations(org.apache.accumulo.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, String 
principal, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       getUserAuthorizations_call method_call = new 
getUserAuthorizations_call(tinfo, credentials, principal, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1563,10 +1563,10 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class getUserAuthorizations_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
       private String principal;
-      public getUserAuthorizations_call(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, 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 
getUserAuthorizations_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String 
principal, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tinfo = tinfo;
         this.credentials = credentials;
@@ -1593,7 +1593,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void hasSystemPermission(org.apache.accumulo.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, String 
principal, byte sysPerm, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       hasSystemPermission_call method_call = new 
hasSystemPermission_call(tinfo, credentials, principal, sysPerm, resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1601,11 +1601,11 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class hasSystemPermission_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
       private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
       private String principal;
       private byte sysPerm;
-      public hasSystemPermission_call(org.apache.accumulo.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, byte sysPerm, 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 
hasSystemPermission_call(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, 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;
@@ -1634,7 +1634,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void hasTablePermission(org.apache.accumulo.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, 
String principal, String tableName, byte tblPerm, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
       hasTablePermission_call method_call = new hasTablePermission_call(tinfo, 
credentials, principal, tableName, tblPerm, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -1642,12 +1642,12 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class hasTablePermission_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
    

<TRUNCATED>