accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1451062 [1/2] - in /accumulo/branches/ACCUMULO-259-polishing: ./ core/ core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/impl/thrif...
Date Thu, 28 Feb 2013 00:38:14 GMT
Author: ctubbsii
Date: Thu Feb 28 00:38:13 2013
New Revision: 1451062

URL: http://svn.apache.org/r1451062
Log:
ACCUMULO-259 merge 1.5 branch updates to polishing branch

Added:
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
      - copied unchanged from r1451018, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/recovery/LogCloser.java
      - copied unchanged from r1451018, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/LogCloser.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
      - copied unchanged from r1451018, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java
      - copied unchanged from r1451018, accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java
Removed:
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/recovery/MapRRecoverLease.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoverLease.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
Modified:
    accumulo/branches/ACCUMULO-259-polishing/   (props changed)
    accumulo/branches/ACCUMULO-259-polishing/README
    accumulo/branches/ACCUMULO-259-polishing/core/   (props changed)
    accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
    accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
    accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
    accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
    accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/conf/Property.java
    accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/client.thrift
    accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
    accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/clients.tex
    accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/design.tex
    accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/shell.tex
    accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_configuration.tex
    accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_design.tex
    accumulo/branches/ACCUMULO-259-polishing/examples/   (props changed)
    accumulo/branches/ACCUMULO-259-polishing/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
    accumulo/branches/ACCUMULO-259-polishing/pom.xml
    accumulo/branches/ACCUMULO-259-polishing/server/   (props changed)
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
    accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
    accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/TestIngest.java
    accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
    accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java
    accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
    accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
    accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
    accumulo/branches/ACCUMULO-259-polishing/test/system/auto/TestUtils.py
    accumulo/branches/ACCUMULO-259-polishing/test/system/auto/simple/binary.py
    accumulo/branches/ACCUMULO-259-polishing/test/system/auto/simple/examples.py
    accumulo/branches/ACCUMULO-259-polishing/test/system/auto/simple/readwrite.py
    accumulo/branches/ACCUMULO-259-polishing/test/system/auto/stress/batchWrite.py
    accumulo/branches/ACCUMULO-259-polishing/test/system/continuous/agitator.pl

Propchange: accumulo/branches/ACCUMULO-259-polishing/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1450388-1451052

Modified: accumulo/branches/ACCUMULO-259-polishing/README
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/README?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/README (original)
+++ accumulo/branches/ACCUMULO-259-polishing/README Thu Feb 28 00:38:13 2013
@@ -31,7 +31,7 @@ If you are running on another Unix-like 
 you may wish to build the native libraries.  They are not strictly necessary
 but having them available suppresses a runtime warning:
 
-  $ ( cd ./src/server/src/main/c++ ; make )
+  $ ( cd ./server/src/main/c++ ; make )
 
 If you want to build the debian release, use the command "mvn install -Pdeb" to 
 generate the .deb files in the target/ directory. Please follow the steps at 
@@ -42,7 +42,7 @@ easier to install.
 ******************************************************************************
 2. Deployment
 
-Copy the accumulo tar file produced by mvn package from the src/assemble/target/
+Copy the accumulo tar file produced by mvn package from the assemble/target/
 directory to the desired destination, then untar it (e.g. 
 tar xzf apache-accumulo-1.5.0-SNAPSHOT-dist.tar.gz).
 

Propchange: accumulo/branches/ACCUMULO-259-polishing/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1450369-1451018

Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java Thu Feb 28 00:38:13 2013
@@ -104,14 +104,14 @@ public class ClientOpts extends Help {
   public String principal = System.getProperty("user.name");
   
   @Parameter(names = "-p", converter = PasswordConverter.class, description = "Connection password")
-  public Password password = new Password("secret");
+  public Password password = null;
   
   @Parameter(names = "--password", converter = PasswordConverter.class, description = "Enter the connection password", password = true)
   public Password securePassword = null;
   
   public AuthenticationToken getToken() {
     if (securePassword == null) {
-      if (password.value == null)
+      if (password == null)
         return null;
       return new PasswordToken(password.value);
     }

Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java Thu Feb 28 00:38:13 2013
@@ -99,7 +99,7 @@ public class InstanceOperationsImpl impl
     return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
       @Override
       public Map<String,String> execute(ClientService.Client client) throws Exception {
-        return client.getConfiguration(ConfigurationType.CURRENT);
+        return client.getConfiguration(Tracer.traceInfo(), credentials, ConfigurationType.CURRENT);
       }
     });
   }
@@ -112,7 +112,7 @@ public class InstanceOperationsImpl impl
     return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
       @Override
       public Map<String,String> execute(ClientService.Client client) throws Exception {
-        return client.getConfiguration(ConfigurationType.SITE);
+        return client.getConfiguration(Tracer.traceInfo(), credentials, ConfigurationType.SITE);
       }
     });
   }
@@ -179,7 +179,7 @@ public class InstanceOperationsImpl impl
     return ServerClient.execute(instance, new ClientExecReturn<Boolean,ClientService.Client>() {
       @Override
       public Boolean execute(ClientService.Client client) throws Exception {
-        return client.checkClass(Tracer.traceInfo(), className, asTypeName);
+        return client.checkClass(Tracer.traceInfo(), credentials, className, asTypeName);
       }
     });
   }

Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Thu Feb 28 00:38:13 2013
@@ -866,7 +866,7 @@ public class TableOperationsImpl extends
       return ServerClient.executeRaw(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
         @Override
         public Map<String,String> execute(ClientService.Client client) throws Exception {
-          return client.getTableConfiguration(tableName);
+          return client.getTableConfiguration(Tracer.traceInfo(), credentials, tableName);
         }
       }).entrySet();
     } catch (ThriftTableOperationException e) {

Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java Thu Feb 28 00:38:13 2013
@@ -90,11 +90,11 @@ import org.slf4j.LoggerFactory;
 
     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 org.apache.accumulo.core.security.thrift.ThriftSecurityException, ThriftTableOperationException, org.apache.thrift.TException;
 
-    public Map<String,String> getConfiguration(ConfigurationType type) throws 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> getTableConfiguration(String tableName) throws ThriftTableOperationException, 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 boolean checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, String className, String interfaceMatch) throws 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;
 
   }
 
