Author: vines Date: Thu Feb 28 23:29:38 2013 New Revision: 1451433 URL: http://svn.apache.org/r1451433 Log: ACCUMULO-1131 - info & tests on InsecureAuthenticator ACCUMULO-1133 - Migrated tokens to client.security.tokens and moved SecurityErrorCode & ThriftSecurityException to the client thrift. Marked old Security ErrorCode & ThriftSecurityException as deprecated ACCUMULO-1133 - I committed the last one from the wrong directory...
Added: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java - copied unchanged from r1451426, accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java - copied unchanged from r1451426, accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/security/ - copied from r1451426, accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/security/ Modified: accumulo/trunk/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/CredentialHelper.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/Credentials.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/handler/Authenticator.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/handler/InsecureAuthenticator.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/handler/ZKAuthenticator.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/tokens/NullToken.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PasswdCommand.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/UserCommand.java accumulo/trunk/core/src/main/thrift/client.thrift accumulo/trunk/core/src/main/thrift/data.thrift accumulo/trunk/core/src/main/thrift/gc.thrift accumulo/trunk/core/src/main/thrift/master.thrift accumulo/trunk/core/src/main/thrift/security.thrift accumulo/trunk/core/src/main/thrift/tabletserver.thrift accumulo/trunk/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormatTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormatTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormatTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormatTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java accumulo/trunk/examples/ (props changed) accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchWriter.java accumulo/trunk/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java accumulo/trunk/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java accumulo/trunk/server/ (props changed) accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/CloneTable.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/CreateTable.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/Authorizor.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/InsecureAuthenticator.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/PermissionHandler.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/MasterMessage.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/SplitReportMessage.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/TabletStatusMessage.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Initialize.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java accumulo/trunk/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateUser.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java accumulo/trunk/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java Propchange: accumulo/trunk/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5:r1451410-1451426 Propchange: accumulo/trunk/core/ ------------------------------------------------------------------------------ Merged /accumulo/branches/1.5/core:r1451410-1451426 Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java Thu Feb 28 23:29:38 2013 @@ -31,6 +31,8 @@ import org.apache.accumulo.core.client.Z import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat; import org.apache.accumulo.core.client.mock.MockInstance; +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; @@ -38,8 +40,6 @@ import org.apache.accumulo.core.security import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.security.CredentialHelper; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.tokens.AuthenticationToken; -import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.trace.instrument.Trace; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java Thu Feb 28 23:29:38 2013 @@ -16,8 +16,8 @@ */ package org.apache.accumulo.core.client; -import org.apache.accumulo.core.security.thrift.SecurityErrorCode; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; +import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; /** * An Accumulo Exception for security violations, authentication failures, authorization failures, etc. Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java Thu Feb 28 23:29:38 2013 @@ -20,10 +20,10 @@ import java.nio.ByteBuffer; import java.util.List; import java.util.Properties; +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.security.handler.Authenticator; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.tokens.AuthenticationToken; /** * This class represents the information a client needs to know to connect to an instance of accumulo. Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/MutationsRejectedException.java Thu Feb 28 23:29:38 2013 @@ -23,9 +23,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.data.ConstraintViolationSummary; import org.apache.accumulo.core.data.KeyExtent; -import org.apache.accumulo.core.security.thrift.SecurityErrorCode; /** * Communicate the failed mutations of a BatchWriter back to the client. Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Thu Feb 28 23:29:38 2013 @@ -25,15 +25,15 @@ import java.util.UUID; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.impl.ConnectorImpl; import org.apache.accumulo.core.client.impl.MasterClient; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.file.FileUtil; import org.apache.accumulo.core.master.thrift.MasterClientService.Client; import org.apache.accumulo.core.security.CredentialHelper; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; -import org.apache.accumulo.core.security.tokens.AuthenticationToken; -import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.core.util.CachedConfiguration; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java Thu Feb 28 23:29:38 2013 @@ -32,9 +32,9 @@ import org.apache.accumulo.core.client.i import org.apache.accumulo.core.client.impl.ServerClient; import org.apache.accumulo.core.client.impl.thrift.ClientService; import org.apache.accumulo.core.client.impl.thrift.ConfigurationType; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.master.thrift.MasterClientService; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.accumulo.core.util.ThriftUtil; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java Thu Feb 28 23:29:38 2013 @@ -20,11 +20,11 @@ import java.util.Set; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.core.security.tokens.AuthenticationToken; -import org.apache.accumulo.core.security.tokens.PasswordToken; /** * Provides a class for managing users and permissions Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java Thu Feb 28 23:29:38 2013 @@ -26,17 +26,17 @@ import org.apache.accumulo.core.client.i import org.apache.accumulo.core.client.impl.ClientExecReturn; import org.apache.accumulo.core.client.impl.ServerClient; import org.apache.accumulo.core.client.impl.thrift.ClientService; +import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException; +import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.CredentialHelper; import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; -import org.apache.accumulo.core.security.tokens.AuthenticationToken; -import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.accumulo.core.util.ByteBufferUtil; import org.apache.accumulo.trace.instrument.Tracer; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Thu Feb 28 23:29:38 2013 @@ -61,6 +61,7 @@ import org.apache.accumulo.core.client.i import org.apache.accumulo.core.client.impl.TabletLocator; import org.apache.accumulo.core.client.impl.TabletLocator.TabletLocation; import org.apache.accumulo.core.client.impl.thrift.ClientService; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.ConfigurationCopy; @@ -76,7 +77,6 @@ import org.apache.accumulo.core.master.t import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.CredentialHelper; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; import org.apache.accumulo.core.util.ArgumentChecker; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java Thu Feb 28 23:29:38 2013 @@ -37,9 +37,9 @@ import org.apache.accumulo.core.client.a import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.client.admin.TableOperationsImpl; import org.apache.accumulo.core.client.impl.thrift.ClientService; +import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.core.security.thrift.TCredentials; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.accumulo.trace.instrument.Tracer; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java Thu Feb 28 23:29:38 2013 @@ -22,9 +22,9 @@ import java.util.List; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Instance; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.master.thrift.MasterClientService; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.accumulo.core.util.ThriftUtil; import org.apache.accumulo.core.util.UtilWaitThread; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java Thu Feb 28 23:29:38 2013 @@ -25,10 +25,10 @@ import org.apache.accumulo.core.client.A import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.impl.thrift.ClientService; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.client.impl.thrift.ClientService.Client; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.core.util.ServerServices; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java Thu Feb 28 23:29:38 2013 @@ -44,6 +44,7 @@ import org.apache.accumulo.core.client.T import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.TableOfflineException; import org.apache.accumulo.core.client.TimedOutException; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Column; @@ -59,7 +60,6 @@ import org.apache.accumulo.core.data.thr import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; import org.apache.accumulo.core.util.ByteBufferUtil; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java Thu Feb 28 23:29:38 2013 @@ -50,6 +50,8 @@ import org.apache.accumulo.core.client.T import org.apache.accumulo.core.client.TableOfflineException; import org.apache.accumulo.core.client.TimedOutException; import org.apache.accumulo.core.client.impl.TabletLocator.TabletServerMutations; +import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.constraints.Violations; import org.apache.accumulo.core.data.ConstraintViolationSummary; @@ -59,8 +61,6 @@ import org.apache.accumulo.core.data.thr import org.apache.accumulo.core.data.thrift.UpdateErrors; import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.thrift.SecurityErrorCode; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException; import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException; import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java Thu Feb 28 23:29:38 2013 @@ -38,6 +38,7 @@ import org.apache.accumulo.core.client.T import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.TableOfflineException; import org.apache.accumulo.core.client.impl.TabletLocator.TabletLocation; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.data.Column; import org.apache.accumulo.core.data.Key; @@ -53,7 +54,6 @@ import org.apache.accumulo.core.data.thr import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException; import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java?rev=1451433&r1=1451432&r2=1451433&view=diff ============================================================================== --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java Thu Feb 28 23:29:38 2013 @@ -22,11 +22,11 @@ import org.apache.accumulo.core.client.A import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.impl.TabletLocator.TabletLocation; +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.security.thrift.TCredentials; -import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException; import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;