@@ -140,11 +140,11 @@ import org.slf4j.LoggerFactory;
 
     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<AsyncClient.revokeTablePermission_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void getConfiguration(ConfigurationType type, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getConfiguration_call> 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<AsyncClient.getConfiguration_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void getTableConfiguration(String tableName, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTableConfiguration_call> 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<AsyncClient.getTableConfiguration_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.checkClass_call> 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<AsyncClient.checkClass_call> resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -703,15 +703,17 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public Map<String,String> getConfiguration(ConfigurationType type) throws 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
     {
-      send_getConfiguration(type);
+      send_getConfiguration(tinfo, credentials, type);
       return recv_getConfiguration();
     }
 
-    public void send_getConfiguration(ConfigurationType type) throws org.apache.thrift.TException
+    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
     {
       getConfiguration_args args = new getConfiguration_args();
+      args.setTinfo(tinfo);
+      args.setCredentials(credentials);
       args.setType(type);
       sendBase("getConfiguration", args);
     }
@@ -726,15 +728,17 @@ 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(String tableName) throws ThriftTableOperationException, 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
     {
-      send_getTableConfiguration(tableName);
+      send_getTableConfiguration(tinfo, credentials, tableName);
       return recv_getTableConfiguration();
     }
 
-    public void send_getTableConfiguration(String tableName) throws org.apache.thrift.TException
+    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
     {
       getTableConfiguration_args args = new getTableConfiguration_args();
+      args.setTinfo(tinfo);
+      args.setCredentials(credentials);
       args.setTableName(tableName);
       sendBase("getTableConfiguration", args);
     }
@@ -752,16 +756,17 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTableConfiguration failed: unknown result");
     }
 
-    public boolean checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, String className, String interfaceMatch) throws 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
     {
-      send_checkClass(tinfo, className, interfaceMatch);
+      send_checkClass(tinfo, credentials, className, interfaceMatch);
       return recv_checkClass();
     }
 
-    public void send_checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, String className, String interfaceMatch) throws org.apache.thrift.TException
+    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
     {
       checkClass_args args = new checkClass_args();
       args.setTinfo(tinfo);
+      args.setCredentials(credentials);
       args.setClassName(className);
       args.setInterfaceMatch(interfaceMatch);
       sendBase("checkClass", args);
@@ -1561,23 +1566,29 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void getConfiguration(ConfigurationType type, org.apache.thrift.async.AsyncMethodCallback<getConfiguration_call> 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<getConfiguration_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getConfiguration_call method_call = new getConfiguration_call(type, resultHandler, this, ___protocolFactory, ___transport);
+      getConfiguration_call method_call = new getConfiguration_call(tinfo, credentials, type, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getConfiguration_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.security.thrift.TCredentials credentials;
       private ConfigurationType type;
-      public getConfiguration_call(ConfigurationType type, org.apache.thrift.async.AsyncMethodCallback<getConfiguration_call> 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 getConfiguration_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, ConfigurationType type, org.apache.thrift.async.AsyncMethodCallback<getConfiguration_call> 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;
         this.type = type;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getConfiguration", org.apache.thrift.protocol.TMessageType.CALL, 0));
         getConfiguration_args args = new getConfiguration_args();
+        args.setTinfo(tinfo);
+        args.setCredentials(credentials);
         args.setType(type);
         args.write(prot);
         prot.writeMessageEnd();
@@ -1593,23 +1604,29 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void getTableConfiguration(String tableName, org.apache.thrift.async.AsyncMethodCallback<getTableConfiguration_call> 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<getTableConfiguration_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getTableConfiguration_call method_call = new getTableConfiguration_call(tableName, resultHandler, this, ___protocolFactory, ___transport);
+      getTableConfiguration_call method_call = new getTableConfiguration_call(tinfo, credentials, tableName, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getTableConfiguration_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.security.thrift.TCredentials credentials;
       private String tableName;
-      public getTableConfiguration_call(String tableName, org.apache.thrift.async.AsyncMethodCallback<getTableConfiguration_call> 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 getTableConfiguration_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String tableName, org.apache.thrift.async.AsyncMethodCallback<getTableConfiguration_call> 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;
         this.tableName = tableName;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getTableConfiguration", org.apache.thrift.protocol.TMessageType.CALL, 0));
         getTableConfiguration_args args = new getTableConfiguration_args();
+        args.setTinfo(tinfo);
+        args.setCredentials(credentials);
         args.setTableName(tableName);
         args.write(prot);
         prot.writeMessageEnd();
@@ -1625,20 +1642,22 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void checkClass(org.apache.accumulo.trace.thrift.TInfo tinfo, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback<checkClass_call> 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<checkClass_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      checkClass_call method_call = new checkClass_call(tinfo, className, interfaceMatch, resultHandler, this, ___protocolFactory, ___transport);
+      checkClass_call method_call = new checkClass_call(tinfo, credentials, className, interfaceMatch, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class checkClass_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.accumulo.trace.thrift.TInfo tinfo;
+      private org.apache.accumulo.core.security.thrift.TCredentials credentials;
       private String className;
       private String interfaceMatch;
-      public checkClass_call(org.apache.accumulo.trace.thrift.TInfo tinfo, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback<checkClass_call> 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 checkClass_call(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String className, String interfaceMatch, org.apache.thrift.async.AsyncMethodCallback<checkClass_call> 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;
         this.className = className;
         this.interfaceMatch = interfaceMatch;
       }
@@ -1647,6 +1666,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("checkClass", org.apache.thrift.protocol.TMessageType.CALL, 0));
         checkClass_args args = new checkClass_args();
         args.setTinfo(tinfo);
+        args.setCredentials(credentials);
         args.setClassName(className);
         args.setInterfaceMatch(interfaceMatch);
         args.write(prot);
@@ -2194,7 +2214,7 @@ import org.slf4j.LoggerFactory;
 
       public getConfiguration_result getResult(I iface, getConfiguration_args args) throws org.apache.thrift.TException {
         getConfiguration_result result = new getConfiguration_result();
-        result.success = iface.getConfiguration(args.type);
+        result.success = iface.getConfiguration(args.tinfo, args.credentials, args.type);
         return result;
       }
     }
@@ -2215,7 +2235,7 @@ import org.slf4j.LoggerFactory;
       public getTableConfiguration_result getResult(I iface, getTableConfiguration_args args) throws org.apache.thrift.TException {
         getTableConfiguration_result result = new getTableConfiguration_result();
         try {
-          result.success = iface.getTableConfiguration(args.tableName);
+          result.success = iface.getTableConfiguration(args.tinfo, args.credentials, args.tableName);
         } catch (ThriftTableOperationException tope) {
           result.tope = tope;
         }
@@ -2238,7 +2258,7 @@ import org.slf4j.LoggerFactory;
 
       public checkClass_result getResult(I iface, checkClass_args args) throws org.apache.thrift.TException {
         checkClass_result result = new checkClass_result();
-        result.success = iface.checkClass(args.tinfo, args.className, args.interfaceMatch);
+        result.success = iface.checkClass(args.tinfo, args.credentials, args.className, args.interfaceMatch);
         result.setSuccessIsSet(true);
         return result;
       }
@@ -22154,6 +22174,8 @@ import org.slf4j.LoggerFactory;
   public static class getConfiguration_args implements org.apache.thrift.TBase<getConfiguration_args, getConfiguration_args._Fields>, java.io.Serializable, Cloneable   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getConfiguration_args");
 
+    private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -22162,6 +22184,8 @@ import org.slf4j.LoggerFactory;
       schemes.put(TupleScheme.class, new getConfiguration_argsTupleSchemeFactory());
     }
 
+    public org.apache.accumulo.trace.thrift.TInfo tinfo; // required
+    public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required
     /**
      * 
      * @see ConfigurationType
@@ -22170,6 +22194,8 @@ import org.slf4j.LoggerFactory;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      TINFO((short)2, "tinfo"),
+      CREDENTIALS((short)3, "credentials"),
       /**
        * 
        * @see ConfigurationType
@@ -22189,6 +22215,10 @@ import org.slf4j.LoggerFactory;
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 2: // TINFO
+            return TINFO;
+          case 3: // CREDENTIALS
+            return CREDENTIALS;
           case 1: // TYPE
             return TYPE;
           default:
@@ -22234,6 +22264,10 @@ import org.slf4j.LoggerFactory;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class)));
+      tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.security.thrift.TCredentials.class)));
       tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ConfigurationType.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -22244,9 +22278,13 @@ import org.slf4j.LoggerFactory;
     }
 
     public getConfiguration_args(
+      org.apache.accumulo.trace.thrift.TInfo tinfo,
+      org.apache.accumulo.core.security.thrift.TCredentials credentials,
       ConfigurationType type)
     {
       this();
+      this.tinfo = tinfo;
+      this.credentials = credentials;
       this.type = type;
     }
 
@@ -22254,6 +22292,12 @@ import org.slf4j.LoggerFactory;
      * Performs a deep copy on <i>other</i>.
      */
     public getConfiguration_args(getConfiguration_args other) {
+      if (other.isSetTinfo()) {
+        this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo);
+      }
+      if (other.isSetCredentials()) {
+        this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials);
+      }
       if (other.isSetType()) {
         this.type = other.type;
       }
@@ -22265,9 +22309,59 @@ import org.slf4j.LoggerFactory;
 
     @Override
     public void clear() {
+      this.tinfo = null;
+      this.credentials = null;
       this.type = null;
     }
 
+    public org.apache.accumulo.trace.thrift.TInfo getTinfo() {
+      return this.tinfo;
+    }
+
+    public getConfiguration_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) {
+      this.tinfo = tinfo;
+      return this;
+    }
+
+    public void unsetTinfo() {
+      this.tinfo = null;
+    }
+
+    /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */
+    public boolean isSetTinfo() {
+      return this.tinfo != null;
+    }
+
+    public void setTinfoIsSet(boolean value) {
+      if (!value) {
+        this.tinfo = null;
+      }
+    }
+
+    public org.apache.accumulo.core.security.thrift.TCredentials getCredentials() {
+      return this.credentials;
+    }
+
+    public getConfiguration_args setCredentials(org.apache.accumulo.core.security.thrift.TCredentials credentials) {
+      this.credentials = credentials;
+      return this;
+    }
+
+    public void unsetCredentials() {
+      this.credentials = null;
+    }
+
+    /** Returns true if field credentials is set (has been assigned a value) and false otherwise */
+    public boolean isSetCredentials() {
+      return this.credentials != null;
+    }
+
+    public void setCredentialsIsSet(boolean value) {
+      if (!value) {
+        this.credentials = null;
+      }
+    }
+
     /**
      * 
      * @see ConfigurationType
@@ -22302,6 +22396,22 @@ import org.slf4j.LoggerFactory;
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case TINFO:
+        if (value == null) {
+          unsetTinfo();
+        } else {
+          setTinfo((org.apache.accumulo.trace.thrift.TInfo)value);
+        }
+        break;
+
+      case CREDENTIALS:
+        if (value == null) {
+          unsetCredentials();
+        } else {
+          setCredentials((org.apache.accumulo.core.security.thrift.TCredentials)value);
+        }
+        break;
+
       case TYPE:
         if (value == null) {
           unsetType();
@@ -22315,6 +22425,12 @@ import org.slf4j.LoggerFactory;
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case TINFO:
+        return getTinfo();
+
+      case CREDENTIALS:
+        return getCredentials();
+
       case TYPE:
         return getType();
 
@@ -22329,6 +22445,10 @@ import org.slf4j.LoggerFactory;
       }
 
       switch (field) {
+      case TINFO:
+        return isSetTinfo();
+      case CREDENTIALS:
+        return isSetCredentials();
       case TYPE:
         return isSetType();
       }
@@ -22348,6 +22468,24 @@ import org.slf4j.LoggerFactory;
       if (that == null)
         return false;
 
+      boolean this_present_tinfo = true && this.isSetTinfo();
+      boolean that_present_tinfo = true && that.isSetTinfo();
+      if (this_present_tinfo || that_present_tinfo) {
+        if (!(this_present_tinfo && that_present_tinfo))
+          return false;
+        if (!this.tinfo.equals(that.tinfo))
+          return false;
+      }
+
+      boolean this_present_credentials = true && this.isSetCredentials();
+      boolean that_present_credentials = true && that.isSetCredentials();
+      if (this_present_credentials || that_present_credentials) {
+        if (!(this_present_credentials && that_present_credentials))
+          return false;
+        if (!this.credentials.equals(that.credentials))
+          return false;
+      }
+
       boolean this_present_type = true && this.isSetType();
       boolean that_present_type = true && that.isSetType();
       if (this_present_type || that_present_type) {
@@ -22373,6 +22511,26 @@ import org.slf4j.LoggerFactory;
       int lastComparison = 0;
       getConfiguration_args typedOther = (getConfiguration_args)other;
 
+      lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(typedOther.isSetTinfo());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTinfo()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, typedOther.tinfo);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetCredentials()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
       if (lastComparison != 0) {
         return lastComparison;
@@ -22403,6 +22561,22 @@ import org.slf4j.LoggerFactory;
       StringBuilder sb = new StringBuilder("getConfiguration_args(");
       boolean first = true;
 
+      sb.append("tinfo:");
+      if (this.tinfo == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.tinfo);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("credentials:");
+      if (this.credentials == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.credentials);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("type:");
       if (this.type == null) {
         sb.append("null");
@@ -22417,6 +22591,12 @@ import org.slf4j.LoggerFactory;
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
+      if (tinfo != null) {
+        tinfo.validate();
+      }
+      if (credentials != null) {
+        credentials.validate();
+      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -22453,6 +22633,24 @@ import org.slf4j.LoggerFactory;
             break;
           }
           switch (schemeField.id) {
+            case 2: // TINFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo();
+                struct.tinfo.read(iprot);
+                struct.setTinfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CREDENTIALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
+                struct.credentials.read(iprot);
+                struct.setCredentialsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
             case 1: // TYPE
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.type = ConfigurationType.findByValue(iprot.readI32());
@@ -22481,6 +22679,16 @@ import org.slf4j.LoggerFactory;
           oprot.writeI32(struct.type.getValue());
           oprot.writeFieldEnd();
         }
+        if (struct.tinfo != null) {
+          oprot.writeFieldBegin(TINFO_FIELD_DESC);
+          struct.tinfo.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.credentials != null) {
+          oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
+          struct.credentials.write(oprot);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -22499,10 +22707,22 @@ import org.slf4j.LoggerFactory;
       public void write(org.apache.thrift.protocol.TProtocol prot, getConfiguration_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
-        if (struct.isSetType()) {
+        if (struct.isSetTinfo()) {
           optionals.set(0);
         }
-        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetCredentials()) {
+          optionals.set(1);
+        }
+        if (struct.isSetType()) {
+          optionals.set(2);
+        }
+        oprot.writeBitSet(optionals, 3);
+        if (struct.isSetTinfo()) {
+          struct.tinfo.write(oprot);
+        }
+        if (struct.isSetCredentials()) {
+          struct.credentials.write(oprot);
+        }
         if (struct.isSetType()) {
           oprot.writeI32(struct.type.getValue());
         }
@@ -22511,8 +22731,18 @@ import org.slf4j.LoggerFactory;
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getConfiguration_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
+          struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo();
+          struct.tinfo.read(iprot);
+          struct.setTinfoIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
+          struct.credentials.read(iprot);
+          struct.setCredentialsIsSet(true);
+        }
+        if (incoming.get(2)) {
           struct.type = ConfigurationType.findByValue(iprot.readI32());
           struct.setTypeIsSet(true);
         }
@@ -22941,6 +23171,8 @@ import org.slf4j.LoggerFactory;
   public static class getTableConfiguration_args implements org.apache.thrift.TBase<getTableConfiguration_args, getTableConfiguration_args._Fields>, java.io.Serializable, Cloneable   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getTableConfiguration_args");
 
+    private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -22949,10 +23181,14 @@ import org.slf4j.LoggerFactory;
       schemes.put(TupleScheme.class, new getTableConfiguration_argsTupleSchemeFactory());
     }
 
+    public org.apache.accumulo.trace.thrift.TInfo tinfo; // required
+    public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required
     public String tableName; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      TINFO((short)1, "tinfo"),
+      CREDENTIALS((short)3, "credentials"),
       TABLE_NAME((short)2, "tableName");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -22968,6 +23204,10 @@ import org.slf4j.LoggerFactory;
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
+          case 1: // TINFO
+            return TINFO;
+          case 3: // CREDENTIALS
+            return CREDENTIALS;
           case 2: // TABLE_NAME
             return TABLE_NAME;
           default:
@@ -23013,6 +23253,10 @@ import org.slf4j.LoggerFactory;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class)));
+      tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.security.thrift.TCredentials.class)));
       tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -23023,9 +23267,13 @@ import org.slf4j.LoggerFactory;
     }
 
     public getTableConfiguration_args(
+      org.apache.accumulo.trace.thrift.TInfo tinfo,
+      org.apache.accumulo.core.security.thrift.TCredentials credentials,
       String tableName)
     {
       this();
+      this.tinfo = tinfo;
+      this.credentials = credentials;
       this.tableName = tableName;
     }
 
@@ -23033,6 +23281,12 @@ import org.slf4j.LoggerFactory;
      * Performs a deep copy on <i>other</i>.
      */
     public getTableConfiguration_args(getTableConfiguration_args other) {
+      if (other.isSetTinfo()) {
+        this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo);
+      }
+      if (other.isSetCredentials()) {
+        this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials);
+      }
       if (other.isSetTableName()) {
         this.tableName = other.tableName;
       }
@@ -23044,9 +23298,59 @@ import org.slf4j.LoggerFactory;
 
     @Override
     public void clear() {
+      this.tinfo = null;
+      this.credentials = null;
       this.tableName = null;
     }
 
+    public org.apache.accumulo.trace.thrift.TInfo getTinfo() {
+      return this.tinfo;
+    }
+
+    public getTableConfiguration_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) {
+      this.tinfo = tinfo;
+      return this;
+    }
+
+    public void unsetTinfo() {
+      this.tinfo = null;
+    }
+
+    /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */
+    public boolean isSetTinfo() {
+      return this.tinfo != null;
+    }
+
+    public void setTinfoIsSet(boolean value) {
+      if (!value) {
+        this.tinfo = null;
+      }
+    }
+
+    public org.apache.accumulo.core.security.thrift.TCredentials getCredentials() {
+      return this.credentials;
+    }
+
+    public getTableConfiguration_args setCredentials(org.apache.accumulo.core.security.thrift.TCredentials credentials) {
+      this.credentials = credentials;
+      return this;
+    }
+
+    public void unsetCredentials() {
+      this.credentials = null;
+    }
+
+    /** Returns true if field credentials is set (has been assigned a value) and false otherwise */
+    public boolean isSetCredentials() {
+      return this.credentials != null;
+    }
+
+    public void setCredentialsIsSet(boolean value) {
+      if (!value) {
+        this.credentials = null;
+      }
+    }
+
     public String getTableName() {
       return this.tableName;
     }
@@ -23073,6 +23377,22 @@ import org.slf4j.LoggerFactory;
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case TINFO:
+        if (value == null) {
+          unsetTinfo();
+        } else {
+          setTinfo((org.apache.accumulo.trace.thrift.TInfo)value);
+        }
+        break;
+
+      case CREDENTIALS:
+        if (value == null) {
+          unsetCredentials();
+        } else {
+          setCredentials((org.apache.accumulo.core.security.thrift.TCredentials)value);
+        }
+        break;
+
       case TABLE_NAME:
         if (value == null) {
           unsetTableName();
@@ -23086,6 +23406,12 @@ import org.slf4j.LoggerFactory;
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case TINFO:
+        return getTinfo();
+
+      case CREDENTIALS:
+        return getCredentials();
+
       case TABLE_NAME:
         return getTableName();
 
@@ -23100,6 +23426,10 @@ import org.slf4j.LoggerFactory;
       }
 
       switch (field) {
+      case TINFO:
+        return isSetTinfo();
+      case CREDENTIALS:
+        return isSetCredentials();
       case TABLE_NAME:
         return isSetTableName();
       }
@@ -23119,6 +23449,24 @@ import org.slf4j.LoggerFactory;
       if (that == null)
         return false;
 
+      boolean this_present_tinfo = true && this.isSetTinfo();
+      boolean that_present_tinfo = true && that.isSetTinfo();
+      if (this_present_tinfo || that_present_tinfo) {
+        if (!(this_present_tinfo && that_present_tinfo))
+          return false;
+        if (!this.tinfo.equals(that.tinfo))
+          return false;
+      }
+
+      boolean this_present_credentials = true && this.isSetCredentials();
+      boolean that_present_credentials = true && that.isSetCredentials();
+      if (this_present_credentials || that_present_credentials) {
+        if (!(this_present_credentials && that_present_credentials))
+          return false;
+        if (!this.credentials.equals(that.credentials))
+          return false;
+      }
+
       boolean this_present_tableName = true && this.isSetTableName();
       boolean that_present_tableName = true && that.isSetTableName();
       if (this_present_tableName || that_present_tableName) {
@@ -23144,6 +23492,26 @@ import org.slf4j.LoggerFactory;
       int lastComparison = 0;
       getTableConfiguration_args typedOther = (getTableConfiguration_args)other;
 
+      lastComparison = Boolean.valueOf(isSetTinfo()).compareTo(typedOther.isSetTinfo());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTinfo()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, typedOther.tinfo);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetCredentials()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = Boolean.valueOf(isSetTableName()).compareTo(typedOther.isSetTableName());
       if (lastComparison != 0) {
         return lastComparison;
@@ -23174,6 +23542,22 @@ import org.slf4j.LoggerFactory;
       StringBuilder sb = new StringBuilder("getTableConfiguration_args(");
       boolean first = true;
 
+      sb.append("tinfo:");
+      if (this.tinfo == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.tinfo);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("credentials:");
+      if (this.credentials == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.credentials);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("tableName:");
       if (this.tableName == null) {
         sb.append("null");
@@ -23188,6 +23572,12 @@ import org.slf4j.LoggerFactory;
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
       // check for sub-struct validity
+      if (tinfo != null) {
+        tinfo.validate();
+      }
+      if (credentials != null) {
+        credentials.validate();
+      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -23224,6 +23614,24 @@ import org.slf4j.LoggerFactory;
             break;
           }
           switch (schemeField.id) {
+            case 1: // TINFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo();
+                struct.tinfo.read(iprot);
+                struct.setTinfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 3: // CREDENTIALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
+                struct.credentials.read(iprot);
+                struct.setCredentialsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
             case 2: // TABLE_NAME
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.tableName = iprot.readString();
@@ -23247,11 +23655,21 @@ import org.slf4j.LoggerFactory;
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.tinfo != null) {
+          oprot.writeFieldBegin(TINFO_FIELD_DESC);
+          struct.tinfo.write(oprot);
+          oprot.writeFieldEnd();
+        }
         if (struct.tableName != null) {
           oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC);
           oprot.writeString(struct.tableName);
           oprot.writeFieldEnd();
         }
+        if (struct.credentials != null) {
+          oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
+          struct.credentials.write(oprot);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -23270,10 +23688,22 @@ import org.slf4j.LoggerFactory;
       public void write(org.apache.thrift.protocol.TProtocol prot, getTableConfiguration_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
-        if (struct.isSetTableName()) {
+        if (struct.isSetTinfo()) {
           optionals.set(0);
         }
-        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetCredentials()) {
+          optionals.set(1);
+        }
+        if (struct.isSetTableName()) {
+          optionals.set(2);
+        }
+        oprot.writeBitSet(optionals, 3);
+        if (struct.isSetTinfo()) {
+          struct.tinfo.write(oprot);
+        }
+        if (struct.isSetCredentials()) {
+          struct.credentials.write(oprot);
+        }
         if (struct.isSetTableName()) {
           oprot.writeString(struct.tableName);
         }
@@ -23282,8 +23712,18 @@ import org.slf4j.LoggerFactory;
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getTableConfiguration_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
+          struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo();
+          struct.tinfo.read(iprot);
+          struct.setTinfoIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
+          struct.credentials.read(iprot);
+          struct.setCredentialsIsSet(true);
+        }
+        if (incoming.get(2)) {
           struct.tableName = iprot.readString();
           struct.setTableNameIsSet(true);
         }
@@ -23815,6 +24255,7 @@ import org.slf4j.LoggerFactory;
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("checkClass_args");
 
     private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+    private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)4);
     private static final org.apache.thrift.protocol.TField CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("className", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField INTERFACE_MATCH_FIELD_DESC = new org.apache.thrift.protocol.TField("interfaceMatch", org.apache.thrift.protocol.TType.STRING, (short)3);
 
@@ -23825,12 +24266,14 @@ import org.slf4j.LoggerFactory;
     }
 
     public org.apache.accumulo.trace.thrift.TInfo tinfo; // required
+    public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required
     public String className; // required
     public String interfaceMatch; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       TINFO((short)1, "tinfo"),
+      CREDENTIALS((short)4, "credentials"),
       CLASS_NAME((short)2, "className"),
       INTERFACE_MATCH((short)3, "interfaceMatch");
 
@@ -23849,6 +24292,8 @@ import org.slf4j.LoggerFactory;
         switch(fieldId) {
           case 1: // TINFO
             return TINFO;
+          case 4: // CREDENTIALS
+            return CREDENTIALS;
           case 2: // CLASS_NAME
             return CLASS_NAME;
           case 3: // INTERFACE_MATCH
@@ -23898,6 +24343,8 @@ import org.slf4j.LoggerFactory;
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class)));
+      tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.security.thrift.TCredentials.class)));
       tmpMap.put(_Fields.CLASS_NAME, new org.apache.thrift.meta_data.FieldMetaData("className", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.INTERFACE_MATCH, new org.apache.thrift.meta_data.FieldMetaData("interfaceMatch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -23911,11 +24358,13 @@ import org.slf4j.LoggerFactory;
 
     public checkClass_args(
       org.apache.accumulo.trace.thrift.TInfo tinfo,
+      org.apache.accumulo.core.security.thrift.TCredentials credentials,
       String className,
       String interfaceMatch)
     {
       this();
       this.tinfo = tinfo;
+      this.credentials = credentials;
       this.className = className;
       this.interfaceMatch = interfaceMatch;
     }
@@ -23927,6 +24376,9 @@ import org.slf4j.LoggerFactory;
       if (other.isSetTinfo()) {
         this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo);
       }
+      if (other.isSetCredentials()) {
+        this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials);
+      }
       if (other.isSetClassName()) {
         this.className = other.className;
       }
@@ -23942,6 +24394,7 @@ import org.slf4j.LoggerFactory;
     @Override
     public void clear() {
       this.tinfo = null;
+      this.credentials = null;
       this.className = null;
       this.interfaceMatch = null;
     }
@@ -23970,6 +24423,30 @@ import org.slf4j.LoggerFactory;
       }
     }
 
+    public org.apache.accumulo.core.security.thrift.TCredentials getCredentials() {
+      return this.credentials;
+    }
+
+    public checkClass_args setCredentials(org.apache.accumulo.core.security.thrift.TCredentials credentials) {
+      this.credentials = credentials;
+      return this;
+    }
+
+    public void unsetCredentials() {
+      this.credentials = null;
+    }
+
+    /** Returns true if field credentials is set (has been assigned a value) and false otherwise */
+    public boolean isSetCredentials() {
+      return this.credentials != null;
+    }
+
+    public void setCredentialsIsSet(boolean value) {
+      if (!value) {
+        this.credentials = null;
+      }
+    }
+
     public String getClassName() {
       return this.className;
     }
@@ -24028,6 +24505,14 @@ import org.slf4j.LoggerFactory;
         }
         break;
 
+      case CREDENTIALS:
+        if (value == null) {
+          unsetCredentials();
+        } else {
+          setCredentials((org.apache.accumulo.core.security.thrift.TCredentials)value);
+        }
+        break;
+
       case CLASS_NAME:
         if (value == null) {
           unsetClassName();
@@ -24052,6 +24537,9 @@ import org.slf4j.LoggerFactory;
       case TINFO:
         return getTinfo();
 
+      case CREDENTIALS:
+        return getCredentials();
+
       case CLASS_NAME:
         return getClassName();
 
@@ -24071,6 +24559,8 @@ import org.slf4j.LoggerFactory;
       switch (field) {
       case TINFO:
         return isSetTinfo();
+      case CREDENTIALS:
+        return isSetCredentials();
       case CLASS_NAME:
         return isSetClassName();
       case INTERFACE_MATCH:
@@ -24101,6 +24591,15 @@ import org.slf4j.LoggerFactory;
           return false;
       }
 
+      boolean this_present_credentials = true && this.isSetCredentials();
+      boolean that_present_credentials = true && that.isSetCredentials();
+      if (this_present_credentials || that_present_credentials) {
+        if (!(this_present_credentials && that_present_credentials))
+          return false;
+        if (!this.credentials.equals(that.credentials))
+          return false;
+      }
+
       boolean this_present_className = true && this.isSetClassName();
       boolean that_present_className = true && that.isSetClassName();
       if (this_present_className || that_present_className) {
@@ -24145,6 +24644,16 @@ import org.slf4j.LoggerFactory;
           return lastComparison;
         }
       }
+      lastComparison = Boolean.valueOf(isSetCredentials()).compareTo(typedOther.isSetCredentials());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetCredentials()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, typedOther.credentials);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = Boolean.valueOf(isSetClassName()).compareTo(typedOther.isSetClassName());
       if (lastComparison != 0) {
         return lastComparison;
@@ -24193,6 +24702,14 @@ import org.slf4j.LoggerFactory;
       }
       first = false;
       if (!first) sb.append(", ");
+      sb.append("credentials:");
+      if (this.credentials == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.credentials);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("className:");
       if (this.className == null) {
         sb.append("null");
@@ -24218,6 +24735,9 @@ import org.slf4j.LoggerFactory;
       if (tinfo != null) {
         tinfo.validate();
       }
+      if (credentials != null) {
+        credentials.validate();
+      }
     }
 
     private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -24263,6 +24783,15 @@ import org.slf4j.LoggerFactory;
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
+            case 4: // CREDENTIALS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
+                struct.credentials.read(iprot);
+                struct.setCredentialsIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
             case 2: // CLASS_NAME
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
                 struct.className = iprot.readString();
@@ -24309,6 +24838,11 @@ import org.slf4j.LoggerFactory;
           oprot.writeString(struct.interfaceMatch);
           oprot.writeFieldEnd();
         }
+        if (struct.credentials != null) {
+          oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC);
+          struct.credentials.write(oprot);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -24330,16 +24864,22 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetTinfo()) {
           optionals.set(0);
         }
-        if (struct.isSetClassName()) {
+        if (struct.isSetCredentials()) {
           optionals.set(1);
         }
-        if (struct.isSetInterfaceMatch()) {
+        if (struct.isSetClassName()) {
           optionals.set(2);
         }
-        oprot.writeBitSet(optionals, 3);
+        if (struct.isSetInterfaceMatch()) {
+          optionals.set(3);
+        }
+        oprot.writeBitSet(optionals, 4);
         if (struct.isSetTinfo()) {
           struct.tinfo.write(oprot);
         }
+        if (struct.isSetCredentials()) {
+          struct.credentials.write(oprot);
+        }
         if (struct.isSetClassName()) {
           oprot.writeString(struct.className);
         }
@@ -24351,17 +24891,22 @@ import org.slf4j.LoggerFactory;
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, checkClass_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.tinfo = new org.apache.accumulo.trace.thrift.TInfo();
           struct.tinfo.read(iprot);
           struct.setTinfoIsSet(true);
         }
         if (incoming.get(1)) {
+          struct.credentials = new org.apache.accumulo.core.security.thrift.TCredentials();
+          struct.credentials.read(iprot);
+          struct.setCredentialsIsSet(true);
+        }
+        if (incoming.get(2)) {
           struct.className = iprot.readString();
           struct.setClassNameIsSet(true);
         }
-        if (incoming.get(2)) {
+        if (incoming.get(3)) {
           struct.interfaceMatch = iprot.readString();
           struct.setInterfaceMatchIsSet(true);
         }

Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/conf/Property.java Thu Feb 28 00:38:13 2013
@@ -105,7 +105,7 @@ public enum Property {
   MASTER_THREADCHECK("master.server.threadcheck.time", "1s", PropertyType.TIMEDURATION, "The time between adjustments of the server thread pool."),
   MASTER_RECOVERY_DELAY("master.recovery.delay", "10s", PropertyType.TIMEDURATION,
       "When a tablet server's lock is deleted, it takes time for it to completely quit. This delay gives it time before log recoveries begin."),
-  MASTER_LEASE_RECOVERY_IMPLEMETATION("master.lease.recovery.implementation", "org.apache.accumulo.server.master.recovery.RecoverLease",
+  MASTER_WALOG_CLOSER_IMPLEMETATION("master.walog.closer.implementation", "org.apache.accumulo.server.master.recovery.HadoopLogCloser",
       PropertyType.CLASSNAME, "A class that implements a mechansim to steal write access to a file"),
   MASTER_FATE_THREADPOOL_SIZE("master.fate.threadpool.size", "4", PropertyType.COUNT,
       "The number of threads used to run FAult-Tolerant Executions.  These are primarily table operations like merge."),

Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/client.thrift
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/client.thrift?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/client.thrift (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/thrift/client.thrift Thu Feb 28 00:38:13 2013
@@ -100,9 +100,9 @@ service ClientService {
     void revokeTablePermission(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:string tableName, 4:byte permission) throws (1:security.ThriftSecurityException sec, 2:ThriftTableOperationException tope)
 
     // configuration methods
-    map<string, string> getConfiguration(1:ConfigurationType type);
-    map<string, string> getTableConfiguration(2:string tableName) throws (1:ThriftTableOperationException tope);
-    bool checkClass(1:trace.TInfo tinfo, 2:string className, 3:string interfaceMatch);
+    map<string, string> getConfiguration(2:trace.TInfo tinfo, 3:security.TCredentials credentials, 1:ConfigurationType type);
+    map<string, string> getTableConfiguration(1:trace.TInfo tinfo, 3:security.TCredentials credentials, 2:string tableName) throws (1:ThriftTableOperationException tope);
+    bool checkClass(1:trace.TInfo tinfo, 4:security.TCredentials credentials, 2:string className, 3:string interfaceMatch);
 }
 
 // Only used for a unit test

Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java Thu Feb 28 00:38:13 2013
@@ -43,7 +43,7 @@ public class TestClientOpts {
     BatchScannerOpts bsOpts = new BatchScannerOpts();
     assertEquals(System.getProperty("user.name"), args.principal);
     assertNull(args.securePassword);
-    assertEquals(new PasswordToken("secret"), args.getToken());
+    assertNull(args.getToken());
     assertEquals(new Long(cfg.getMaxLatency(TimeUnit.MILLISECONDS)), bwOpts.batchLatency);
     assertEquals(new Long(cfg.getTimeout(TimeUnit.MILLISECONDS)), bwOpts.batchTimeout);
     assertEquals(new Long(cfg.getMaxMemory()), bwOpts.batchMemory);

Modified: accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/clients.tex
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/clients.tex?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/clients.tex (original)
+++ accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/clients.tex Thu Feb 28 00:38:13 2013
@@ -27,7 +27,7 @@ of the different ways to execute client 
   \item using the tool script 
 \end{itemize}
 
-Inorder to run client code written to run against Accumulo, you will need to
+In order to run client code written to run against Accumulo, you will need to
 include the jars that Accumulo depends on in your classpath.  Accumulo client
 code depends on Hadoop and Zookeeper.  For Hadoop add the hadoop core jar, all
 of the jars in the Hadoop lib directory, and the conf directory to the
@@ -123,7 +123,7 @@ to efficiently return ranges of consecut
 
 \subsection{Scanner}
 
-To retrieve data, Clients use a Scanner, which provides acts like an Iterator over
+To retrieve data, Clients use a Scanner, which acts like an Iterator over
 keys and values. Scanners can be configured to start and stop at particular keys, and
 to return a subset of the columns available.
 

Modified: accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/design.tex
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/design.tex?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/design.tex (original)
+++ accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/design.tex Thu Feb 28 00:38:13 2013
@@ -133,7 +133,7 @@ delete entry when the new file is create
 
 If a TabletServer fails, the Master detects it and automatically reassigns the tablets
 assigned from the failed server to other servers. Any key-value pairs that were in
-memory at the time the TabletServer are automatically reapplied from the Write-Ahead
+memory at the time the TabletServer fails are automatically reapplied from the Write-Ahead
 Log to prevent any loss of data.
 
 The Master will coordinate the copying of write-ahead logs to HDFS so the logs

Modified: accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/shell.tex
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/shell.tex?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/shell.tex (original)
+++ accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/shell.tex Thu Feb 28 00:38:13 2013
@@ -66,7 +66,7 @@ root@myinstance mytable> createtable tes
 
 root@myinstance testtable>
 
-root@myinstance junk> deletetable testtable
+root@myinstance testtable> deletetable testtable
 
 root@myinstance>
 \end{verbatim}

Modified: accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_configuration.tex
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_configuration.tex?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_configuration.tex (original)
+++ accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_configuration.tex Thu Feb 28 00:38:13 2013
@@ -21,13 +21,13 @@ behavior of Accumulo as well as improve 
 These include locality groups, constraints, bloom filters, iterators, and block cache.
 
 \section{Locality Groups}
-Accumulo supports storing of sets of column families separately on disk to allow
-clients to scan over columns that are frequently used together efficient and to avoid
-scanning over column families that are not requested. After a locality group is set
+Accumulo supports storing sets of column families separately on disk to allow
+clients to efficiently scan over columns that are frequently used together and to avoid
+scanning over column families that are not requested. After a locality group is set,
 Scanner and BatchScanner operations will automatically take advantage of them
 whenever the fetchColumnFamilies() method is used.
 
-By default tables place all column families into the same ``default" locality group.
+By default, tables place all column families into the same ``default'' locality group.
 Additional locality groups can be configured anytime via the shell or
 programmatically as follows:
 
@@ -38,10 +38,9 @@ programmatically as follows:
 usage: setgroups <group>=<col fam>{,<col fam>}{ <group>=<col fam>{,<col
 fam>}} [-?] -t <table>
 
-user@myinstance mytable> setgroups -t mytable group_one=colf1,colf2
+user@myinstance mytable> setgroups group_one=colf1,colf2 -t mytable
 
-user@myinstance mytable> getgroups -t mytable
-group_one=colf1,colf2
+user@myinstance mytable> getgroups group_one=colf1,colf2 -t mytable
 \end{verbatim}
 \normalsize
 
@@ -51,8 +50,7 @@ group_one=colf1,colf2
 \begin{verbatim}
 Connector conn;
 
-HashMap<String,Set<Text>> localityGroups =
-    new HashMap<String, Set<Text>>();
+HashMap<String,Set<Text>> localityGroups = new HashMap<String, Set<Text>>();
 
 HashSet<Text> metadataColumns = new HashSet<Text>();
 metadataColumns.add(new Text("domain"));
@@ -470,7 +468,7 @@ compact tablets that overlap the given r
 
 \section{Pre-splitting tables}
 
-Accumulo will balance and distribute tables accross servers. Before a
+Accumulo will balance and distribute tables across servers. Before a
 table gets large, it will be maintained as a single tablet on a single
 server.  This limits the speed at which data can be added or queried
 to the speed of a single node. To improve performance when the a table
@@ -503,7 +501,7 @@ of data may change over time.  For examp
 information, and data is continually added and removed to maintain a
 window of current information, tablets for older rows may be empty.
 
-Accumulo supports tablet merging, which can be used to reduce delete
+Accumulo supports tablet merging, which can be used to reduce 
 the number of split points.  The following command will merge all rows
 from ``A'' to ``Z'' into a single tablet:
 
@@ -536,7 +534,7 @@ root@myinstance> merge -t myTable -s 100
 By default, small tablets will not be merged into tablets that are
 already larger than the given size.  This can leave isolated small
 tablets.  To force small tablets to be merged into larger tablets use
-the ``--force'' option:
+the ``--{}--force'' option:
 
 \small
 \begin{verbatim}
@@ -562,7 +560,7 @@ Consider an indexing scheme that uses da
 For example ``20110823-15:20:25.013'' might be a row that specifies a
 date and time.  In some cases, we might like to delete rows based on
 this date, say to remove all the data older than the current year.
-Accumulo supports a delete range operation which can efficiently
+Accumulo supports a delete range operation which efficiently
 removes data between two rows.  For example:
 
 \small
@@ -582,7 +580,7 @@ root@myinstance> deleterange -t myTable 
 \normalsize
 
 The shell will not allow you to delete an unbounded range (no start)
-unless you provide the ``--force'' option.
+unless you provide the ``--{}--force'' option.
 
 Range deletion is implemented using splits at the given start/end
 positions, and will affect the number of splits in the table.

Modified: accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_design.tex
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_design.tex?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_design.tex (original)
+++ accumulo/branches/ACCUMULO-259-polishing/docs/src/user_manual/chapters/table_design.tex Thu Feb 28 00:38:13 2013
@@ -19,7 +19,7 @@
 \section{Basic Table}
 
 Since Accumulo tables are sorted by row ID, each table can be thought of as being
-indexed by the row ID. Lookups performed row ID can be executed quickly, by doing
+indexed by the row ID. Lookups performed by row ID can be executed quickly, by doing
 a binary search, first across the tablets, and then within a tablet. Clients should
 choose a row ID carefully in order to support their desired application. A simple rule
 is to select a unique identifier as the row ID for each entity to be stored and assign

Propchange: accumulo/branches/ACCUMULO-259-polishing/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1450369-1451018

Modified: accumulo/branches/ACCUMULO-259-polishing/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/examples/simple/src/test/java/org/apache/accumulo/examples/simple/dirlist/CountTest.java Thu Feb 28 00:38:13 2013
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
 import junit.framework.TestCase;
 
 import org.apache.accumulo.core.cli.BatchWriterOpts;
+import org.apache.accumulo.core.cli.ClientOpts.Password;
 import org.apache.accumulo.core.cli.ScannerOpts;
 import org.apache.accumulo.core.client.BatchWriter;
 import org.apache.accumulo.core.client.BatchWriterConfig;
@@ -69,7 +70,9 @@ public class CountTest extends TestCase 
     BatchWriterOpts bwOpts = new BatchWriterOpts();
     opts.instance = "counttest";
     opts.tableName = "dirlisttable";
+    opts.password = new Password("secret");
     opts.mock = true;
+    opts.password = new Opts.Password("");
     FileCount fc = new FileCount(opts, scanOpts, bwOpts);
     fc.run();
     

Modified: accumulo/branches/ACCUMULO-259-polishing/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/pom.xml?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/pom.xml (original)
+++ accumulo/branches/ACCUMULO-259-polishing/pom.xml Thu Feb 28 00:38:13 2013
@@ -359,6 +359,7 @@
           <onlyCurrentVersion>true</onlyCurrentVersion>
           <statusIds>closed,resolved</statusIds>
           <maxEntries>10000</maxEntries>
+          <useJql>true</useJql>
         </configuration>
         <reportSets>
           <reportSet>

Propchange: accumulo/branches/ACCUMULO-259-polishing/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1450369-1451018

Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java?rev=1451062&r1=1451061&r2=1451062&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java Thu Feb 28 00:38:13 2013
@@ -186,33 +186,38 @@ public class ClientServiceHandler implem
     return security.listUsers(credentials);
   }
   
-  static private Map<String,String> conf(AccumuloConfiguration conf) {
+  static private Map<String,String> conf(TCredentials credentials, AccumuloConfiguration conf) throws TException {
+    security.authenticateUser(credentials, credentials);
+    
     Map<String,String> result = new HashMap<String,String>();
     for (Entry<String,String> entry : conf) {
       // TODO: do we need to send any instance information?
-      if (!entry.getKey().equals(Property.INSTANCE_SECRET.getKey()))
-        result.put(entry.getKey(), entry.getValue());
+      if (entry.getKey().equals(Property.INSTANCE_SECRET.getKey()))
+        continue;
+      if (entry.getKey().toLowerCase().contains("password"))
+        continue;
+      result.put(entry.getKey(), entry.getValue());
     }
     return result;
   }
   
   @Override
-  public Map<String,String> getConfiguration(ConfigurationType type) throws TException {
+  public Map<String,String> getConfiguration(TInfo tinfo, TCredentials credentials, ConfigurationType type) throws TException {
     switch (type) {
       case CURRENT:
-        return conf(new ServerConfiguration(instance).getConfiguration());
+        return conf(credentials, new ServerConfiguration(instance).getConfiguration());
       case SITE:
-        return conf(ServerConfiguration.getSiteConfiguration());
+        return conf(credentials, ServerConfiguration.getSiteConfiguration());
       case DEFAULT:
-        return conf(AccumuloConfiguration.getDefaultConfiguration());
+        return conf(credentials, AccumuloConfiguration.getDefaultConfiguration());
     }
     throw new RuntimeException("Unexpected configuration type " + type);
   }
   
   @Override
-  public Map<String,String> getTableConfiguration(String tableName) throws TException, ThriftTableOperationException {
+  public Map<String,String> getTableConfiguration(TInfo tinfo, TCredentials credentials, String tableName) throws TException, ThriftTableOperationException {
     String tableId = checkTableId(tableName, null);
-    return conf(new ServerConfiguration(instance).getTableConfiguration(tableId));
+    return conf(credentials, new ServerConfiguration(instance).getTableConfiguration(tableId));
   }
   
   @Override
@@ -242,7 +247,7 @@ public class ClientServiceHandler implem
   
   @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
-  public boolean checkClass(TInfo tinfo, String className, String interfaceMatch) throws TException {
+  public boolean checkClass(TInfo tinfo, TCredentials credentials, String className, String interfaceMatch) throws TException {
     ClassLoader loader = getClass().getClassLoader();
     Class shouldMatch;
     try {



Mime
View raw message